Merge remote-tracking branch 'origin/master' into closure-size

pkgs/data/fonts/font-awesome-ttf/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip";
-    sha256 = "1bmjh3j533awihdxihvlk2d1ypzs9q7azj0viqbm0df8jj2v4rwq";
+    sha256 = "1k7ff71pcp2qrnqj4yzrjg96m7yma9r58wdk68sqb93q2kq9fp3i";
   };
 
   buildCommand = ''

pkgs/data/fonts/gohufont/default.nix

@@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
     homepage = http://font.gohu.org/;
     license = licenses.wtfpl;
     maintainers = with maintainers; [ epitrochoid ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

pkgs/data/fonts/google-fonts/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "google-fonts";
+  version = "2015-11-18";
+
+  src = fetchurl {
+    url = "https://github.com/google/fonts/archive/a26bc2b9f4ad27266c2587dc0355b3066519844a.tar.gz";
+    sha256 = "1aizwzsxg30mjds1628280bs7ishgsfairnx131654gm51aihw8p";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    find . -name "*.ttf" -exec cp -v {} $out/share/fonts/truetype \;
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://www.google.com/fontsl;
+    description = "Font files available from Google Font";
+    license = with licenses; [ asl20 ofl ufl ];
+    platforms = platforms.all;
+    maintainer = with maintainers; [ manveru ];
+  };
+}

pkgs/data/fonts/hack/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, unzip }:
 
-let version = "2.017"; in
+let version = "2.018"; in
 stdenv.mkDerivation {
   name = "hack-font-${version}";
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     version_ = with stdenv.lib;
       concatStringsSep "_" (splitString "." version);
   in fetchurl {
-    sha256 = "1bspjdllmwbb7bs5rcdghyvvl4xf3pw5nss1z3zxc805pysxyy0c";
+    sha256 = "0k1k6pi9znrdc8a4kv0gkdnyzi2w932m2zi27dvb1ignn7lzmfkx";
     url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip";
   };
 

pkgs/data/fonts/iosevka/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "iosevka-${version}";
+  version = "1.0-beta9";
+  src = fetchurl {
+    url = "https://github.com/be5invis/Iosevka/releases/download/${version}/${name}.tar.bz2";
+    sha256 = "1vw34zh8nh6s2dpyw3a1q44wkgrsin1a8b0vnk7hms8s8fw65734";
+  };
+  unpackPhase = ''
+    tar xf "$src"
+  '';
+  installPhase = ''
+    fontdir=$out/share/fonts/iosevka
+
+    mkdir -p $fontdir
+    cp -v iosevka-* $fontdir
+  '';
+  buildInputs = [ ];
+  meta = with lib; {
+    homepage = "http://be5invis.github.io/Iosevka/";
+    description = ''
+      Slender monospace sans-serif and slab-serif typeface inspired by Pragmata
+      Pro, M+ and PF DIN Mono, designed to be the ideal font for programming.
+    '';
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = [ maintainers.cstrahan ];
+  };
+}

pkgs/data/fonts/source-code-pro/default.nix

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url="https://github.com/adobe-fonts/source-code-pro/archive/${version}R-ro/${version_italic}R-it.tar.gz";
-    sha256="12wijgxrdzqxpw2q420nsq9aj454vhg3rq6n81jbqvgzxhxjpf7w";
+    sha256="1y44p2i7hd1klq81xbh796y7n4rzjvn37jrqw0nz31k59v8a1r9y";
   };
 
   phases = "unpackPhase installPhase";

pkgs/data/fonts/terminus-font/default.nix

@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.is-vn.bg/hamster/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ astsmtl ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

pkgs/data/misc/geolite-legacy/default.nix

@@ -8,7 +8,7 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-11-04";
+  version = "2015-11-23";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
     "0anx3kppql6wzkpmkf7k1322g4ragb5hh96apl71n2lmwb33i148";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "1k747llmralv2n2krfc1v9f8vdjc3ih3xsgf6g1y60cr78sl197p";
+    "0zlc5gb0qy9am2xzpfv41i9wdydasrscmjwy1drccfsspqwrjvs7";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1ppsn39c3n9llskynwbainy5wx6cl3qmhp6ifsylk0ac3jcdr7b9";
+    "0p9lwngvrk88an3kqx3v2b3kcs0l51mbrr7lwxg3ckkjyl9si1k3";
 
   meta = with stdenv.lib; {
     inherit version;