From 7d231c54355058cc1233d7e9d693c022d4663332 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 4 Sep 2017 05:01:47 +0000
Subject: proggyfonts: fix output hash

See PR #28960 for details about the problem. There is some
non-determinism surrounding copies of the Speedy/Speedy11 font, so
deleting one makes it deterministic again without losing anything.
---
 pkgs/data/fonts/proggyfonts/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs/data/fonts/proggyfonts')

diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix
index 9637a6c85b0..895ef3dae0f 100644
--- a/pkgs/data/fonts/proggyfonts/default.nix
+++ b/pkgs/data/fonts/proggyfonts/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
 
       cp Licence.txt $out/share/doc/$name/LICENSE
 
+      rm Speedy.pcf # duplicated as Speedy11.pcf
       for f in *.pcf; do
         gzip -c "$f" > $out/share/fonts/misc/"$f".gz
       done
@@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "06jsf3rw6q4l1jrw1161h4vxa1xbvpry5x12d8sh5g7hjk88p77g";
+  outputHash = "1l1sxmzp3gcd2d32nxar6xwd1v1w18a9gfh57zmsrfpspnfbz7y1";
 
   meta = with stdenv.lib; {
     homepage = http://upperbounds.net;
-- 
cgit 1.4.1