JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #197144 from SuperSandro2000/changedetection-io-network

Browse Source
This commit is contained in:
Sandro 2022-10-23 03:27:52 +02:00 committed by GitHub
commit 6ffd08e152
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/web-apps/changedetection-io.nix
View File

@ -119,7 +119,7 @@ in
assertions = [
{
assertion = !((cfg.webDriverSupport == true) && (cfg.playwrightSupport == true));
message = "'services.changedetection-io.webDriverSupport' and 'services.changedetion-io.playwrightSupport' cannot be used together.";
message = "'services.changedetection-io.webDriverSupport' and 'services.changedetection-io.playwrightSupport' cannot be used together.";
}
];
@ -135,7 +135,7 @@ in
serviceConfig = {
User = cfg.user;
Group = cfg.group;
StateDirectory = mkIf defaultStateDir "changedetion-io";
StateDirectory = mkIf defaultStateDir "changedetection-io";
StateDirectoryMode = mkIf defaultStateDir "0750";
WorkingDirectory = cfg.datastorePath;
Environment = lib.optional (cfg.baseURL != null) "BASE_URL=${cfg.baseURL}"
@ -213,6 +213,7 @@ in
};
})
];
podman.defaultNetwork.dnsname.enable = true;
};
};
}

16
pkgs/servers/web-apps/changedetection-io/default.nix
View File

@ -1,5 +1,6 @@
{ lib
, fetchFromGitHub
, fetchurl
, python3
}:
let
@ -18,6 +19,17 @@ let
"test_redirect"
];
});
lxml = prev.lxml.override {
libxml2 = prev.libxml2.overrideAttrs (old: rec {
# etree.fromstring always returns None with 2.10.0
version = "2.9.14";
src = fetchurl {
url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
sha256 = "sha256-YNdKJX0czsBHXnScui8hVZ5IE577pv8oIkNXx8eY3+4=";
};
});
};
werkzeug = prev.werkzeug.overridePythonAttrs (old: rec {
version = "2.0.3";
src = old.src.override {
@ -30,14 +42,14 @@ let
in
py.pkgs.buildPythonApplication rec {
pname = "changedetection-io";
version = "0.39.20.3";
version = "0.39.20.4";
format = "setuptools";
src = fetchFromGitHub {
owner = "dgtlmoon";
repo = "changedetection.io";
rev = version;
sha256 = "sha256-0Sv/1YoZuSnslQgMOu+uHTxb9QewXPC0tLAvzJA4Aa8=";
sha256 = "sha256-XhCByQbGWAwWe71jsitpYJnQ2xRIdmhc9mY6Smxmp3w=";
};
postPatch = ''