diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/data/misc | |
parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
download | nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.zip |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/data/misc')
-rw-r--r-- | pkgs/data/misc/geolite-legacy/default.nix | 12 | ||||
-rw-r--r-- | pkgs/data/misc/sound-theme-freedesktop/default.nix | 3 | ||||
-rw-r--r-- | pkgs/data/misc/wireless-regdb/default.nix | 5 |
3 files changed, 7 insertions, 13 deletions
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 581d1db5088b..eab577888d11 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/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; diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix index a43a94a0d7c9..986f3d35b7d5 100644 --- a/pkgs/data/misc/sound-theme-freedesktop/default.nix +++ b/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: diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index acc1ca5b55ec..123cb7a62089 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/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; |