From 49e22ef4aa5090ba9a7bea50b4fa37ec7196e9fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:43:22 +0100 Subject: [PATCH 1/3] python312Packages.django-cors-headers: 4.4.0 -> 4.6.0 Diff: https://github.com/adamchainz/django-cors-headers/compare/4.4.0...4.6.0 --- .../python-modules/django-cors-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 6271f6ade6f4..ab6026814d42 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "4.4.0"; + version = "4.6.0"; pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; repo = pname; rev = version; - hash = "sha256-/uTQ09zIjRV1Ilb/mXyr4zn5tJI/mNFHpfql2ptuER4="; + hash = "sha256-Dvsuj+U1YFC9jT5qkh2h1aL71JkRsAyXW4rxhLzEbOw="; }; build-system = [ setuptools ]; From f112d204e18aafce8b78852ef26f19054739bb05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:45:25 +0100 Subject: [PATCH 2/3] python312Packages.django-cors-headers: refactor --- .../django-cors-headers/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index ab6026814d42..c175f21bc01b 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -1,11 +1,13 @@ { lib, - fetchFromGitHub, + asgiref, buildPythonPackage, - setuptools, django, + fetchFromGitHub, pytest-django, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -13,16 +15,21 @@ buildPythonPackage rec { version = "4.6.0"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "adamchainz"; - repo = pname; - rev = version; + repo = "django-cors-headers"; + tag = version; hash = "sha256-Dvsuj+U1YFC9jT5qkh2h1aL71JkRsAyXW4rxhLzEbOw="; }; build-system = [ setuptools ]; - dependencies = [ django ]; + dependencies = [ + asgiref + django + ]; nativeCheckInputs = [ pytest-django @@ -34,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers"; homepage = "https://github.com/OttoYiu/django-cors-headers"; + changelog = "https://github.com/adamchainz/django-cors-headers/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = [ ]; }; From d24593e0424afe4ba2a32708d0662113772a71e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 12:00:34 +0100 Subject: [PATCH 3/3] python313Packages.netbox-qrcode: add missing inputs --- .../python-modules/netbox-qrcode/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/netbox-qrcode/default.nix b/pkgs/development/python-modules/netbox-qrcode/default.nix index d2dacfa5ec84..39b29b9b6fed 100644 --- a/pkgs/development/python-modules/netbox-qrcode/default.nix +++ b/pkgs/development/python-modules/netbox-qrcode/default.nix @@ -1,13 +1,15 @@ { lib, buildPythonPackage, + django, fetchFromGitHub, - setuptools, - wheel, + netaddr, + netbox, pillow, qrcode, - netbox, + setuptools, }: + buildPythonPackage rec { pname = "netbox-qrcode"; version = "0.0.15"; @@ -16,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-qrcode"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-gEBOjmX7dcLjiy0u6raAtAaqZUVYsPz3YhupjRRqVDE="; }; @@ -27,7 +29,11 @@ buildPythonPackage rec { pillow ]; - nativeCheckInputs = [ netbox ]; + nativeCheckInputs = [ + django + netaddr + netbox + ]; preFixup = '' export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH