flake: bump inputs
My tandoor-recipes fix was merged upstream, so remove the overlay. And because of the recent postgres bump for 23.11, `ensureDBOwnership` is the new way of dealing with DB permissions [1]. This means I had to fix manually migrate my `gitea` DB and make it match the DB user. [1]: https://github.com/NixOS/nixpkgs/pull/266270
This commit is contained in:
parent
c466fd25b4
commit
60d941b40b
30
flake.lock
30
flake.lock
|
@ -70,11 +70,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1698579227,
|
"lastModified": 1698882062,
|
||||||
"narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=",
|
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "f76e870d64779109e41370848074ac4eaa1606ec",
|
"rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -131,11 +131,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1698670511,
|
"lastModified": 1700419052,
|
||||||
"narHash": "sha256-jQIu3UhBMPHXzVkHQO1O2gg8SVo5lqAVoC6mOaLQcLQ=",
|
"narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "8e5416b478e465985eec274bc3a018024435c106",
|
"rev": "993fb02d20760067b8ee19c713d94cee07037759",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -147,11 +147,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1698611440,
|
"lastModified": 1700390070,
|
||||||
"narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
|
"narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
|
"rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -163,11 +163,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1698745553,
|
"lastModified": 1700477143,
|
||||||
"narHash": "sha256-Fdip7ewCtZTjOu7ATDFUAy3OqrgcyvzDElLXhr4YmmI=",
|
"narHash": "sha256-43dtFRTcFxQJXmy0jvXGDttXD7fAuGIZ0D8frdIg84M=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "dfbf198236d40e9741db76936088f05107e19013",
|
"rev": "3a7dd170a152b8525e64e1a21b3f95d402ead2b8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -192,11 +192,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1698227354,
|
"lastModified": 1700064067,
|
||||||
"narHash": "sha256-Fi5H9jbaQLmLw9qBi/mkR33CoFjNbobo5xWdX4tKz1Q=",
|
"narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "pre-commit-hooks.nix",
|
"repo": "pre-commit-hooks.nix",
|
||||||
"rev": "bd38df3d508dfcdff52cd243d297f218ed2257bf",
|
"rev": "e558068cba67b23b4fbc5537173dbb43748a17e8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -65,6 +65,7 @@ in
|
||||||
database = {
|
database = {
|
||||||
type = "postgres"; # Automatic setup
|
type = "postgres"; # Automatic setup
|
||||||
user = "git"; # User needs to be the same as gitea user
|
user = "git"; # User needs to be the same as gitea user
|
||||||
|
name = "git"; # Name must be the same as user for `ensureDBOwnership`
|
||||||
};
|
};
|
||||||
|
|
||||||
# NixOS module uses `gitea dump` to backup repositories and the database,
|
# NixOS module uses `gitea dump` to backup repositories and the database,
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
From 8f66f5c3ca61751a80cc133ff4c59019d6fca406 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bruno BELANYI <bruno@belanyi.fr>
|
|
||||||
Date: Tue, 31 Oct 2023 12:15:30 +0000
|
|
||||||
Subject: [PATCH] Bump django-allauth from 0.54.0 to 0.58.1
|
|
||||||
|
|
||||||
See the backwards incompatible changes [1].
|
|
||||||
|
|
||||||
[1]: https://docs.allauth.org/en/latest/release-notes/recent.html#id10
|
|
||||||
---
|
|
||||||
recipes/settings.py | 1 +
|
|
||||||
requirements.txt | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/recipes/settings.py b/recipes/settings.py
|
|
||||||
index df2c2b1de..b836ea656 100644
|
|
||||||
--- a/recipes/settings.py
|
|
||||||
+++ b/recipes/settings.py
|
|
||||||
@@ -218,6 +218,7 @@
|
|
||||||
'django.middleware.locale.LocaleMiddleware',
|
|
||||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
|
||||||
'cookbook.helper.scope_middleware.ScopeMiddleware',
|
|
||||||
+ 'allauth.account.middleware.AccountMiddleware',
|
|
||||||
]
|
|
||||||
|
|
||||||
if DEBUG_TOOLBAR:
|
|
||||||
diff --git a/requirements.txt b/requirements.txt
|
|
||||||
index 26d81b471..09ed2381a 100644
|
|
||||||
--- a/requirements.txt
|
|
||||||
+++ b/requirements.txt
|
|
||||||
@@ -29,7 +29,7 @@ microdata==0.8.0
|
|
||||||
Jinja2==3.1.2
|
|
||||||
django-webpack-loader==1.8.1
|
|
||||||
git+https://github.com/BITSOLVER/django-js-reverse@071e304fd600107bc64bbde6f2491f1fe049ec82
|
|
||||||
-django-allauth==0.54.0
|
|
||||||
+django-allauth==0.58.1
|
|
||||||
recipe-scrapers==14.36.1
|
|
||||||
django-scopes==2.0.0
|
|
||||||
pytest==7.3.1
|
|
|
@ -1,9 +0,0 @@
|
||||||
_self: prev:
|
|
||||||
{
|
|
||||||
tandoor-recipes = prev.tandoor-recipes.overrideAttrs (oa: {
|
|
||||||
patches = (oa.patches or [ ]) ++ [
|
|
||||||
# https://github.com/TandoorRecipes/recipes/pull/2706
|
|
||||||
./bump-allauth.patch
|
|
||||||
];
|
|
||||||
});
|
|
||||||
}
|
|
Loading…
Reference in a new issue