From e0346dd599e347db345e09361c1af8d4c29559bc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 7 Apr 2024 12:54:21 +0200 Subject: [PATCH 1/3] python311Packages.django-countries: 7.5.1 -> 7.6.1 https://github.com/SmileyChris/django-countries/blob/v7.6.1/CHANGES.rst --- .../python-modules/django-countries/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/django-countries/default.nix b/pkgs/development/python-modules/django-countries/default.nix index 95da90866e655..69262c0840626 100644 --- a/pkgs/development/python-modules/django-countries/default.nix +++ b/pkgs/development/python-modules/django-countries/default.nix @@ -2,10 +2,10 @@ , buildPythonPackage , fetchFromGitHub -# build +# build-system , setuptools -# propagates +# dependencies , asgiref , typing-extensions @@ -19,21 +19,21 @@ buildPythonPackage rec { pname = "django-countries"; - version = "7.5.1"; - format = "pyproject"; + version = "7.6.1"; + pyproject = true; src = fetchFromGitHub { owner = "SmileyChris"; repo = "django-countries"; rev = "refs/tags/v${version}"; - hash = "sha256-se6s0sgIfMLW0sIMp/3vK4KdDPQ5ahg6OQCDAs4my4M="; + hash = "sha256-IR9cJbDVkZrcF3Ti70mV8VeXINQDK8OpwUTWVjD4Zn0="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ asgiref typing-extensions ]; From 6960589038b25d78ce5c4e0c023c3d2fb3bb6599 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 7 Apr 2024 12:57:15 +0200 Subject: [PATCH 2/3] pretix: relax django-countries constraint --- pkgs/by-name/pr/pretix/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index efb0c579bb45c..c8f31b88a7d60 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -82,6 +82,7 @@ python.pkgs.buildPythonApplication rec { --replace-fail vat_moss_forked==2020.3.20.0.11.0 vat-moss \ --replace-fail "bleach==5.0.*" bleach \ --replace-fail "dnspython==2.6.*" dnspython \ + --replace-fail "django-countries==7.5.*" django-countries \ --replace-fail "django-filter==24.1" django-filter \ --replace-fail "importlib_metadata==7.*" importlib_metadata \ --replace-fail "markdown==3.6" markdown \ From 0f248ad5dbdb2ba2008069efa076c9ef5bbe8304 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 7 Apr 2024 13:05:16 +0200 Subject: [PATCH 3/3] pretalx: relax cssutils & django-filter constraint --- pkgs/by-name/pr/pretalx/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index bea6f3cc41c47..9f733eeb8fe4b 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -85,7 +85,9 @@ python.pkgs.buildPythonApplication rec { ]); pythonRelaxDeps = [ + "cssutils" "django-csp" + "django-filter" "python-dateutil" ];