Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

pkgs/data/documentation/man-pages/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "man-pages-${version}";
-  version = "4.04";
+  version = "4.05";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "0v8zxq4scfixy3pjpw9ankvv5v8frv62khv4xm1jpkswyq6rbqcg";
+    sha256 = "03d6aqgvhcsyciwdhl50h9bwn53iivvd7rbnh8als2ia9jwm2026";
   };
 
   # keep developer docs separately (man2 and man3)

pkgs/data/fonts/montserrat/default.nix

@@ -0,0 +1,28 @@
+# Originally packaged for ArchLinux.
+#
+# https://aur.archlinux.org/packages/ttf-montserrat/
+
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "montserrat-${version}";
+  version = "1.0";
+
+  src = fetchurl {
+    url = "http://marvid.fr/~eeva/mirror/Montserrat.tar.gz";
+    sha256 = "12yn651kxi5fcbpdxhapg5fpri291mgcfc1kx7ymg53nrl11nj3x";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/montserrat
+    cp *.ttf $out/share/fonts/montserrat
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)";
+    homepage    = "http://www.fontspace.com/julieta-ulanovsky/montserrat";
+    license     = licenses.ofl;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ scolobb ];
+  };
+}

pkgs/data/fonts/mplus-outline-fonts/default.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "mplus-${version}";
-  version = "TESTFLIGHT-059";
+  version = "059";
 
   src = fetchurl {
     url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-059.tar.xz";

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

@@ -1,15 +1,19 @@
-{ stdenv, fetchurl, fetchFromGitHub, optipng, cairo, unzip, fontforge, pythonPackages, pkgconfig }:
+{ stdenv, fetchurl, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }:
+
 rec {
   # 18MB
-  noto-fonts = let version = "git-2015-09-08"; in stdenv.mkDerivation {
+  noto-fonts = let version = "git-2016-03-29"; in stdenv.mkDerivation {
     name = "noto-fonts-${version}";
+
     src = fetchFromGitHub {
       owner = "googlei18n";
       repo = "noto-fonts";
-      rev = "9d677e7e47a13f6e88052833277783fe4f27671f";
-      sha256 = "1dw1142znlk19a4mzhfi9pg3jzmz8pl1ivix7sd2grg70vxscxqc";
+      rev = "e8b0af48b15d64bd490edab4418b5e396cf29644";
+      sha256 = "02yv12fbb4n1gp9g9m0qxnj6adpg9hfsr9377h2d4xsf6sxcgy6f";
     };
-    phases = "unpackPhase installPhase";
+
+    phases = [ "unpackPhase" "installPhase" ];
+
     installPhase = ''
       mkdir -p $out/share/fonts/noto
       cp hinted/*.ttf $out/share/fonts/noto
@@ -19,6 +23,9 @@ rec {
       cp -n unhinted/*.ttf $out/share/fonts/noto
       cp -n alpha/*.ttf $out/share/fonts/noto
     '';
+
+    preferLocalBuild = true;
+
     meta = with stdenv.lib; {
       inherit version;
       description = "Beautiful and free fonts for many languages";
@@ -51,9 +58,9 @@ rec {
       sha256 = "1vg3si6slvk8cklq6s5c76s84kqjc4wvwzr4ysljzjpgzra2rfn6";
     };
 
-    buildInputs = [ unzip ];
+    nativeBuildInputs = [ unzip ];
 
-    phases = "unpackPhase installPhase";
+    phases = [ "unpackPhase" "installPhase" ];
 
     sourceRoot = ".";
 
@@ -86,34 +93,30 @@ rec {
     };
   };
   # 12MB
-  noto-fonts-emoji = let version = "git-2015-08-17"; in stdenv.mkDerivation {
+  noto-fonts-emoji = let version = "git-2016-03-17"; in stdenv.mkDerivation {
     name = "noto-fonts-emoji-${version}";
 
     src = fetchFromGitHub {
       owner = "googlei18n";
       repo = "noto-emoji";
-      rev = "ffd7cfd0c84b7bf37210d0908ac94adfe3259ff2";
-      sha256 = "1pa94gw2y0b6p8r81zbjzcjgi5nrx4dqrqr6mk98wj6jbi465sh2";
+      rev = "c6379827aaa9cb0baca1a08a9d44ae74ca505236";
+      sha256 = "1zh1b617cjr5laha6lx0ys4k1c3az2zkgzjwc2nlb7dsdmfw1n0q";
     };
 
-    buildInputs = with pythonPackages; [
-      optipng cairo fontforge python nototools fonttools pkgconfig
-    ];
+    buildInputs = [ cairo ];
+    nativeBuildInputs = [ pngquant optipng which cairo pkgconfig imagemagick ]
+                     ++ (with pythonPackages; [ python fonttools nototools ]);
 
-    #FIXME: perhaps use our pngquant instead
-    preConfigure = ''
-      for f in ./*.py ./third_party/pngquant/configure; do
-        patchShebangs "$f"
-      done
+    postPatch = ''
+      sed -i 's,^PNGQUANT :=.*,PNGQUANT := ${pngquant}/bin/pngquant,' Makefile
+      patchShebangs flag_glyph_name.py
     '';
 
-    preBuild = ''
-      export PYTHONPATH=$PYTHONPATH:$PWD
-    '';
+    enableParallelBuilding = true;
 
     installPhase = ''
       mkdir -p $out/share/fonts/noto
-      cp NotoColorEmoji.ttf NotoEmoji-Regular.ttf $out/share/fonts/noto
+      cp NotoColorEmoji.ttf fonts/NotoEmoji-Regular.ttf $out/share/fonts/noto
     '';
 
     meta = with stdenv.lib; {

pkgs/data/misc/tzdata/default.nix

@@ -1,25 +1,32 @@
 { stdenv, fetchurl }:
 
-let version = "2015g";
-
-self = stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "tzdata-${version}";
+  version = "2016c";
 
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "0qb1awqrn3215zd2jikpqnmkzrxwfjf0d3dw2xmnk4c40yzws8xr";
+        sha256 = "0j1dk830rkr1pijfac5wkdifi47k28mmvfys6z07l07jws0xj047";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1i3y1kzjiz2j62c7vd4wf85983sqk9x9lg3473njvbdz4kph5r0q";
+        sha256 = "05m4ql1x3b4bmlg0vv1ibz2128mkk4xxnixagcmwlnwkhva1njrl";
       })
     ];
 
   sourceRoot = ".";
-  #outputs = [ "out" "lib" ]; # TODO: maybe resurrect, and maybe install man pages?
+  outputs = [ "out" "lib" ];
 
-  makeFlags = "TOPDIR=$(out) TZDIR=$(out)/share/zoneinfo ETCDIR=$(TMPDIR)/etc LIBDIR=$(out)/lib MANDIR=$(TMPDIR)/man AWK=awk CFLAGS=-DHAVE_LINK=0";
+  makeFlags = [
+    "TOPDIR=$(out)"
+    "TZDIR=$(out)/share/zoneinfo"
+    "ETCDIR=$(TMPDIR)/etc"
+    "LIBDIR=$(lib)/lib"
+    "MANDIR=$(TMPDIR)/man"
+    "AWK=awk"
+    "CFLAGS=-DHAVE_LINK=0"
+  ];
 
   postInstall =
     ''
@@ -27,8 +34,8 @@ self = stdenv.mkDerivation rec {
       ln -s . $out/share/zoneinfo/posix
       mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right
 
-      mkdir -p "$out/include"
-      cp tzfile.h "$out/include/tzfile.h"
+      mkdir -p "$lib/include"
+      cp tzfile.h "$lib/include/tzfile.h"
     '';
 
   meta = {
@@ -37,6 +44,3 @@ self = stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.all;
   };
 }
-
-;in self // { lib = self; }
-

pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix

@@ -5,7 +5,7 @@ import ./generic.nix {
   name = "docbook-xml-4.2";
   src = fetchurl {
     url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip;
-    md5 = "73fe50dfe74ca631c1602f558ed8961f";
+    sha256 = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2";
   };
   meta = {
     branch = "4.2";