From 689c9db91678758d35b50f76e1caee04a1d94114 Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 22 Jan 2024 15:00:12 +0100 Subject: [PATCH 1/6] pythonPackages.oncalendar: init at 1.0 --- .../python-modules/oncalendar/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/oncalendar/default.nix diff --git a/pkgs/development/python-modules/oncalendar/default.nix b/pkgs/development/python-modules/oncalendar/default.nix new file mode 100644 index 000000000000..976e663857dd --- /dev/null +++ b/pkgs/development/python-modules/oncalendar/default.nix @@ -0,0 +1,30 @@ +{ lib +, python +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "oncalendar"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "cuu508"; + repo = "oncalendar"; + rev = "refs/tags/v${version}"; + hash = "sha256-eQYxOnL4/TJbY/nijcPl8TqK2MrwcdISKGfZQoI7828="; + }; + + checkPhase = '' + ${python.interpreter} setup.py test + ''; + + pythonImportsCheck = [ "oncalendar" ]; + + meta = with lib; { + description = "A systemd OnCalendar expression parser and evaluator"; + homepage = "https://github.com/cuu508/oncalendar"; + license = licenses.bsd3; + maintainers = with maintainers; [ phaer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47752b01aee9..55a6fd244d5b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8955,6 +8955,8 @@ self: super: with self; { omrdatasettools = callPackage ../development/python-modules/omrdatasettools { }; + oncalendar = callPackage ../development/python-modules/oncalendar { }; + ondilo = callPackage ../development/python-modules/ondilo { }; onetimepass = callPackage ../development/python-modules/onetimepass { }; From 0862fe5dcb4733139a34cafb9a8f3b5cd8bed8bc Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 22 Jan 2024 15:12:26 +0100 Subject: [PATCH 2/6] healthchecks: 2.10 -> 3.1 --- pkgs/servers/web-apps/healthchecks/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/servers/web-apps/healthchecks/default.nix index 193452c4354c..2f81c2261726 100644 --- a/pkgs/servers/web-apps/healthchecks/default.nix +++ b/pkgs/servers/web-apps/healthchecks/default.nix @@ -7,32 +7,35 @@ let py = python3.override { packageOverrides = final: prev: { - django = prev.django_4; + django = prev.django_5; }; }; in py.pkgs.buildPythonApplication rec { pname = "healthchecks"; - version = "2.10"; + version = "3.1"; format = "other"; src = fetchFromGitHub { owner = "healthchecks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-1x+pYMHaKgLFWcL1axOv/ok1ebs0I7Q+Q6htncmgJzU="; + sha256 = "sha256-T/0u1ZRte+6PJZgwndTJXe4I9b8x+JXQjQMohZ2xB2g="; }; propagatedBuildInputs = with py.pkgs; [ + aiosmtpd apprise - cron-descriptor cronsim django django-compressor + django-stubs-ext fido2 minio + oncalendar psycopg2 pycurl + pydantic pyotp segno statsd From e92a4bdf78be94542519dfebbd9097c78af9de74 Mon Sep 17 00:00:00 2001 From: phaer Date: Tue, 20 Feb 2024 10:24:59 +0100 Subject: [PATCH 3/6] healthchecks: 3.1 -> 3.2 --- pkgs/servers/web-apps/healthchecks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/servers/web-apps/healthchecks/default.nix index 2f81c2261726..0e542e59fd67 100644 --- a/pkgs/servers/web-apps/healthchecks/default.nix +++ b/pkgs/servers/web-apps/healthchecks/default.nix @@ -13,14 +13,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "healthchecks"; - version = "3.1"; + version = "3.2"; format = "other"; src = fetchFromGitHub { owner = "healthchecks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-T/0u1ZRte+6PJZgwndTJXe4I9b8x+JXQjQMohZ2xB2g="; + sha256 = "sha256-TAhr1PeoGp/zqsnJz9C/w7auip4RdRIFSxvo6haOG0Q="; }; propagatedBuildInputs = with py.pkgs; [ From 55a16a6282d8a601f30b445ee9169949428f731e Mon Sep 17 00:00:00 2001 From: phaer Date: Tue, 20 Feb 2024 10:27:11 +0100 Subject: [PATCH 4/6] nixos/healthchecks: don't compress in debug mode --- nixos/modules/services/web-apps/healthchecks.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/healthchecks.nix b/nixos/modules/services/web-apps/healthchecks.nix index 1d439f162313..04b40e6eb8b0 100644 --- a/nixos/modules/services/web-apps/healthchecks.nix +++ b/nixos/modules/services/web-apps/healthchecks.nix @@ -213,8 +213,7 @@ in preStart = '' ${pkg}/opt/healthchecks/manage.py collectstatic --no-input ${pkg}/opt/healthchecks/manage.py remove_stale_contenttypes --no-input - ${pkg}/opt/healthchecks/manage.py compress - ''; + '' + lib.optionalString (cfg.settings.DEBUG != "True") "${pkg}/opt/healthchecks/manage.py compress"; serviceConfig = commonConfig // { Restart = "always"; From 4dc77756179c775dc9c85f2144dec9f3b041f7c2 Mon Sep 17 00:00:00 2001 From: phaer Date: Fri, 5 Apr 2024 10:33:54 +0000 Subject: [PATCH 5/6] healthchecks: 3.2 -> 3.3 --- pkgs/servers/web-apps/healthchecks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/servers/web-apps/healthchecks/default.nix index 0e542e59fd67..09f029930c3b 100644 --- a/pkgs/servers/web-apps/healthchecks/default.nix +++ b/pkgs/servers/web-apps/healthchecks/default.nix @@ -13,14 +13,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "healthchecks"; - version = "3.2"; + version = "3.3"; format = "other"; src = fetchFromGitHub { owner = "healthchecks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-TAhr1PeoGp/zqsnJz9C/w7auip4RdRIFSxvo6haOG0Q="; + sha256 = "sha256-XQ8nr9z9Yjwr1irExIgYiGX2knMXX701i6BwvXsVP+E="; }; propagatedBuildInputs = with py.pkgs; [ From 08746b5cf79cbdd9ca68fff3ed8bdc72f29b7027 Mon Sep 17 00:00:00 2001 From: phaer Date: Sat, 6 Apr 2024 15:23:11 +0000 Subject: [PATCH 6/6] pythonPackages.oncalendar: use pytestCheckHook --- pkgs/development/python-modules/oncalendar/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/oncalendar/default.nix b/pkgs/development/python-modules/oncalendar/default.nix index 976e663857dd..5b4920a6cef7 100644 --- a/pkgs/development/python-modules/oncalendar/default.nix +++ b/pkgs/development/python-modules/oncalendar/default.nix @@ -1,7 +1,7 @@ { lib -, python , buildPythonPackage , fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { @@ -15,9 +15,7 @@ buildPythonPackage rec { hash = "sha256-eQYxOnL4/TJbY/nijcPl8TqK2MrwcdISKGfZQoI7828="; }; - checkPhase = '' - ${python.interpreter} setup.py test - ''; + nativeBuildInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "oncalendar" ];