geoip: Convert to mkDerivation

Also, drop unused zlib dependency and add some meta attributes.
This commit is contained in:
Eelco Dolstra 2014-03-14 17:54:40 +01:00
parent 779a959982
commit ea1cd70128
4 changed files with 13 additions and 34 deletions

View File

@ -1,24 +1,19 @@
a :
let
s = import ./src-for-default.nix;
buildInputs = with a; [
zlib
];
in
rec {
src = a.fetchUrlFromSrcInfo s;
{ stdenv, fetchurl }:
inherit (s) name;
inherit buildInputs;
configureFlags = [];
let version = "1.6.0"; in
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
stdenv.mkDerivation {
name = "geoip-${version}";
src = fetchurl {
url = "http://geolite.maxmind.com/download/geoip/api/c/GeoIP-${version}.tar.gz";
sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7";
};
meta = {
description = "Geolocation API";
maintainers = [
a.lib.maintainers.raskin
];
maintainers = [ stdenv.lib.maintainers.raskin ];
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -1,8 +0,0 @@
rec {
advertisedUrl="http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.4.6.tar.gz";
version = "1.4.6";
url="http://geolite.maxmind.com/download/geoip/api/c/GeoIP-1.6.0.tar.gz";
hash = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7";
name = "geoip-1.6.0";
}

View File

@ -1,6 +0,0 @@
{
downloadPage = "http://geolite.maxmind.com/download/geoip/api/c/";
sourceRegexp = "GeoIP-[0-9.]+[.]tar[.]gz";
choiceCommand = "tail -1";
baseName = "geoip";
}

View File

@ -4235,9 +4235,7 @@ let
geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
geoip = builderDefsPackage ../development/libraries/geoip {
inherit zlib;
};
geoip = callPackage ../development/libraries/geoip { };
geoipjava = callPackage ../development/libraries/java/geoipjava { };