diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2019-07-14 22:45:44 +0100 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2019-07-14 22:45:44 +0100 |
| commit | 38bd8d31858e63b2e1c13bf67118dfe8fbce4ede (patch) | |
| tree | f0533c1aa5bb528638ec0c85415cbe38252e79d2 /pkgs/data | |
| parent | 54cbf55543a8da5d8198e15e46fa92607e169b63 (diff) | |
| download | nixlib-38bd8d31858e63b2e1c13bf67118dfe8fbce4ede.tar nixlib-38bd8d31858e63b2e1c13bf67118dfe8fbce4ede.tar.gz nixlib-38bd8d31858e63b2e1c13bf67118dfe8fbce4ede.tar.bz2 nixlib-38bd8d31858e63b2e1c13bf67118dfe8fbce4ede.tar.lz nixlib-38bd8d31858e63b2e1c13bf67118dfe8fbce4ede.tar.xz nixlib-38bd8d31858e63b2e1c13bf67118dfe8fbce4ede.tar.zst nixlib-38bd8d31858e63b2e1c13bf67118dfe8fbce4ede.zip | |
google-fonts: 2018-07-13 -> 2019-07-14
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/google-fonts/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 207f3615d1b4..a30c09fbc068 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -2,13 +2,13 @@ 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"; @@ -29,6 +29,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 |