From ded217e525f2180d7fb1dfb1647efa41062bd63b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 May 2023 17:42:03 +0200 Subject: [PATCH 1/3] python310Packages.django-hijack: rename from django_hijack This normalizes the package name according to PEP503. --- .../python-modules/django-hijack-admin/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix index 624c5ba258b2..9d3f931cac5f 100644 --- a/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, python, - django_hijack, django_nose }: + django-hijack, django_nose }: buildPythonPackage rec { pname = "django-hijack-admin"; version = "2.1.10"; @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ django_nose ]; - propagatedBuildInputs = [ django_hijack ]; + propagatedBuildInputs = [ django-hijack ]; checkPhase = '' runHook preCheck diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 882c75b9aed8..5345f6042311 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -85,6 +85,7 @@ mapAliases ({ django_environ = django-environ; # added 2021-12-25 django_extensions = django-extensions; # added 2022-01-09 django_guardian = django-guardian; # added 2022-05-19 + django_hijack = django-hijack; # added 2023-05-16 django_modelcluster = django-modelcluster; # added 2022-04-02 django_reversion = django-reversion; # added 2022-06-18 django_polymorphic = django-polymorphic; # added 2022-05-24 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f2309f864cf..67e25e52099a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2693,8 +2693,7 @@ self: super: with self; { django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; - django_hijack = callPackage ../development/python-modules/django-hijack { }; - # This package may need an older version of Django. Override the package set and set e.g. `django = super.django_1_9`. See the Nixpkgs manual for examples on how to override the package set. + django-hijack = callPackage ../development/python-modules/django-hijack { }; django-i18nfield = callPackage ../development/python-modules/django-i18nfield { }; From 1149329a284b8e0c239087622e066df194a05d28 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 May 2023 17:43:57 +0200 Subject: [PATCH 2/3] python310Packages.django-hijack-admin: rename from django_hijack_admin Normalizes the pname according to PEP503. --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5345f6042311..fe4c3b9d6f21 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -86,6 +86,7 @@ mapAliases ({ django_extensions = django-extensions; # added 2022-01-09 django_guardian = django-guardian; # added 2022-05-19 django_hijack = django-hijack; # added 2023-05-16 + django_hijack_admin = django-hijack-admin; # added 2023-05-16 django_modelcluster = django-modelcluster; # added 2022-04-02 django_reversion = django-reversion; # added 2022-06-18 django_polymorphic = django-polymorphic; # added 2022-05-24 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67e25e52099a..d0e52d8c184e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2691,7 +2691,7 @@ self: super: with self; { django-hierarkey = callPackage ../development/python-modules/django-hierarkey { }; - django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; + django-hijack-admin = callPackage ../development/python-modules/django-hijack-admin { }; django-hijack = callPackage ../development/python-modules/django-hijack { }; From 31aa936b15dfb39f536e87b63bf161c2c7fd0ff5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 May 2023 17:44:33 +0200 Subject: [PATCH 3/3] python310Packages.django-hijack: 3.2.6 -> 3.3.0 https://github.com/django-hijack/django-hijack/releases/tag/3.2.7 https://github.com/django-hijack/django-hijack/releases/tag/3.3.0 --- .../python-modules/django-hijack/default.nix | 61 +++++++++++++------ 1 file changed, 44 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index cefcf75f6b56..47719995c69a 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -1,28 +1,57 @@ { lib -, fetchPypi +, fetchFromGitHub +, fetchNpmDeps , buildPythonPackage + +# build-system +, gettext +, nodejs +, npmHooks +, setuptools-scm + +# dependencies , django , django_compat + +# tests , pytest-django , pytestCheckHook }: buildPythonPackage rec { pname = "django-hijack"; - version = "3.2.6"; + version = "3.3.0"; + format = "setuptools"; - # the wheel comes with pre-built assets, allowing us to avoid fighting - # with npm/webpack/gettext to build them ourselves. - format = "wheel"; - - src = fetchPypi { - inherit version format; - pname = "django_hijack"; - dist = "py3"; - python = "py3"; - hash = "sha256-xFPZ03II1814+bZ5gx7GD/AxYMiLuH6awfSeXEraOHQ="; + src = fetchFromGitHub { + owner = "django-hijack"; + repo = "django-hijack"; + rev = "refs/tags/${version}"; + hash = "sha256-ytQ4xxkBAC3amQbenD8RO5asrbfNAjOspWUY3c2hkig="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'cmd = ["npm", "ci"]' 'cmd = ["true"]' \ + --replace 'f"{self.build_lib}/{name}.mo"' 'f"{name}.mo"' + + sed -i "/addopts/d" setup.cfg + ''; + + npmDeps = fetchNpmDeps { + inherit src; + hash = "sha256-FLfMCn2jsLlTTsC+LRMX0dmVCCbNAr2pQUsSQRKgo6E="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + gettext + nodejs + npmHooks.npmConfigHook + setuptools-scm + ]; + propagatedBuildInputs = [ django django_compat @@ -33,13 +62,11 @@ buildPythonPackage rec { pytest-django ]; - preCheck = '' - export DJANGO_SETTINGS_MODULE='hijack.tests.test_app.settings' - ''; + env.DJANGO_SETTINGS_MODULE = "hijack.tests.test_app.settings"; pytestFlagsArray = [ - "--pyargs" - "hijack" + "--pyargs" "hijack" + "-W" "ignore::DeprecationWarning" ]; meta = with lib; {