diff options
author | Robin Gloster <mail@glob.in> | 2017-08-11 21:53:01 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-08-11 21:53:17 +0200 |
commit | 350a6c3726beee36c8939fff7b98c1a6659fc4d4 (patch) | |
tree | 8be5cba8436d0a25316c57549a6cb4f3d17ae0c8 | |
parent | 83cc65a39f220d58340cae31f5667d3f1c922418 (diff) | |
download | nixlib-350a6c3726beee36c8939fff7b98c1a6659fc4d4.tar nixlib-350a6c3726beee36c8939fff7b98c1a6659fc4d4.tar.gz nixlib-350a6c3726beee36c8939fff7b98c1a6659fc4d4.tar.bz2 nixlib-350a6c3726beee36c8939fff7b98c1a6659fc4d4.tar.lz nixlib-350a6c3726beee36c8939fff7b98c1a6659fc4d4.tar.xz nixlib-350a6c3726beee36c8939fff7b98c1a6659fc4d4.tar.zst nixlib-350a6c3726beee36c8939fff7b98c1a6659fc4d4.zip |
tests.plasma5: fix eval
-rw-r--r-- | nixos/tests/plasma5.nix | 15 | ||||
-rw-r--r-- | pkgs/data/fonts/fontconfig-penultimate/default.nix | 9 |
2 files changed, 9 insertions, 15 deletions
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index f97544b5ea52..8b49b26c24a0 100644 --- 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 index da1c4467036b..e1be0da428a8 100644 --- 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"; |