diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-23 03:19:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-23 03:19:57 -0400 |
| commit | 18cbb76f1273eafaee741a15ebaf662dec2f97d6 (patch) | |
| tree | 0a0aba4ce4f720d7aaff6f42e9e1f001fb006175 /pkgs/data/fonts | |
| parent | 837e696c39bd98f1136659ccc94f2f0a734c1fed (diff) | |
| parent | 64cc2f9ee95e9784b5d9b4dd7bdfa500956d3e7d (diff) | |
| download | nixpkgs-18cbb76f1273eafaee741a15ebaf662dec2f97d6.tar nixpkgs-18cbb76f1273eafaee741a15ebaf662dec2f97d6.tar.gz nixpkgs-18cbb76f1273eafaee741a15ebaf662dec2f97d6.tar.bz2 nixpkgs-18cbb76f1273eafaee741a15ebaf662dec2f97d6.tar.lz nixpkgs-18cbb76f1273eafaee741a15ebaf662dec2f97d6.tar.xz nixpkgs-18cbb76f1273eafaee741a15ebaf662dec2f97d6.tar.zst nixpkgs-18cbb76f1273eafaee741a15ebaf662dec2f97d6.zip | |
Merge pull request #64743 from spacekookie/google-fonts
google-fonts: 2018-07-13 -> 2019-07-14
Diffstat (limited to 'pkgs/data/fonts')
| -rw-r--r-- | pkgs/data/fonts/google-fonts/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 207f3615d1b..d743d2ccbd4 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -2,19 +2,15 @@ stdenv.mkDerivation rec { name = "google-fonts-${version}"; - version = "2018-07-13"; + version = "2019-07-14"; src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "3ca591dae7372a26e254ec6d22e7b453813b9530"; - sha256 = "01ak3dzw2kihwa0dy27x8vvpiscd66mnkf61vj1xn29m4g48y0lr"; + rev = "f113126dc4b9b1473d9354a86129c9d7b837aa1a"; + sha256 = "0safw5prpa63mqcyfw3gr3a535w4c9hg5ayw5pkppiwil7n3pyxs"; }; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1pzm26794nwdbsvjnczpfchxiqa1n1zhp517g6g39wfm1nfszz83"; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; patchPhase = '' @@ -29,6 +25,13 @@ stdenv.mkDerivation rec { ofl/siamreap \ ofl/terminaldosislight + # See comment above, the structure of these is a bit odd + # We keep the ofl/<font>/static/ variants + rm -rv ofl/comfortaa/*.ttf \ + ofl/mavenpro/*.ttf \ + ofl/muli/*.ttf \ + ofl/oswald/*.ttf + if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then echo "error: duplicate font names" exit 1 |