diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-01-28 03:14:32 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-01-28 18:52:24 +0100 |
| commit | dfdb17d10d440e5ae704fcca7093d223730ec527 (patch) | |
| tree | 91037fffa8171f9e5e415d6d016886b4659c2eaa | |
| parent | 0d915183244e7132c0c539f2441df46cb397d9b1 (diff) | |
| download | nixpkgs-dfdb17d10d440e5ae704fcca7093d223730ec527.tar nixpkgs-dfdb17d10d440e5ae704fcca7093d223730ec527.tar.gz nixpkgs-dfdb17d10d440e5ae704fcca7093d223730ec527.tar.bz2 nixpkgs-dfdb17d10d440e5ae704fcca7093d223730ec527.tar.lz nixpkgs-dfdb17d10d440e5ae704fcca7093d223730ec527.tar.xz nixpkgs-dfdb17d10d440e5ae704fcca7093d223730ec527.tar.zst nixpkgs-dfdb17d10d440e5ae704fcca7093d223730ec527.zip | |
geoip: 1.6.2 -> 1.6.12
| -rw-r--r-- | pkgs/development/libraries/geoip/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 60d40b10aa4..d93430ac1f5 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,17 +1,22 @@ # in geoipDatabase, you can insert a package defining ${geoipDatabase}/share/GeoIP # e.g. geolite-legacy -{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? "/var/lib/geoip-databases" }: +{ stdenv, fetchFromGitHub, autoreconfHook +, drvName ? "geoip", geoipDatabase ? "/var/lib/geoip-databases" }: -let version = "1.6.2"; +let version = "1.6.12"; dataDir = if (stdenv.lib.isDerivation geoipDatabase) then "${toString geoipDatabase}/share/GeoIP" else geoipDatabase; in stdenv.mkDerivation { name = "${drvName}-${version}"; - src = fetchurl { - url = "http://geolite.maxmind.com/download/geoip/api/c/GeoIP-${version}.tar.gz"; - sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7"; + src = fetchFromGitHub { + owner = "maxmind"; + repo = "geoip-api-c"; + rev = "v${version}"; + sha256 = "0ixyp3h51alnncr17hqp1p0rlqz9w69nlhm60rbzjjz3vjx52ajv"; }; + nativeBuildInputs = [ autoreconfHook ]; + postPatch = '' find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; |