Merge commit staging+systemd into closure-size

Many non-conflict problems weren't (fully) resolved in this commit yet.

pkgs/data/misc/cacert/default.nix

@@ -1,23 +1,29 @@
-{ stdenv, fetchurl }:
+{ stdenv, nss, curl, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "cacert-20140715";
+  name = "nss-cacert-${nss.version}";
 
-  src = fetchurl {
-    url = "http://tarballs.nixos.org/${name}.pem.bz2";
-    sha256 = "1l4j7z6ysnllx99isjzlc8zc34rbbgj4kzlg1y5sy9bgphc8cssl";
-  };
+  src = nss.src;
 
-  unpackPhase = "true";
+  postPatch = ''
+    unpackFile ${curl.src};
+  '';
 
-  installPhase =
-    ''
-      mkdir -p $out/etc
-      bunzip2 < $src > $out/etc/ca-bundle.crt
-    '';
+  nativeBuildInputs = [ perl perlPackages.LWP ];
 
-  meta = {
+  buildPhase = ''
+    perl curl-*/lib/mk-ca-bundle.pl -d "file://$(pwd)/nss/lib/ckfw/builtins/certdata.txt" ca-bundle.crt
+  '';
+
+  installPhase = ''
+    mkdir -pv $out/etc/ssl/certs
+    cp -v ca-bundle.crt $out/etc/ssl/certs
+  '';
+
+  meta = with stdenv.lib; {
     homepage = http://curl.haxx.se/docs/caextract.html;
     description = "A bundle of X.509 certificates of public Certificate Authorities (CA)";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
 }

pkgs/data/misc/geolite-legacy/builder.sh

@@ -16,4 +16,5 @@ for var in "${!src@}"; do
 	cp "$src" "$dest"
 done
 
-gunzip -v *.gz
+gzip -dv *.gz
+xz -dv *.xz

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

@@ -1,36 +1,43 @@
 { stdenv, fetchurl }:
 
 let
-  fetchDB = name: sha256: fetchurl {
-    inherit sha256;
-    url = "https://geolite.maxmind.com/download/geoip/database/${name}.dat.gz";
+  fetchDB = src: name: sha256: fetchurl {
+    inherit name sha256;
+    url = "https://geolite.maxmind.com/download/geoip/database/${src}";
   };
 
   # 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-04-21";
+  version = "2015-09-29";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
-  srcGeoIP = fetchDB "GeoLiteCountry/GeoIP"
-    "15c7j6yyjl0k42ij7smdz2j451y3hhfbmxwkx8kp5ja0afrlw41k";
-  srcGeoIPv6 = fetchDB "GeoIPv6"
-    "0kz6yjprzqr2pi4rczbmw7489gdjzf957azahdqjai8fx0s5w93i";
-  srcGeoLiteCity = fetchDB "GeoLiteCity"
-    "0lc696axcdgz7xrh9p6ac5aa7nlxfgngwyabjwqiwazz3wcmw05a";
-  srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6"
-    "1k8sig8w43cdm19rpwndr1akj1d3mxl5sch60qbinjrb05l6xbgv";
-  srcGeoIPASNum = fetchDB "asnum/GeoIPASNum"
-    "0r4v2zs4alxb46kz679hw4w34s7n9pxw32wcfs5x4nhnq051y6ms";
-  srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6"
-    "04ciwh5gaxja4lzlsgbg1p7rkrhnn637m4nj9ld8sb36bl2ph6gc";
+  srcGeoIP = fetchDB
+    "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
+    "11xv6ws0gzyj9bf1j1g67cklkkl6s4wb6z6n7kxjcxnn2274nfy0";
+  srcGeoIPv6 = fetchDB
+    "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
+    "1q5vgk522wq5ybhbw86zk8njgg611kc46a22vkrp08vklbni3akz";
+  srcGeoLiteCity = fetchDB
+    "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
+    "07hx9g6kif75icsblcdk64rq13w2knpns4lrxdbf63mmqbqxj29g";
+  srcGeoLiteCityv6 = fetchDB
+    "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
+    "0f3y1cpjfd4q55a2kvhzsklmmp6k19v9vsdsjxr4sapc8f5fgfc9";
+  srcGeoIPASNum = fetchDB
+    "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
+    "1b8rk3crnm94ndlkw99h7iyn9daznf7sirck1zs80ppg7c69gknp";
+  srcGeoIPASNumv6 = fetchDB
+    "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
+    "06hwj3ksfz4ikh84cqcdl1xi4rkrc9cz26h31vg9w5awx5kbbc10";
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "GeoLite Legacy IP geolocation databases";
     homepage = https://geolite.maxmind.com/download/geoip;
-    license = with licenses; cc-by-sa-30;
-    platforms = with platforms; linux;
+    license = licenses.cc-by-sa-30;
+    platforms = platforms.all;
     maintainers = with maintainers; [ nckx ];
   };
 

pkgs/data/misc/media-player-info/default.nix

@@ -26,7 +26,7 @@ in
     meta = with stdenv.lib; {
       description = "A repository of data files describing media player capabilities";
       homepage = "http://www.freedesktop.org/wiki/Software/media-player-info/";
-      license = with licenses; [ bsd3 ];
+      license = licenses.bsd3;
       maintainer = with maintainers; [ ttuegel ];
     };
   }

pkgs/data/misc/nixos-artwork/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "nixos-artwork-2015-02-27";
+  # Remember to check the default lightdm wallpaper when updating
+
+  GnomeDark = fetchurl {
+    url = https://raw.githubusercontent.com/NixOS/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png;
+    sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7";
+  };
+
+  unpackPhase = "true";
+
+  installPhase = ''
+    mkdir -p $out/share/artwork/gnome
+    ln -s $GnomeDark $out/share/artwork/gnome/Gnome_Dark.png
+  '';
+  
+  meta = with stdenv.lib; {
+    homepage = https://github.com/NixOS/nixos-artwork;
+    platforms = platforms.all;
+  };
+}

pkgs/data/misc/shared-mime-info/default.nix

@@ -1,20 +1,23 @@
 {stdenv, fetchurl, pkgconfig, gettext, perl, perlXMLParser, intltool
 , libxml2, glib}:
 
+let version = "1.5"; in
 stdenv.mkDerivation rec {
-  name = "shared-mime-info-1.3";
+  name = "shared-mime-info-${version}";
 
   src = fetchurl {
     url = "http://freedesktop.org/~hadess/${name}.tar.xz";
-    sha256 = "0fijrc8j2kw6bvdx7fmlfafbcwxvinhr8l44b46b3v59gj69rm2g";
+    sha256 = "1021x95xbkfc5ipx3gi2rdc0y6x2pv36yyzxc5pg6nr6xd02hhfn";
   };
 
-  buildInputs = [
+  nativeBuildInputs = [
     pkgconfig gettext intltool perl perlXMLParser libxml2 glib
   ];
 
   meta = {
+    inherit version;
     description = "A database of common MIME types";
     homepage = http://freedesktop.org/wiki/Software/shared-mime-info;
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }

pkgs/data/misc/sound-theme-freedesktop/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, intltool }:
+
+let version = "0.8"; in
+stdenv.mkDerivation rec {
+  name = "sound-theme-freedesktop-${version}";
+
+  src = fetchurl {
+    sha256 = "054abv4gmfk9maw93fis0bf605rc56dah7ys5plc4pphxqh8nlfb";
+    url = "https://people.freedesktop.org/~mccann/dist/${name}.tar.bz2";
+  };
+
+  nativeBuildInputs = [ intltool ];
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Freedesktop reference sound theme";
+    homepage = http://freedesktop.org/wiki/Specifications/sound-theme-spec;
+    # See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS:
+    license = with licenses; [ cc-by-30 cc-by-sa-25 gpl2 gpl2Plus ];
+    maintainers = with maintainers; [ nckx ];
+  };
+}

pkgs/data/misc/tzdata/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-let version = "2015c";
+let version = "2015g";
 
 self = stdenv.mkDerivation rec {
   name = "tzdata-${version}";
@@ -8,11 +8,11 @@ self = stdenv.mkDerivation rec {
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "0nin48g5dmkfgckp25bngxchn3sw3yyjss5sq7gs5xspbxgsq3w6";
+        sha256 = "0qb1awqrn3215zd2jikpqnmkzrxwfjf0d3dw2xmnk4c40yzws8xr";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "0bplibiy70dvlrhwqzkzxgmg81j6d2kklvjgi2f1g2zz1nkb3vkz";
+        sha256 = "1i3y1kzjiz2j62c7vd4wf85983sqk9x9lg3473njvbdz4kph5r0q";
       })
     ];