From 129fcdd42ccc0f038151789ee398e91742e8bcbc Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 15 May 2021 20:57:18 +0200 Subject: [PATCH] pkgs: remove podgrab Now that it has been merged upstream, no reason to keep it. --- pkgs/default.nix | 2 -- pkgs/podgrab/default.nix | 30 ------------------------------ services/podgrab.nix | 2 +- 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/podgrab/default.nix diff --git a/pkgs/default.nix b/pkgs/default.nix index 82aa254..2f21e7f 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -12,8 +12,6 @@ rec { nolimips = pkgs.callPackage ./nolimips { }; - podgrab = pkgs.callPackage ./podgrab { }; - unbound-zones-adblock = pkgs.callPackage ./unbound-zones-adblock { inherit unified-hosts-lists; }; diff --git a/pkgs/podgrab/default.nix b/pkgs/podgrab/default.nix deleted file mode 100644 index aa7f981..0000000 --- a/pkgs/podgrab/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "podgrab"; - version = "2021-03-26"; - - src = fetchFromGitHub { - owner = "akhilrex"; - repo = "podgrab"; - rev = "3179a875b8b638fb86d0e829d12a9761c1cd7f90"; - sha256 = "sha256-vhxIm20ZUi+RusrAsSY54tv/D570/oMO5qLz9dNqgqo="; - }; - - vendorSha256 = "sha256-xY9xNuJhkWPgtqA/FBVIp7GuWOv+3nrz6l3vaZVLlIE="; - - postInstall = '' - mkdir -p $out/share/ - cp -r "$src/client" "$out/share/" - cp -r "$src/webassets" "$out/share/" - ''; - - meta = with lib; { - description = '' - A self-hosted podcast manager to download episodes as soon as they become live - ''; - homepage = "https://github.com/akhilrex/podgrab"; - license = licenses.gpl3; - maintainers = with maintainers; [ ambroisie ]; - }; -} diff --git a/services/podgrab.nix b/services/podgrab.nix index 556ffff..bfccc72 100644 --- a/services/podgrab.nix +++ b/services/podgrab.nix @@ -8,7 +8,7 @@ let domain = config.networking.domain; podgrabDomain = "podgrab.${domain}"; - podgrabPkg = pkgs.ambroisie.podgrab; + podgrabPkg = pkgs.podgrab; in { options.my.services.podgrab = with lib; {