Merge master into closure-size

The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.

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

@@ -1,10 +1,11 @@
 {stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale}:
 
-stdenv.mkDerivation {
-  name = "dosemu-fonts";
+stdenv.mkDerivation rec {
+  version = "1.4.0";
+  name = "dosemu-fonts-${version}";
 
   src = fetchurl {
-    url = mirror://sourceforge/dosemu/dosemu-1.4.0.tgz;
+    url = "mirror://sourceforge/dosemu/dosemu-${version}.tgz";
     sha256 = "0l1zwmw42mpakjrzmbygshcg2qzq9mv8lx42738rz3j9hrqzg4pw";
   };
 

pkgs/data/fonts/gentium-book-basic/default.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "gentium-book-basic-${version}";
+  major = "1";
+  minor = "102";
+  version = "${major}.${minor}";
+
+  src = fetchzip {
+    name = "${name}.zip";
+    url = "http://software.sil.org/downloads/gentium/GentiumBasic_${major}${minor}.zip";
+    sha256 = "109yiqwdfb1bn7d6bjp8d50k1h3z3kz86p3faz11f9acvsbsjad0";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    mkdir -p $out/share/doc/${name}
+    cp -v *.ttf $out/share/fonts/truetype/
+    cp -v FONTLOG.txt GENTIUM-FAQ.txt $out/share/doc/${name}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://software.sil.org/gentium/";
+    description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
+    maintainers = with maintainers; [ DamienCassou ];
+    license = licenses.ofl;
+    platforms = platforms.all;
+  };
+}

pkgs/data/icons/vanilla-dmz/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with lib; {
     homepage = "http://jimmac.musichall.cz";
-    description = "A style neutral scalable cursor theme.";
+    description = "A style neutral scalable cursor theme";
     platforms = platforms.all;
     license = licenses.cc-by-nc-sa-30;
     maintainers = with maintainers; [ cstrahan ];

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

@@ -8,7 +8,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
-  version = "2016-02-08";
+  version = "2016-02-29";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     "0fnlznn04lpkkd7sy9r9kdl3fcp8ix7msdrncwgz26dh537ml32z";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "0ib93p2fwayqsxwph98rkgln7xpjrwhzzc06sc74876jpaq3g8g5";
+    "10i4c8irvh9shbl3y0s0ffkm71vf3r290fvxjx20snqa558hkvib";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1izlxqcvdag66sny5zjjwkmjhai0c9m77b96j117n0x0awrrk4h9";
+    "1rvbjrj98pqj9w5ql5j49b3h40496g6aralpnz1gj21v6dfrd55n";
 
   meta = with stdenv.lib; {
     description = "GeoLite Legacy IP geolocation databases";