From dac793ec0602020264c7cc9ce4c0814e0833228c Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Tue, 20 May 2025 12:54:39 +0800 Subject: [PATCH 1/3] python3Packages.django-auditlog: avoid with lib; --- pkgs/development/python-modules/django-auditlog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix index 880512f617de..484764123a19 100644 --- a/pkgs/development/python-modules/django-auditlog/default.nix +++ b/pkgs/development/python-modules/django-auditlog/default.nix @@ -61,11 +61,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "auditlog" ]; - meta = with lib; { + meta = { changelog = "https://github.com/jazzband/django-auditlog/blob/v${version}/CHANGELOG.md"; description = "Django app that keeps a log of changes made to an object"; downloadPage = "https://github.com/jazzband/django-auditlog"; - license = licenses.mit; - maintainers = with maintainers; [ leona ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ leona ]; }; } From 8f4ca275547010db22069d9667c1d99d23f09027 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Tue, 20 May 2025 12:55:43 +0800 Subject: [PATCH 2/3] python3Packages.django-auditlog: 3.0.0 -> 3.1.2 --- .../python-modules/django-auditlog/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix index 484764123a19..9a2cb264f816 100644 --- a/pkgs/development/python-modules/django-auditlog/default.nix +++ b/pkgs/development/python-modules/django-auditlog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "django-auditlog"; - version = "3.0.0"; + version = "3.1.2"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "django-auditlog"; - rev = "v${version}"; - hash = "sha256-SJ4GJp/gVIxiLbdAj3ZS+weevqIDZCMQnW/pqc5liJU="; + tag = "v${version}"; + hash = "sha256-xb6pTsXkB8HVpXvB9WzBUlRcjh5cn1CdmMYQQVCQ/GU="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "auditlog" ]; meta = { - changelog = "https://github.com/jazzband/django-auditlog/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jazzband/django-auditlog/blob/${src.tag}/CHANGELOG.md"; description = "Django app that keeps a log of changes made to an object"; downloadPage = "https://github.com/jazzband/django-auditlog"; license = lib.licenses.mit; From 21e09dce2acd5efe4160aca6b25f1e40e2e055e1 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Tue, 20 May 2025 13:06:34 +0800 Subject: [PATCH 3/3] python3Packages.django-auditlog: fix tests --- pkgs/development/python-modules/django-auditlog/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix index 9a2cb264f816..4b488a328ae8 100644 --- a/pkgs/development/python-modules/django-auditlog/default.nix +++ b/pkgs/development/python-modules/django-auditlog/default.nix @@ -50,11 +50,13 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck + cd auditlog_tests # strip escape codes otherwise tests fail # see https://github.com/jazzband/django-auditlog/issues/644 TEST_DB_USER=$PGUSER \ TEST_DB_HOST=$PGHOST \ - ${python.interpreter} runtests.py | cat + ${python.interpreter} ./manage.py test | cat + cd .. runHook postCheck '';