From 97cecbeaf0be3b1f2f4c9601b7f50f5d575533cb Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Sun, 22 Aug 2021 15:31:33 -0400 Subject: [PATCH] Remove changedetection --- common/changedetection.io/default.nix | 20 --- common/packages.nix | 1 - flake.lock | 24 ++-- .../overlays/changedetection.io/default.nix | 126 ------------------ 4 files changed, 12 insertions(+), 159 deletions(-) delete mode 100644 common/changedetection.io/default.nix delete mode 100644 modules/overlays/changedetection.io/default.nix diff --git a/common/changedetection.io/default.nix b/common/changedetection.io/default.nix deleted file mode 100644 index 3d1642f..0000000 --- a/common/changedetection.io/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, pkgs, ... }: -let - changedetectionDir = "/var/lib/changedetection.io/"; -in -{ - systemd.services.changedetection = { - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - preStart = '' - mkdir -p ${changedetectionDir}/datastore - ''; - serviceConfig = { - Type = "forking"; - ExecStart = "${pkgs.changedetection.io}/bin/changedetection.py -d ${changedetectionDir}/datastore"; - Restart = "on-failure"; - WorkingDirectory = "${changedetectionDir}"; - }; - }; - -} diff --git a/common/packages.nix b/common/packages.nix index a28a1e7..7a8d7f4 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -165,7 +165,6 @@ in audio-recorder authy calibre - changedetection.io cryptsetup firejail glibcLocales diff --git a/flake.lock b/flake.lock index 363a22d..3993aed 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1629347633, - "narHash": "sha256-FGZJ7lmTAMIkjdrh6dIPck5HuB4KMT2GgDV5ZjiCWoc=", + "lastModified": 1629598480, + "narHash": "sha256-d07nc5Kf2MMKKVe47iIrBT+14/65g2nhEn+Z4PKjFmk=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf6b85136b47ab1a76df4a90ea4850871147494a", + "rev": "f6d1cad6ba228b81bf7045f1124aa99dfdcf3daa", "type": "github" }, "original": { @@ -80,11 +80,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1629274242, - "narHash": "sha256-0qr6pFISilEh/1HsL3NAalRuc6/nJpHcWZx/G/NBkn4=", + "lastModified": 1629595593, + "narHash": "sha256-BoSnxXqC1lpV0yGxakDD5bM96mrx5ZcgVlW+o/GtHMU=", "owner": "neovim", "repo": "neovim", - "rev": "7bff642169438a66557b65d6aba80536eaf570fa", + "rev": "8331cd13c45fb75bff0cec328ccba79b3ae61fa5", "type": "github" }, "original": { @@ -101,11 +101,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1629361007, - "narHash": "sha256-3dSHeYc7rG2sx21hmNzG5FIV27XuqBPCuRN9ImMm/NE=", + "lastModified": 1629619905, + "narHash": "sha256-JKF8cJtMGVztGotmyOJ7ZF0bTxoR+M1SNcEwl3MbDJ4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "ce1e960c55078fd4d51e4198a030a8f5bfc7454c", + "rev": "28658c8a6b504b7646cf65fcf8f911b600a7ce21", "type": "github" }, "original": { @@ -116,11 +116,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1629302925, - "narHash": "sha256-BZUOGUxYk8SXT0rVQIhBkfqUgG1YfStoJadp6iUk9Is=", + "lastModified": 1629534145, + "narHash": "sha256-AiP7DwjntfEySVXVPjbS+iQZ3jJ8UQKRyjCj7Bu4Di4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "878f629005b003fe39c9e619b074e0ff7d9ed0e2", + "rev": "d2d9a58a5c03ea15b401c186508c171c07f9c4f1", "type": "github" }, "original": { diff --git a/modules/overlays/changedetection.io/default.nix b/modules/overlays/changedetection.io/default.nix deleted file mode 100644 index 462fe85..0000000 --- a/modules/overlays/changedetection.io/default.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ lib, fetchFromGitHub, python3, substituteAll }: - -let - py = python3.override { - packageOverrides = self: super: { - jsonpath-ng = super.buildPythonPackage rec { - pname = "jsonpath-ng"; - doCheck = false; - propagatedBuildInputs = with py.pkgs; [ decorator ply six wtforms ]; - version = "1.5.3"; - src = super.fetchPypi { - inherit version pname; - sha256 = "sha256-onOxgqgsElbaq4ajE7k3BZJhtcX4xPo/w4uIKzRN1Wc="; - }; - }; - timeago = super.buildPythonPackage rec { - pname = "timeago"; - version = "1.0.15"; - src = super.fetchPypi { - inherit version pname; - sha256 = "sha256-z85CDYKJKvayQ50Pae6z6Ha77dq2Zww8iOv3Z2QHv0w="; - }; - }; - flask = super.buildPythonPackage rec { - pname = "Flask"; - version = "1.1.4"; - propagatedBuildInputs = with py.pkgs; [ click jinja2 itsdangerous werkzeug ]; - src = super.fetchPypi { - inherit version pname; - sha256 = "sha256-D762GA04OpGG0NbtlU4AQq2fGODo3giLK0GdUmkn0ZY="; - }; - }; - click = super.buildPythonPackage rec { - pname = "click"; - version = "7.1.2"; - src = super.fetchPypi { - inherit version pname; - sha256 = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; - }; - }; - jinja2 = super.buildPythonPackage rec { - pname = "Jinja2"; - version = "2.11.3"; - propagatedBuildInputs = with py.pkgs; [ markupsafe ]; - src = super.fetchPypi { - inherit version pname; - sha256 = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y="; - }; - }; - itsdangerous = super.buildPythonPackage rec { - pname = "itsdangerous"; - version = "1.1.0"; - propagatedBuildInputs = with py.pkgs; [ markupsafe ]; - src = super.fetchPypi { - inherit version pname; - sha256 = "sha256-MhsDPQfypBNtPsdi6snxahDM1g9TwMka+QIXrOe6Hxk="; - }; - }; - werkzeug = super.buildPythonPackage rec { - pname = "Werkzeug"; - version = "1.0.1"; - doCheck = false; - propagatedBuildInputs = with py.pkgs; [ markupsafe ]; - src = super.fetchPypi { - inherit version pname; - sha256 = "sha256-bICx5a02ZSkOo5MguR4b4eDV9gZSuWSjBwIW3oPS5Hw="; - }; - }; - inscriptis = super.buildPythonPackage rec { - pname = "inscriptis"; - version = "1.2"; - propagatedBuildInputs = with py.pkgs; [ lxml requests ]; - src = super.fetchPypi { - inherit version pname; - sha256 = "sha256-B2lFW/YwzCVdR8lwV9VGEW9HRfIii8u48Sy0wK+XeWY="; - }; - }; - }; - }; -in -with py.pkgs; -buildPythonApplication rec { - pname = "changedetection.io"; - version = "0.39"; - - src = fetchFromGitHub { - owner = "dgtlmoon"; - repo = "changedetection.io"; - rev = "a11b6daa2e24933d0a3b9548a02d57c96ed0c09e"; - hash = "sha256-IdPlYa0lBI9xr+ywHuQ3OgNGvvKUIZf/wZ0ITbt2TyM="; - }; - - postPatch = '' - substituteInPlace requirements.txt \ - --replace "chardet==2.3.0" "chardet" \ - --replace "selenium ~= 3.141" "selenium" - ''; - - propagatedBuildInputs = with py.pkgs; [ - apprise - beautifulsoup4 - chardet - eventlet - feedgen - flask - flask_login - inscriptis - jsonpath-ng - pytest - pytest-flask - pytz - requests - selenium - timeago - urllib3 - validators - ]; - - meta = with lib; { - description = - "changedetection.io - The best and simplest self-hosted website change detection monitoring service"; - homepage = "https://github.com/dgtlmoon/changedetection.io"; - license = licenses.asl20; - platforms = platforms.unix; - }; -}