From 15f577daaa2b382b59a1eb7ed8ca9c826e58495e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Jan 2022 02:17:29 +0100 Subject: [PATCH] couchpotato, nixos/couchpotato: remove Using python2 and abadoned upstream in 2020, last release in 2015. --- nixos/modules/misc/ids.nix | 4 +- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + nixos/modules/services/misc/couchpotato.nix | 42 -------------------- pkgs/servers/couchpotato/default.nix | 44 --------------------- pkgs/top-level/all-packages.nix | 2 - 6 files changed, 3 insertions(+), 91 deletions(-) delete mode 100644 nixos/modules/services/misc/couchpotato.nix delete mode 100644 pkgs/servers/couchpotato/default.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index a9f2031d1e1..d7fc9ca87d4 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -296,7 +296,7 @@ in infinoted = 264; sickbeard = 265; headphones = 266; - couchpotato = 267; + # couchpotato = 267; # unused, removed 2022-01-01 gogs = 268; #pdns-recursor = 269; # dynamically allocated as of 2020-20-18 #kresd = 270; # switched to "knot-resolver" with dynamic ID @@ -603,7 +603,7 @@ in infinoted = 264; sickbeard = 265; headphones = 266; - couchpotato = 267; + # couchpotato = 267; # unused, removed 2022-01-01 gogs = 268; #kresd = 270; # switched to "knot-resolver" with dynamic ID #rpc = 271; # unused diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e8bbaacc2c5..5dd98644ac8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -511,7 +511,6 @@ ./services/misc/cpuminer-cryptonight.nix ./services/misc/cgminer.nix ./services/misc/confd.nix - ./services/misc/couchpotato.nix ./services/misc/dendrite.nix ./services/misc/devmon.nix ./services/misc/dictd.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 15c3a8dc1ab..0171a8511d5 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -20,6 +20,7 @@ with lib; (mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.") (mkRemovedOptionModule [ "services" "quagga" ] "the corresponding package has been removed from nixpkgs") (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.") (mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.") diff --git a/nixos/modules/services/misc/couchpotato.nix b/nixos/modules/services/misc/couchpotato.nix deleted file mode 100644 index f5163cf86cf..00000000000 --- a/nixos/modules/services/misc/couchpotato.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.couchpotato; - -in -{ - options = { - services.couchpotato = { - enable = mkEnableOption "CouchPotato Server"; - }; - }; - - config = mkIf cfg.enable { - systemd.services.couchpotato = { - description = "CouchPotato Server"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - Type = "simple"; - User = "couchpotato"; - Group = "couchpotato"; - StateDirectory = "couchpotato"; - ExecStart = "${pkgs.couchpotato}/bin/couchpotato"; - Restart = "on-failure"; - }; - }; - - users.users.couchpotato = - { group = "couchpotato"; - home = "/var/lib/couchpotato/"; - description = "CouchPotato daemon user"; - uid = config.ids.uids.couchpotato; - }; - - users.groups.couchpotato = - { gid = config.ids.gids.couchpotato; }; - }; -} diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix deleted file mode 100644 index d276c02487d..00000000000 --- a/pkgs/servers/couchpotato/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ fetchFromGitHub, python2Packages, lib }: - -with python2Packages; - -buildPythonApplication rec { - pname = "couchpotato"; - version = "3.0.1"; - disabled = isPy3k; - - src = fetchFromGitHub { - owner = "CouchPotato"; - repo = "CouchPotatoServer"; - rev = "build/${version}"; - hash = "sha256-0k8MqLnqYjhHPE9/jncTFIj1T4F2aXU4mXdeEimDB7M="; - }; - - format = "other"; - - postPatch = '' - substituteInPlace CouchPotato.py --replace "dirname(os.path.abspath(__file__))" "os.path.join(dirname(os.path.abspath(__file__)), '../${python.sitePackages}')" - ''; - - installPhase = '' - mkdir -p $out/bin/ - mkdir -p $out/${python.sitePackages}/ - - cp -r libs/* $out/${python.sitePackages}/ - cp -r couchpotato $out/${python.sitePackages}/ - - cp CouchPotato.py $out/bin/couchpotato - chmod +x $out/bin/* - ''; - - postFixup = '' - wrapProgram "$out/bin/couchpotato" --set PYTHONPATH "$PYTHONPATH:$out/${python.sitePackages}" - ''; - - meta = { - description = "Automatic movie downloading via NZBs and torrents"; - license = lib.licenses.gpl3; - homepage = "https://couchpota.to/"; - maintainers = with lib.maintainers; [ fadenb ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 983fae30cbd..5305c75a882 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20887,8 +20887,6 @@ with pkgs; erlang = erlangR22; }; - couchpotato = callPackage ../servers/couchpotato {}; - dendrite = callPackage ../servers/dendrite { }; dex-oidc = callPackage ../servers/dex { };