From 208edec09a9175ce6d4e79a4cab741b8ed502e8f Mon Sep 17 00:00:00 2001
From: wheatdog <wheatdoge@gamil.com>
Date: Thu, 6 Jul 2017 14:44:43 +0800
Subject: [PATCH 1/2] ttf-envy-code-r: init at preview7

---
 lib/maintainers.nix                         |  1 +
 pkgs/data/fonts/ttf-envy-code-r/default.nix | 28 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/data/fonts/ttf-envy-code-r/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 69bb69c8e20..cf42543a48e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -315,6 +315,7 @@
   luispedro = "Luis Pedro Coelho <luis@luispedro.org>";
   lukego = "Luke Gorrie <luke@snabb.co>";
   lw = "Sergey Sofeychuk <lw@fmap.me>";
+  lyt = "Tim Liou <wheatdoge@gmail.com>";
   m3tti = "Mathaeus Sander <mathaeus.peter.sander@gmail.com>";
   ma27 = "Maximilian Bosch <maximilian@mbosch.me>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix
new file mode 100644
index 00000000000..6b178de137d
--- /dev/null
+++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "ttf-envy-code-r";
+  version = "PR7";
+
+  src = fetchurl {
+    url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip";
+    sha256 = "9f7e9703aaf21110b4e1a54d954d57d4092727546348598a5a8e8101e4597aff";
+  };
+
+  buildInputs = [unzip];
+
+  installPhase = ''
+    for f in *.ttf; do
+        install -Dm 644 "$f" "$out/share/fonts/truetype/$f"
+    done
+    install -Dm 644 Read\ Me.txt "$out/share/doc/readme.txt"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://damieng.com/blog/tag/envy-code-r;
+    description = "Free scalable coding font by DamienG";
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lyt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 316076f3fe8..45d5dab326c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13096,6 +13096,8 @@ with pkgs;
 
   ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { };
 
+  ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r {};
+
   tzdata = callPackage ../data/misc/tzdata { };
 
   ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { };

From 5172fd68d3fcdb1f5f39b685d7bd43ba2221e0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 8 Jul 2017 10:18:53 +0200
Subject: [PATCH 2/2] ttf-envy-code-r: nitpick changes

- start version with 0. to get actual version semantics
- better location for readme.txt
- widen platforms to unix
---
 pkgs/data/fonts/ttf-envy-code-r/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix
index 6b178de137d..8db10d7f582 100644
--- a/pkgs/data/fonts/ttf-envy-code-r/default.nix
+++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix
@@ -1,8 +1,10 @@
 { stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
-  name = "ttf-envy-code-r";
+let
+  pname = "ttf-envy-code-r";
   version = "PR7";
+in
+stdenv.mkDerivation rec {
+  name = "${pname}-0.${version}";
 
   src = fetchurl {
     url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip";
@@ -15,14 +17,14 @@ stdenv.mkDerivation rec {
     for f in *.ttf; do
         install -Dm 644 "$f" "$out/share/fonts/truetype/$f"
     done
-    install -Dm 644 Read\ Me.txt "$out/share/doc/readme.txt"
+    install -Dm 644 Read\ Me.txt "$out/share/doc/${pname}/readme.txt"
   '';
 
   meta = with stdenv.lib; {
     homepage = http://damieng.com/blog/tag/envy-code-r;
     description = "Free scalable coding font by DamienG";
     license = licenses.unfree;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.lyt ];
   };
 }