From 17f2c5ba71f4a7cd9b19b593aea55fd78f6aaea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 22 Oct 2022 02:14:41 +0200 Subject: [PATCH 1/4] nixos/changedetection-io: fix container having no network --- nixos/modules/services/web-apps/changedetection-io.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/changedetection-io.nix b/nixos/modules/services/web-apps/changedetection-io.nix index 83d8b32c0c83..f6452001a6a2 100644 --- a/nixos/modules/services/web-apps/changedetection-io.nix +++ b/nixos/modules/services/web-apps/changedetection-io.nix @@ -213,6 +213,7 @@ in }; }) ]; + podman.defaultNetwork.dnsname.enable = true; }; }; } From 30df44aac2a41f07848e6cbb78baccd190f558b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 23 Oct 2022 01:45:37 +0200 Subject: [PATCH 2/4] nixos/changedetection-io: fix typos --- nixos/modules/services/web-apps/changedetection-io.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/changedetection-io.nix b/nixos/modules/services/web-apps/changedetection-io.nix index f6452001a6a2..6a54311e35ed 100644 --- a/nixos/modules/services/web-apps/changedetection-io.nix +++ b/nixos/modules/services/web-apps/changedetection-io.nix @@ -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}" From 544524895f3ad54632fb838702cd85fd38b97562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 23 Oct 2022 01:46:30 +0200 Subject: [PATCH 3/4] changedetection-io: fix html extraction always returning no content --- pkgs/servers/web-apps/changedetection-io/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index c86357637e48..3ccc41859853 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -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 { From 8c16a6638bf8486f5a17f4deadadb9ba6e1772ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 23 Oct 2022 01:46:46 +0200 Subject: [PATCH 4/4] changedetection-io: 0.39.20.3 -> 0.39.20.4 --- pkgs/servers/web-apps/changedetection-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index 3ccc41859853..495da0192706 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -42,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 = ''