From 5986bd30d9fd363d7efc43a914eeeb0536e91025 Mon Sep 17 00:00:00 2001
From: Eshin Kunishima <ek@esh.ink>
Date: Thu, 23 Nov 2017 16:21:15 +0900
Subject: [PATCH 1/2] inconsolata: 1.010 -> 2.001

---
 pkgs/data/fonts/inconsolata/default.nix | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix
index 13aeae80312..b3a04a163ca 100644
--- a/pkgs/data/fonts/inconsolata/default.nix
+++ b/pkgs/data/fonts/inconsolata/default.nix
@@ -1,20 +1,28 @@
-{ stdenv, fetchzip }:
+{ stdenv, fetchFromGitHub }:
 
-let
-  version = "1.010";
-in fetchzip {
+stdenv.mkDerivation rec {
   name = "inconsolata-${version}";
+  version = "2.001";
 
-  url = "http://www.levien.com/type/myfonts/Inconsolata.otf";
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "fonts";
+    rev = "4c3e95c802f8f12b78869ff50d552014de63f9c1";
+    sha256 = "1ndmsf4c0k36dakmps0vr7hhg5ss8m7ywja7v55xdrinvli58v2f";
+  };
 
-  postFetch = "install -Dm644 $downloadedFile $out/share/fonts/opentype/inconsolata.otf";
+  installPhase = ''
+    install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf
+  '';
 
-  sha256 = "1yyf7agabfv0ia57c7in0r33x7c8ay445zf7c3dfc83j6w85g3i7";
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "04pdg5lzdid4b0gbzykia2jaiajc6pdbv5r8ml5ya9alyw30xza6";
 
   meta = with stdenv.lib; {
     homepage = http://www.levien.com/type/myfonts/inconsolata.html;
     description = "A monospace font for both screen and print";
-    maintainers = with maintainers; [ raskin rycee ];
+    maintainers = with maintainers; [ mikoim raskin rycee ];
     license = licenses.ofl;
     platforms = platforms.all;
   };

From d155bf8f800cbc3f144955ecf0d8e445ce5c4c59 Mon Sep 17 00:00:00 2001
From: Eshin Kunishima <ek@esh.ink>
Date: Fri, 24 Nov 2017 00:43:48 +0900
Subject: [PATCH 2/2] inconsolata: inherit source and version from google-fonts

---
 pkgs/data/fonts/inconsolata/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix
index b3a04a163ca..e1544787b72 100644
--- a/pkgs/data/fonts/inconsolata/default.nix
+++ b/pkgs/data/fonts/inconsolata/default.nix
@@ -1,24 +1,14 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, google-fonts }:
 
 stdenv.mkDerivation rec {
   name = "inconsolata-${version}";
-  version = "2.001";
 
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = "fonts";
-    rev = "4c3e95c802f8f12b78869ff50d552014de63f9c1";
-    sha256 = "1ndmsf4c0k36dakmps0vr7hhg5ss8m7ywja7v55xdrinvli58v2f";
-  };
+  inherit (google-fonts) src version;
 
   installPhase = ''
     install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf
   '';
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "04pdg5lzdid4b0gbzykia2jaiajc6pdbv5r8ml5ya9alyw30xza6";
-
   meta = with stdenv.lib; {
     homepage = http://www.levien.com/type/myfonts/inconsolata.html;
     description = "A monospace font for both screen and print";