public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2015-10-23 01:57:14 +02:00
parent cf787f0282 c76f010450
commit 4917a4f8b3
247 changed files with 16829 additions and 1271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/misc/geolite-legacy/default.nix
+3 -3
View File
@@ -8,7 +8,7 @@ let
# 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-10-13";
version = "2015-10-19";
in
stdenv.mkDerivation {
name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
"0jdgfcy90mk7q25rhb8ymnddkskmp2cmyzmbjr3ij0zvbbpzxl4i";
srcGeoIPASNum = fetchDB
"asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
"0j73lw2i6nnx1mgp1hspfa95zca5h0hqj12g16rln7pss868wnwi";
"1qz3hw4n3rs1c94iixshp0sq2rppk8aklp3al9r136kjp4cswbzc";
srcGeoIPASNumv6 = fetchDB
"asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
"1id4rkxp5pppr274y276w2zmx44dn0h44d4ax780g8cbhlc9n2br";
"1rmagwjnwsz75nscy7zsha6v4gd3lpqk3p8jy448d4g6l3w3ww1s";
meta = with stdenv.lib; {
inherit version;