From b467d83887d98f76eaca47473a7bfd515ec1ee20 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 15 Sep 2025 11:33:41 +0200 Subject: [PATCH 1/4] froide-govplan: 0-unstable-2025-06-25 -> 0-unstable-2025-07-14 --- .../froide_avoid_loading_account_module.patch | 18 ++++++++++++++++++ pkgs/by-name/fr/froide-govplan/package.nix | 16 +++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/fr/froide-govplan/froide_avoid_loading_account_module.patch diff --git a/pkgs/by-name/fr/froide-govplan/froide_avoid_loading_account_module.patch b/pkgs/by-name/fr/froide-govplan/froide_avoid_loading_account_module.patch new file mode 100644 index 000000000000..cf3835ca9a6f --- /dev/null +++ b/pkgs/by-name/fr/froide-govplan/froide_avoid_loading_account_module.patch @@ -0,0 +1,18 @@ +diff --git a/froide/helper/templatetags/permission_helper.py b/froide/helper/templatetags/permission_helper.py +index c9d692e2..5bddaa21 100644 +--- a/froide/helper/templatetags/permission_helper.py ++++ b/froide/helper/templatetags/permission_helper.py +@@ -1,7 +1,5 @@ + from django import template + +-from ..auth import can_moderate_object +- + register = template.Library() + + +@@ -12,4 +10,4 @@ def has_perm(user, perm): + + @register.filter + def can_moderate(obj, request): +- return can_moderate_object(obj, request) ++ return False diff --git a/pkgs/by-name/fr/froide-govplan/package.nix b/pkgs/by-name/fr/froide-govplan/package.nix index cad713bb1957..4a2a802fd4d2 100644 --- a/pkgs/by-name/fr/froide-govplan/package.nix +++ b/pkgs/by-name/fr/froide-govplan/package.nix @@ -21,7 +21,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "froide-govplan"; - version = "0-unstable-2025-06-25"; + version = "0-unstable-2025-07-14"; pyproject = true; src = fetchFromGitHub { @@ -29,8 +29,8 @@ python.pkgs.buildPythonApplication rec { repo = "froide-govplan"; # No tagged release yet # https://github.com/okfde/froide-govplan/issues/15 - rev = "9c325e70a84f26fea37b5a34f24d19fd82ea62ff"; - hash = "sha256-OD4vvKt0FLuiAVGwpspWLB2ZuM1UJkZdv2YcbKKYk9A="; + rev = "7d304ae0e34e44f3bc34dce2b7e5f3c62bd64299"; + hash = "sha256-/0KASLvKWgXBrhYkPeOkWfovNLAuKB5m0PVkQvC6w7s="; }; patches = [ @@ -80,17 +80,11 @@ python.pkgs.buildPythonApplication rec { django-tinymce django-treebeard djangocms-alias - # Downgrade to last working version + # Patch froide to avoid loading account module (toPythonModule ( froide.overridePythonAttrs (prev: { - nativeBuildInputs = [ makeBinaryWrapper ]; - postBuild = ""; + patches = prev.patches ++ [ ./froide_avoid_loading_account_module.patch ]; doCheck = false; - pnpmDeps = null; - src = prev.src.override { - rev = "a78a4054f9f37b0a5109a6d8cfbbda742f86a8ca"; - hash = "sha256-gtOssbsVf3nG+pmLPgvh4685vHh2x+jlXiTjU+JhQa8="; - }; }) )) nh3 From a7467905907b10d4ef7ebab3976bc2a046abf98c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 15 Sep 2025 11:34:18 +0200 Subject: [PATCH 2/4] froide: 0-unstable-2025-07-01 -> 0-unstable-2025-09-10 --- pkgs/by-name/fr/froide/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix index 8b5e9ffc64d9..d80d15e03bd2 100644 --- a/pkgs/by-name/fr/froide/package.nix +++ b/pkgs/by-name/fr/froide/package.nix @@ -39,14 +39,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "froide"; - version = "0-unstable-2025-07-01"; + version = "0-unstable-2025-09-10"; pyproject = true; src = fetchFromGitHub { owner = "okfde"; repo = "froide"; - rev = "362bddb5a8fdfe762d59cdebd29016568c9531b2"; - hash = "sha256-c8I/FvXQSkAeacxMQJCpCMKFueNEnLI4R0ElqRbVbNg="; + rev = "826415bbc402c3b71c62477f5eed112787169c95"; + hash = "sha256-K9TMtDfYP6v/lbL7SXeHBa6EngK+fsHgU13C1hat/K0="; }; patches = [ ./django_42_storages.patch ]; From a5f67d17be00327cbe6a97cf060ab97e11fb202c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 15 Sep 2025 11:35:06 +0200 Subject: [PATCH 3/4] django-filingcabinet: 0-unstable-2025-07-01 -> 0-unstable-2025-08-14 --- .../python-modules/django-filingcabinet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix index 78fc0f5d76ae..da154d8c7422 100644 --- a/pkgs/development/python-modules/django-filingcabinet/default.nix +++ b/pkgs/development/python-modules/django-filingcabinet/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "django-filingcabinet"; - version = "0.17-unstable-2025-07-01"; + version = "0.17-unstable-2025-08-14"; pyproject = true; src = fetchFromGitHub { @@ -45,8 +45,8 @@ buildPythonPackage rec { repo = "django-filingcabinet"; # No release tagged yet on GitHub # https://github.com/okfde/django-filingcabinet/issues/69 - rev = "ff39722209acf70bc73fa7074c16ed8a787fceea"; - hash = "sha256-9SrMWBTk7RQCbVPHOU5rB/pi286hb6UONaLmBOtx6X0="; + rev = "e1713921d6d14e0abc8b81315545d7fb6f08c39f"; + hash = "sha256-R/JNI+PZb0H09ZoYCGV3nbAowkf/YlKia4xkgAgqoNM="; }; postPatch = '' From 30a234c358f9e5f629ed8876ba2464d8cf8c344e Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 15 Sep 2025 12:17:58 +0200 Subject: [PATCH 4/4] nixos/tests/froide-govplan: Update changePassword test