about summary refs log tree commit diff
path: root/machines
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2018-02-26 09:23:54 +0100
committeraszlig <aszlig@nix.build>2018-02-26 09:23:54 +0100
commit4f5d957c7888e85a654c6af8cf95fdf05c72d737 (patch)
tree6182caf213cfbf8cc25163e493b9c5648fafb885 /machines
parentfe42081483f7f8bb21fcadb9b4a892c72b8bb829 (diff)
dnyarri: Remove gpodder derivation attrs override
I've put in an assertion back then to make sure that once gpodder 3.10.1
is released, we get a failure so we don't stay behind forever.

With NixOS/nixpkgs@4d1e72cfbb8de0d8adf2c047aad14f29eb4f77bf, not only
the version is bumped but also the icon theme is added back, so we can
drop the whole override of the attributes.

Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'machines')
-rw-r--r--machines/aszlig/dnyarri.nix12
1 files changed, 1 insertions, 11 deletions
diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix
index b8b711bd..ab2261c2 100644
--- a/machines/aszlig/dnyarri.nix
+++ b/machines/aszlig/dnyarri.nix
@@ -53,17 +53,7 @@ in {
   };
 
   environment.systemPackages = [
-    ((pkgs.gpodder.overrideAttrs (drv: {
-      src = assert drv.version == "3.10.0"; pkgs.fetchFromGitHub {
-        owner = "gpodder";
-        repo = "gpodder";
-        rev = "4cbf62372def27d501acbe24b68297ba584b689d";
-        sha256 = "16r9p126z4vrpqxpq0chlmjhx75npf9j7zb2174m3c4z02c85k7q";
-      };
-      propagatedBuildInputs = (drv.propagatedBuildInputs or []) ++ [
-        pkgs.hicolor_icon_theme
-      ];
-    })).override {
+    (pkgs.gpodder.override {
       python3Packages = (pkgs.python3.override {
         packageOverrides = lib.const (super: {
           podcastparser = super.podcastparser.overridePythonAttrs (drv: let