Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

healthchecks: 2.10 -> 3.3 #282912

Merged
merged 6 commits into from
Apr 7, 2024
Merged

healthchecks: 2.10 -> 3.3 #282912

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
689c9db
pythonPackages.oncalendar: init at 1.0
phaer Jan 22, 2024
0862fe5
healthchecks: 2.10 -> 3.1
phaer Jan 22, 2024
e92a4bd
healthchecks: 3.1 -> 3.2
phaer Feb 20, 2024
55a16a6
nixos/healthchecks: don't compress in debug mode
phaer Feb 20, 2024
4dc7775
healthchecks: 3.2 -> 3.3
phaer Apr 5, 2024
08746b5
pythonPackages.oncalendar: use pytestCheckHook
phaer Apr 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions nixos/modules/services/web-apps/healthchecks.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
phaer marked this conversation as resolved.
Show resolved Hide resolved

serviceConfig = commonConfig // {
Restart = "always";
Expand Down
30 changes: 30 additions & 0 deletions pkgs/development/python-modules/oncalendar/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=";
};

phaer marked this conversation as resolved.
Show resolved Hide resolved
checkPhase = ''
${python.interpreter} setup.py test
phaer marked this conversation as resolved.
Show resolved Hide resolved
'';

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 ];
};
}
11 changes: 7 additions & 4 deletions pkgs/servers/web-apps/healthchecks/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3";
format = "other";

src = fetchFromGitHub {
owner = "healthchecks";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-1x+pYMHaKgLFWcL1axOv/ok1ebs0I7Q+Q6htncmgJzU=";
sha256 = "sha256-XQ8nr9z9Yjwr1irExIgYiGX2knMXX701i6BwvXsVP+E=";
};

propagatedBuildInputs = with py.pkgs; [
aiosmtpd
apprise
cron-descriptor
cronsim
django
django-compressor
django-stubs-ext
fido2
minio
oncalendar
psycopg2
pycurl
pydantic
pyotp
segno
statsd
Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down