From a8dc5506dcf44703914c30a69bcd850e4e9082a9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Feb 2025 01:24:53 +0100 Subject: [PATCH 1/7] python312Packages.django-i18nfield: fix 1.10.2 version bump --- .../python-modules/django-i18nfield/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-i18nfield/default.nix b/pkgs/development/python-modules/django-i18nfield/default.nix index 9a4918ee168f..06b89d1101cf 100644 --- a/pkgs/development/python-modules/django-i18nfield/default.nix +++ b/pkgs/development/python-modules/django-i18nfield/default.nix @@ -3,6 +3,9 @@ buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, + # tests djangorestframework, html5lib, @@ -12,18 +15,20 @@ pyyaml, }: -buildPythonPackage { +buildPythonPackage rec { pname = "django-i18nfield"; version = "1.10.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "raphaelm"; repo = "django-i18nfield"; - rev = "10488eb6c673be50e50387c76085a7c8d84e9157"; - hash = "sha256-FF980LTw7RFuG9QgxA96yJsSczCNNMq9WsbacQqIReE="; + tag = version; + hash = "sha256-27PR2jLDXxRSgbJvRxDSBK4sTiqGAhP+XYg/fCg9AzM="; }; + build-system = [ setuptools ]; + env.DJANGO_SETTINGS_MODULE = "tests.settings"; nativeCheckInputs = [ From 5f0d280210d0e4e9ca516f5522786d1247677820 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Feb 2025 01:25:25 +0100 Subject: [PATCH 2/7] python312Packages.django-statici18n: 2.5.0 -> 2.6.0 https://github.com/zyegfryed/django-statici18n/compare/refs/tags/v2.5.0...v2.6.0 --- pkgs/development/python-modules/django-statici18n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix index b233ad229b66..e48234004cc6 100644 --- a/pkgs/development/python-modules/django-statici18n/default.nix +++ b/pkgs/development/python-modules/django-statici18n/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "django-statici18n"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "zyegfryed"; repo = "django-statici18n"; tag = "v${version}"; - hash = "sha256-n6HqHcXvz2ihwN+gJr5P+/Yt4RpuOu2yAjo9fiNZB54="; + hash = "sha256-G1JF/AQEDgvDamvjCYiQM7b6HfbdMBhfEUvT3yL1io0="; }; build-system = [ setuptools ]; From bce9b0fde9d50fa2db330fbd1de51a7bc2d49e2e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Feb 2025 01:28:48 +0100 Subject: [PATCH 3/7] pretix: 2024.11.0 -> 2025.1.0 https://pretix.eu/about/en/blog/20250131-release-2025-1-0/ https://github.com/pretix/pretix/compare/refs/tags/v2024.11.0...v2025.1.0 --- nixos/modules/services/web-apps/pretix.nix | 2 +- pkgs/by-name/pr/pretix/package.nix | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/web-apps/pretix.nix b/nixos/modules/services/web-apps/pretix.nix index 68b65e2260d2..75c95464d6fa 100644 --- a/nixos/modules/services/web-apps/pretix.nix +++ b/nixos/modules/services/web-apps/pretix.nix @@ -439,7 +439,7 @@ in expires 7d; ''; }; - "^~ /media/(cachedfiles|invoices)" = { + "^~ (/media/(cachedfiles|invoices)|/static/(staticfiles.json|CACHE/manifest.json))" = { extraConfig = '' deny all; return 404; diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 2cb5569135a5..95aa85019412 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -3,7 +3,6 @@ buildNpmPackage, fetchFromGitHub, fetchPypi, - fetchpatch2, nodejs, python3, gettext, @@ -43,13 +42,13 @@ let }; pname = "pretix"; - version = "2024.11.0"; + version = "2025.1.0"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; rev = "refs/tags/v${version}"; - hash = "sha256-vmk7oW9foXkZdt3XOLJDbPldX2TruJOgd8mmi5tGqNw="; + hash = "sha256-azJFXuoV+9qs5MJQTkc1+ZiJb6UKwEa0Ow0p31CkHqI="; }; npmDeps = buildNpmPackage { @@ -57,7 +56,7 @@ let inherit version src; sourceRoot = "${src.name}/src/pretix/static/npm_dir"; - npmDepsHash = "sha256-4PrOrI2cykkuzob+DMeAu/GF5OMCho40G3BjCwVW/tE="; + npmDepsHash = "sha256-oo9fo3MjwKYA8gueJ5otIPawORaVNj/Js3y8ZuCZ4qQ="; dontBuild = true; @@ -79,12 +78,6 @@ python.pkgs.buildPythonApplication rec { # Discover pretix.plugin entrypoints during build and add them into # INSTALLED_APPS, so that their static files are collected. ./plugin-build.patch - - (fetchpatch2 { - # fix tests after 2025-01-01 - url = "https://github.com/pretix/pretix/commit/5a5a551c21461d9ef36337480c9874d65a9fdba9.patch"; - hash = "sha256-ZtSVI6nVlJtNrnBZ9ktIqFGtNf+oWtvNsgCWwOUwVug="; - }) ]; pythonRelaxDeps = [ From 7f1052a12c58a9e942981d952dc3b0a91fe1025e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Feb 2025 01:39:07 +0100 Subject: [PATCH 4/7] pretix.plugins.mollie: 2.2.1 -> 2.2.2 https://github.com/pretix/pretix-mollie/compare/refs/tags/v2.2.1...v2.2.2 --- pkgs/by-name/pr/pretix/plugins/mollie.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pretix/plugins/mollie.nix b/pkgs/by-name/pr/pretix/plugins/mollie.nix index da15098b01d2..e843a85c9329 100644 --- a/pkgs/by-name/pr/pretix/plugins/mollie.nix +++ b/pkgs/by-name/pr/pretix/plugins/mollie.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pretix-mollie"; - version = "2.2.1"; + version = "2.2.2"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-mollie"; tag = "v${version}"; - hash = "sha256-utrdFrE4XHDTi/45gUTFarD+PQoGIHc4gTkDR8dGu40="; + hash = "sha256-yc4t+XtHk7u3KcfeS+0CSTrBJ6e6SyLRpaQBHAKYVvo="; }; build-system = [ From f5d47da8739ff0b036dbd08ab95af5310421ed03 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Feb 2025 01:40:07 +0100 Subject: [PATCH 5/7] pretix.plugins.zugferd: 2.2.2 -> 2.3.0 https://github.com/pretix/pretix-zugferd/compare/v2.2.2...v2.3.0 --- pkgs/by-name/pr/pretix/plugins/zugferd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd.nix b/pkgs/by-name/pr/pretix/plugins/zugferd.nix index bada0bbc9bfd..55f2300ab98f 100644 --- a/pkgs/by-name/pr/pretix/plugins/zugferd.nix +++ b/pkgs/by-name/pr/pretix/plugins/zugferd.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pretix-zugferd"; - version = "2.2.2"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-zugferd"; rev = "v${version}"; - hash = "sha256-urf5HrC3Y64hH+U738t9fchoeR2sawlJAQoLFtwebA4="; + hash = "sha256-/efhp9B/cw/C3Bok8/E93dOrP9FHfaVZNSwC/j2lNuA="; }; postPatch = '' From d14cc4ae043f3bcaafb9f9a867c4d9f5ec3f3dd5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Feb 2025 01:50:42 +0100 Subject: [PATCH 6/7] pretix.plugins: migrate to auto-calling --- pkgs/by-name/pr/pretix/package.nix | 3 ++- pkgs/by-name/pr/pretix/plugins/default.nix | 18 ------------------ .../plugins/{mollie.nix => mollie/package.nix} | 0 .../plugins/{pages.nix => pages/package.nix} | 0 .../openssl.patch} | 0 .../{passbook.nix => passbook/package.nix} | 2 +- .../package.nix} | 0 .../package.nix} | 0 .../{zugferd.nix => zugferd/package.nix} | 0 9 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 pkgs/by-name/pr/pretix/plugins/default.nix rename pkgs/by-name/pr/pretix/plugins/{mollie.nix => mollie/package.nix} (100%) rename pkgs/by-name/pr/pretix/plugins/{pages.nix => pages/package.nix} (100%) rename pkgs/by-name/pr/pretix/plugins/{passbook-openssl.patch => passbook/openssl.patch} (100%) rename pkgs/by-name/pr/pretix/plugins/{passbook.nix => passbook/package.nix} (96%) rename pkgs/by-name/pr/pretix/plugins/{reluctant-stripe.nix => reluctant-stripe/package.nix} (100%) rename pkgs/by-name/pr/pretix/plugins/{stretchgoals.nix => stretchgoals/package.nix} (100%) rename pkgs/by-name/pr/pretix/plugins/{zugferd.nix => zugferd/package.nix} (100%) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 95aa85019412..310ffdc66674 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -266,8 +266,9 @@ python.pkgs.buildPythonApplication rec { python ; plugins = lib.recurseIntoAttrs ( - python.pkgs.callPackage ./plugins { + lib.packagesFromDirectoryRecursive { inherit (python.pkgs) callPackage; + directory = ./plugins; } ); tests = { diff --git a/pkgs/by-name/pr/pretix/plugins/default.nix b/pkgs/by-name/pr/pretix/plugins/default.nix deleted file mode 100644 index 12c9b6fa02bf..000000000000 --- a/pkgs/by-name/pr/pretix/plugins/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - callPackage, - ... -}: - -{ - mollie = callPackage ./mollie.nix { }; - - pages = callPackage ./pages.nix { }; - - passbook = callPackage ./passbook.nix { }; - - reluctant-stripe = callPackage ./reluctant-stripe.nix { }; - - stretchgoals = callPackage ./stretchgoals.nix { }; - - zugferd = callPackage ./zugferd.nix { }; -} diff --git a/pkgs/by-name/pr/pretix/plugins/mollie.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix similarity index 100% rename from pkgs/by-name/pr/pretix/plugins/mollie.nix rename to pkgs/by-name/pr/pretix/plugins/mollie/package.nix diff --git a/pkgs/by-name/pr/pretix/plugins/pages.nix b/pkgs/by-name/pr/pretix/plugins/pages/package.nix similarity index 100% rename from pkgs/by-name/pr/pretix/plugins/pages.nix rename to pkgs/by-name/pr/pretix/plugins/pages/package.nix diff --git a/pkgs/by-name/pr/pretix/plugins/passbook-openssl.patch b/pkgs/by-name/pr/pretix/plugins/passbook/openssl.patch similarity index 100% rename from pkgs/by-name/pr/pretix/plugins/passbook-openssl.patch rename to pkgs/by-name/pr/pretix/plugins/passbook/openssl.patch diff --git a/pkgs/by-name/pr/pretix/plugins/passbook.nix b/pkgs/by-name/pr/pretix/plugins/passbook/package.nix similarity index 96% rename from pkgs/by-name/pr/pretix/plugins/passbook.nix rename to pkgs/by-name/pr/pretix/plugins/passbook/package.nix index d5ca08315f18..ad0ae3febf62 100644 --- a/pkgs/by-name/pr/pretix/plugins/passbook.nix +++ b/pkgs/by-name/pr/pretix/plugins/passbook/package.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { patches = [ (substituteAll { - src = ./passbook-openssl.patch; + src = ./openssl.patch; openssl = lib.getExe openssl; }) ]; diff --git a/pkgs/by-name/pr/pretix/plugins/reluctant-stripe.nix b/pkgs/by-name/pr/pretix/plugins/reluctant-stripe/package.nix similarity index 100% rename from pkgs/by-name/pr/pretix/plugins/reluctant-stripe.nix rename to pkgs/by-name/pr/pretix/plugins/reluctant-stripe/package.nix diff --git a/pkgs/by-name/pr/pretix/plugins/stretchgoals.nix b/pkgs/by-name/pr/pretix/plugins/stretchgoals/package.nix similarity index 100% rename from pkgs/by-name/pr/pretix/plugins/stretchgoals.nix rename to pkgs/by-name/pr/pretix/plugins/stretchgoals/package.nix diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd.nix b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix similarity index 100% rename from pkgs/by-name/pr/pretix/plugins/zugferd.nix rename to pkgs/by-name/pr/pretix/plugins/zugferd/package.nix From 2a6f860d88f085f4891a319d1a4f81549a3d1c5b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Feb 2025 02:19:58 +0100 Subject: [PATCH 7/7] python312Packages.django-localflavor: refactor --- .../django-localflavor/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/django-localflavor/default.nix b/pkgs/development/python-modules/django-localflavor/default.nix index 0ccadac6705d..7576c4e83eef 100644 --- a/pkgs/development/python-modules/django-localflavor/default.nix +++ b/pkgs/development/python-modules/django-localflavor/default.nix @@ -3,10 +3,11 @@ buildPythonPackage, fetchFromGitHub, - # bring your own - django, + # build-system + setuptools, - # propagates + # dependencies + django, python-stdnum, # tests @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "django-localflavor"; version = "4.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "django"; @@ -26,9 +27,12 @@ buildPythonPackage rec { hash = "sha256-UWp3ei1VlEsEfjbJIE+MpffSzYF4X1HEQw+z+5kZoP0="; }; - buildInputs = [ django ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ python-stdnum ]; + dependencies = [ + django + python-stdnum + ]; pythonImportsCheck = [ # samples @@ -41,12 +45,12 @@ buildPythonPackage rec { "localflavor.za" ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; - DJANGO_SETTINGS_MODULE = "tests.settings"; + env.DJANGO_SETTINGS_MODULE = "tests.settings"; meta = with lib; { description = "Country-specific Django helpers";