Merge branch master into staging

4 files changed, 66 insertions, 4 deletions

diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix
index 478c72a865cb3..d70fe3ca3f8be 100644
--- a/pkgs/data/fonts/symbola/default.nix
+++ b/pkgs/data/fonts/symbola/default.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "symbola-7.19";
+  name = "symbola-7.21";
 
   src = fetchurl {
     url = "http://users.teilar.gr/~g1951d/Symbola.zip";
-    sha256 = "1g7ngcxffrb9vqnmb0w9jmp349f48s0gsbi69b3g108vs8cacrmd";
+    sha256 = "0sqmvq8c8wn4xq0p25gd2jfyjqi8jhiycqah19wzq1gqkaaw94nq";
   };
   docs_pdf = fetchurl {
     url = "http://users.teilar.gr/~g1951d/Symbola.pdf";
-    sha256 = "16f37fsi2zyy3ka409g3m5d9c09l0ba3rqkz912j90p4588dvk85";
+    sha256 = "0jjjydb6c0glfb6krvdyi9kh5bsx9gz5w66j378bdqgkrvspl0d2";
   };
 
   buildInputs = [ unzip ];
diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh
new file mode 100644
index 0000000000000..1886d144e480a
--- /dev/null
+++ b/pkgs/data/misc/geolite-legacy/builder.sh
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+source "$stdenv/setup"
+
+mkdir -p $out/share/GeoIP
+cd $out/share/GeoIP
+
+# Iterate over all environment variable names beginning with "src":
+for var in "${!src@}"; do
+	# Store the value of the variable with name $var in $src:
+	eval src="\$$var"
+
+	# Copy $src to current directory, removing Nix hash from the filename:
+	dest="${src##*/}"
+	dest="${dest#*-}"
+	cp "$src" "$dest"
+done
+
+gunzip -v *.gz
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
new file mode 100644
index 0000000000000..c36e6f83106fa
--- /dev/null
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl }:
+
+# 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.
+let version = "2015-03-26"; in
+stdenv.mkDerivation {
+  name = "geolite-legacy-${version}";
+
+  srcGeoIP = fetchurl {
+    url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz;
+    sha256 = "01xw896n9wcm1pv7sixfbh4gv6isl6m1i6lwag1c2bbcx6ci1zvr";
+  };
+  srcGeoIPv6 = fetchurl {
+    url = https://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz;
+    sha256 = "07l10hd7fkgk1nbw5gx4hjp61kdqqgri97fidn78dlk837rb02d0";
+  };
+  srcGeoLiteCity = fetchurl {
+    url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz;
+    sha256 = "1xqjyz9xnga3dvhj0f38hf78wv781jflvqkxm6qni3sj781nfr4a";
+  };
+  srcGeoLiteCityv6 = fetchurl {
+    url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz;
+    sha256 = "03s41ffc5a13qy5kgx8jqya97jkw2qlvdkak98hab7xs0i17z9pd";
+  };
+  srcGeoIPASNum = fetchurl {
+    url = https://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz;
+    sha256 = "1h766l8dsfgzlrz0q76877xksaf5qf91nwnkqwb6zl1gkczbwy6p";
+  };
+  srcGeoIPASNumv6 = fetchurl {
+    url = https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz;
+    sha256 = "0dwi9b3amfpmpkknf9ipz2r8aq05gn1j2zlvanwwah3ib5cgva9d";
+  };
+
+  meta = with stdenv.lib; {
+    description = "GeoLite Legacy IP geolocation databases";
+    homepage = https://geolite.maxmind.com/download/geoip;
+    license = with licenses; cc-by-sa-30;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  builder = ./builder.sh;
+}
diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index cc676d0b35ddc..6adb457583925 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://sethwklein.net/projects/iana-etc/;
     description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }