froide-govplan: 0-unstable-2025-06-25 -> 0-unstable-2025-07-14 (#443111)

This commit is contained in:
Yt
2025-09-19 18:41:23 +00:00
committed by GitHub
4 changed files with 29 additions and 17 deletions
@@ -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
+5 -11
View File
@@ -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
+3 -3
View File
@@ -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 ];
@@ -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 = ''