BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #64743 from spacekookie/google-fonts

Browse source 
google-fonts: 2018-07-13 -> 2019-07-14
This commit is contained in:
worldofpeace 2019-07-23 03:19:57 -04:00 committed by GitHub
commit 18cbb76f12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/data/fonts/google-fonts/default.nix
View file

@ -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