Bump changedetection to 0.39

common/packages.nix

@@ -120,13 +120,9 @@ in
         docker
         docker-compose
 
-        # k8s
-        kubectl
-
         # nix
         cachix
         nix-diff
-        # nix-query-tree-viewer
         nixfmt
         nixpkgs-fmt
         nixpkgs-review

flake.lock

@@ -58,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1628808310,
+        "lastModified": 1629151238,
-        "narHash": "sha256-Lo9xNydLgc0r6aJfsK5SdsJOUCpzvx0w4xXsF44kRkQ=",
+        "narHash": "sha256-brMNLZLz8u9+6tSJ9J8dWkp1sT2mFiO3g2jQZVu+rtQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a3d691c05308b43afe264a2165f60948cfd2963e",
+        "rev": "ad0fc085c7b954d5813a950cf0db7143e6b049e3",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1628696316,
+        "lastModified": 1629163732,
-        "narHash": "sha256-SpafCjN4aWqS2zcBc70D8Y0idUJ7ZbNddYct+ucPOT4=",
+        "narHash": "sha256-cdCZ9n+t7ScbgZgJNmHOG+DXWC2z+BFpnSJomkj3bbA=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "7d2233fad007a3dd42481f8ffc01e69b57a17f9e",
+        "rev": "2cb8db34e3a275dec3dacb10fdc75640f4ec8174",
         "type": "github"
       },
       "original": {
@@ -101,11 +101,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1628756199,
+        "lastModified": 1629188208,
-        "narHash": "sha256-yJTh8S4H9Y5IjsGm7GvVwOZ9Nbqvwp7bNd2GBQ8n7+A=",
+        "narHash": "sha256-GaV0ifewbQMhrwHX95cWAkB8z4d1Xzt/LHZ1ezjDK/Q=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "cc2d9d007daa953bddc336d4ad1deeed53a0a567",
+        "rev": "0e6e0dfb9fb7295caf2a482afd972e39d93aa23f",
         "type": "github"
       },
       "original": {
@@ -116,11 +116,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1628440507,
+        "lastModified": 1629007385,
-        "narHash": "sha256-xXnG0f3fuuCbBpiVuzsIOd59AMgTGNE0/tAhMV+oEHY=",
+        "narHash": "sha256-TmLKeB7IACvhmB85/4BCOh84l2cQYc607ZWlKWl/Uec=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7da029f26849f8696ac49652312c9171bf9eb170",
+        "rev": "566f4da36652b1fe404346aafcd2cd02fecf7d43",
         "type": "github"
       },
       "original": {
@@ -132,11 +132,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1628693817,
+        "lastModified": 1629048390,
-        "narHash": "sha256-WtlM8ptjcUUWRvbpkToKJHzLlGCEXZKGh+SfwUYHobA=",
+        "narHash": "sha256-do7HuXFSKyj4ulMlRvGigNZCqOaGD9i0M3OLkFQgEAc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9df2cb074d72ea80ac9fd225b29060c8cf13dd39",
+        "rev": "e41ba38114055832e5ba4a851e9c00149eef3e4a",
         "type": "github"
       },
       "original": {
@@ -148,11 +148,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1628693817,
+        "lastModified": 1629137058,
-        "narHash": "sha256-WtlM8ptjcUUWRvbpkToKJHzLlGCEXZKGh+SfwUYHobA=",
+        "narHash": "sha256-rOOLXq8/HcqlKNTJdSiPqB+kbYdcjBaGwqq6pP5IOfQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9df2cb074d72ea80ac9fd225b29060c8cf13dd39",
+        "rev": "23485f23ff8536592b5178a5d244f84da770bc87",
         "type": "github"
       },
       "original": {

modules/overlays/changedetection.io/default.nix

@@ -81,16 +81,20 @@ in
 with py.pkgs;
 buildPythonApplication rec {
   pname = "changedetection.io";
-  version = "0.38.2";
+  version = "0.39";
 
   src = fetchFromGitHub {
     owner = "dgtlmoon";
     repo = "changedetection.io";
-    rev = "00fe4d4e41f8e2c7690f164da43f1aba1b6a517e";
+    rev = "a11b6daa2e24933d0a3b9548a02d57c96ed0c09e";
-    hash = "sha256-BQyX0lzFC97ly/9TyohXBRluURPJ3nAuPjX6JzXKmXg";
+    hash = "sha256-IdPlYa0lBI9xr+ywHuQ3OgNGvvKUIZf/wZ0ITbt2TyM=";
   };
 
-  patches = [ (substituteAll { src = ./setup.patch; }) ];
+  postPatch = ''
+    substituteInPlace requirements.txt \
+      --replace "chardet==2.3.0" "chardet" \
+      --replace "selenium ~= 3.141" "selenium"
+  '';
 
   propagatedBuildInputs = with py.pkgs; [
     apprise
@@ -106,6 +110,7 @@ buildPythonApplication rec {
     pytest-flask
     pytz
     requests
+    selenium
     timeago
     urllib3
     validators

modules/overlays/changedetection.io/setup.patch

@@ -1,20 +0,0 @@
-new file mode 100644
-index 0000000..e4db3d0
---- /dev/null
-+++ b/MANIFEST.in
-@@ -0,0 +1 @@
-+recursive-include backend *
-diff --git a/setup.py b/setup.py
-new file mode 100644
-index 0000000..82bc34d
---- /dev/null
-+++ b/setup.py
-@@ -0,0 +1,8 @@
-+from setuptools import setup, find_packages
-+
-+setup(
-+    name="changedetection.io",
-+    include_package_data=True,
-+    packages=find_packages(),
-+    scripts = [ './changedetection.py' ],
-+)