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/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; }
-