Merge remote-tracking branch 'upstream/master' into staging

4 files changed, 13 insertions, 11 deletions

diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index c2bec7707c29..6b8399a8b3f4 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "Zeal is a simple offline API documentation browser";
+    description = "A simple offline API documentation browser";
     longDescription = ''
       Zeal is a simple offline API documentation browser inspired by Dash (OS X
       app), available for Linux and Windows.
diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index 0d3d9c104d46..2f528a619e72 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/powerline/fonts;
-    description = "Patched fonts for Powerline users.";
+    description = "Patched fonts for Powerline users";
     longDescription = ''
       Pre-patched and adjusted fonts for usage with the Powerline plugin.
     '';
diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh
index 1886d144e480..bf8c9812e924 100644
--- a/pkgs/data/misc/geolite-legacy/builder.sh
+++ b/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
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index cf8e7ab47aea..ac8582e2018c 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -3,7 +3,7 @@
 let
   fetchDB = name: sha256: fetchurl {
     inherit sha256;
-    url = "https://geolite.maxmind.com/download/geoip/database/${name}.dat.gz";
+    url = "https://geolite.maxmind.com/download/geoip/database/${name}";
   };
 
   # Annoyingly, these files are updated without a change in URL. This means that
@@ -13,20 +13,21 @@ in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
-  srcGeoIP = fetchDB "GeoLiteCountry/GeoIP"
+  srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz"
     "15c7j6yyjl0k42ij7smdz2j451y3hhfbmxwkx8kp5ja0afrlw41k";
-  srcGeoIPv6 = fetchDB "GeoIPv6"
+  srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz"
     "0kz6yjprzqr2pi4rczbmw7489gdjzf957azahdqjai8fx0s5w93i";
-  srcGeoLiteCity = fetchDB "GeoLiteCity"
-    "0lc696axcdgz7xrh9p6ac5aa7nlxfgngwyabjwqiwazz3wcmw05a";
-  srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6"
+  srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz"
+    "1z40kfjwn90fln7nfnk5pwcn1wl9imw5jz6bcdy8yr552m2n31y7";
+  srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
     "1k8sig8w43cdm19rpwndr1akj1d3mxl5sch60qbinjrb05l6xbgv";
-  srcGeoIPASNum = fetchDB "asnum/GeoIPASNum"
+  srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"
     "0r4v2zs4alxb46kz679hw4w34s7n9pxw32wcfs5x4nhnq051y6ms";
-  srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6"
+  srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz"
     "04ciwh5gaxja4lzlsgbg1p7rkrhnn637m4nj9ld8sb36bl2ph6gc";
 
   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;