tests.plasma5: fix eval

NixOS · Aug 11, 2017 · 350a6c3 · 350a6c3
1 parent 83cc65a
commit 350a6c3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
@@ -16,17 +16,10 @@ import ./make-test.nix ({ pkgs, ...} :
 
     # fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why.
     nixpkgs.config.packageOverrides = superPkgs: {
-      fontconfig-penultimate = superPkgs.fontconfig-penultimate.overrideAttrs
-        (_attrs: rec {
-          version = "0.3.3";
-          name = "fontconfig-penultimate-${version}";
-          src = pkgs.fetchFromGitHub {
-            owner = "ttuegel";
-            repo = "fontconfig-penultimate";
-            rev = version;
-            sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9";
-          };
-        });
+      fontconfig-penultimate = superPkgs.fontconfig-penultimate.override {
+        version = "0.3.3";
+        sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9";
+      };
     };
   };
 

diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchzip }:
+{ stdenv, fetchzip
+, version ? "0.3.5"
+, sha256 ? "1gfgl7qimp76q4z0nv55vv57yfs4kscdr329np701k0xnhncwvrk"
+}:
 
-let version = "0.3.5"; in
 fetchzip {
   name = "fontconfig-penultimate-${version}";
 
   url = "https://github.com/ttuegel/fontconfig-penultimate/archive/${version}.zip";
+  inherit sha256;
 
   postFetch = ''
     mkdir -p $out/etc/fonts/conf.d
     unzip -j $downloadedFile \*.conf -d $out/etc/fonts/conf.d
   '';
 
-  sha256 = "1gfgl7qimp76q4z0nv55vv57yfs4kscdr329np701k0xnhncwvrk";
-
   meta = with stdenv.lib; {
     homepage = https://github.com/ttuegel/fontconfig-penultimate;
     description = "Sensible defaults for Fontconfig";