git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #64743 from spacekookie/google-fonts

google-fonts: 2018-07-13 -> 2019-07-14

commit18cbb76f1273eafaee741a15ebaf662dec2f97d6 authorworldofpeace <worldofpeace@protonmail.ch> dateTue 23 Jul 2019, 03:19 (7 years ago) parent837e69664cc2f9
1 file changed+10−7
pkgs/data/fonts/google-fonts/default.nix+10−7
pkgs/data/fonts/google-fonts/default.nix+10−7
@@ -2,19 +2,15 @@
22
33stdenv.mkDerivation rec {
44 name = "google-fonts-${version}";
5− version = "2018-07-13";
5+ version = "2019-07-14";
66
77 src = fetchFromGitHub {
88 owner = "google";
99 repo = "fonts";
10− rev = "3ca591dae7372a26e254ec6d22e7b453813b9530";
11− sha256 = "01ak3dzw2kihwa0dy27x8vvpiscd66mnkf61vj1xn29m4g48y0lr";
10+ rev = "f113126dc4b9b1473d9354a86129c9d7b837aa1a";
11+ sha256 = "0safw5prpa63mqcyfw3gr3a535w4c9hg5ayw5pkppiwil7n3pyxs";
1212 };
1313
14− outputHashAlgo = "sha256";
15− outputHashMode = "recursive";
16− outputHash = "1pzm26794nwdbsvjnczpfchxiqa1n1zhp517g6g39wfm1nfszz83";
17−
1814 phases = [ "unpackPhase" "patchPhase" "installPhase" ];
1915
2016 patchPhase = ''
@@ -29,6 +25,13 @@ stdenv.mkDerivation rec {
2925 ofl/siamreap \
3026 ofl/terminaldosislight
3127
28+ # See comment above, the structure of these is a bit odd
29+ # We keep the ofl/<font>/static/ variants
30+ rm -rv ofl/comfortaa/*.ttf \
31+ ofl/mavenpro/*.ttf \
32+ ofl/muli/*.ttf \
33+ ofl/oswald/*.ttf
34+
3235 if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then
3336 echo "error: duplicate font names"
3437 exit 1