Merge recent 'staging' into closure-size

Let's get rid of those merge conflicts.

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

@@ -5,13 +5,10 @@ let
     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 = "2016-01-11";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
+  version = "2016-01-25";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -27,13 +24,12 @@ stdenv.mkDerivation {
     "1fksbnmda2a05cpax41h9r7jhi8102q41kl5nij4ai42d6yqy73x";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "06lhgkycyxisnvcrcdqcxlbhawyqw302yv1p3836bm0fjhyr7v4r";
+    "1n7zlmnaxvjljyih9yi9hns530by21h42j2kcszbcyvn7rd9rnyw";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1scn63zd8di5jzxx4nfic4ggfy4jas9l56h0mcyvgypzlyvxgz43";
+    "1id60almra7mq4v86p37sfph8jrbdnc5pzxvy55wiyrvf6ydvk56";
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "GeoLite Legacy IP geolocation databases";
     homepage = https://geolite.maxmind.com/download/geoip;
     license = licenses.cc-by-sa-30;

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

@@ -1,8 +1,8 @@
 { stdenv, fetchurl, intltool }:
 
-let version = "0.8"; in
 stdenv.mkDerivation rec {
   name = "sound-theme-freedesktop-${version}";
+  version = "0.8";
 
   src = fetchurl {
     sha256 = "054abv4gmfk9maw93fis0bf605rc56dah7ys5plc4pphxqh8nlfb";
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
   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:

pkgs/data/misc/wireless-regdb/default.nix

@@ -1,8 +1,8 @@
 { stdenv, fetchgit }:
 
-let version = "2015-12-14"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "wireless-regdb-${version}";
+  version = "2015-12-14";
 
   src = fetchgit {
     sha256 = "1ldfcxn3mdb104czy78b7nj1clsbfp8fc6mshix98zq0bg4k7rsm";
@@ -18,7 +18,6 @@ stdenv.mkDerivation {
   ];
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Wireless regulatory database for CRDA";
     homepage = http://wireless.kernel.org/en/developers/Regulatory/;
     license = licenses.isc;