From 38bd8d31858e63b2e1c13bf67118dfe8fbce4ede Mon Sep 17 00:00:00 2001
From: Katharina Fey <kookie@spacekookie.de>
Date: Sun, 14 Jul 2019 22:45:44 +0100
Subject: [PATCH 1/2] google-fonts: 2018-07-13 -> 2019-07-14

---
 pkgs/data/fonts/google-fonts/default.nix | 13 ++++++++++---
 1 file 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

From 64cc2f9ee95e9784b5d9b4dd7bdfa500956d3e7d Mon Sep 17 00:00:00 2001
From: Katharina Fey <kookie@spacekookie.de>
Date: Sun, 14 Jul 2019 22:45:54 +0100
Subject: [PATCH 2/2] google-fonts: Removing fixed-output derivation

---
 pkgs/data/fonts/google-fonts/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index a30c09fbc068..d743d2ccbd42 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -11,10 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "0safw5prpa63mqcyfw3gr3a535w4c9hg5ayw5pkppiwil7n3pyxs";
   };
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "1pzm26794nwdbsvjnczpfchxiqa1n1zhp517g6g39wfm1nfszz83";
-
   phases = [ "unpackPhase" "patchPhase" "installPhase" ];
 
   patchPhase = ''