From b467d83887d98f76eaca47473a7bfd515ec1ee20 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 15 Sep 2025 11:33:41 +0200 Subject: [PATCH] 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