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

Merge pull request #136168 from fabaff/bump-ipv6calc

Browse Source 
ipv6calc: 2.2.0 -> 3.2.0
This commit is contained in:
Fabian Affolter 2021-09-08 10:21:20 +02:00 committed by GitHub
commit 6eadd15320
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/libraries/ip2location-c/default.nix
View File

@ -1,15 +1,23 @@
{ lib, stdenv, fetchurl, autoreconfHook }:
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
}:
stdenv.mkDerivation rec {
pname = "ip2location-c";
version = "7.0.2"; # meta.homepage might change after a major update
version = "8.4.0";
src = fetchurl {
sha256 = "1gs43qgcyfn83abrkhvvw1s67d1sbkbj3hab9m17ysn6swafiycx";
url = "https://www.ip2location.com/downloads/ip2location-c-${version}.tar.gz";
src = fetchFromGitHub {
owner = "chrislim2888";
repo = "IP2Location-C-Library";
rev = version;
sha256 = "0rqjgmv62s7abiiqi3ff3ff838qx4pzr509irmzvqlflnkxxi0q6";
};
nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [
autoreconfHook
];
enableParallelBuilding = true;
@ -25,8 +33,9 @@ stdenv.mkDerivation rec {
weather, MCC, MNC, mobile brand name, elevation and usage type of
any IP address or host name in the IP2Location databases.
'';
homepage = "http://www.ip2location.com/developers/c-7";
homepage = "https://www.ip2location.com/developers/c";
license = with licenses; [ gpl3Plus lgpl3Plus ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

48
pkgs/tools/networking/ipv6calc/default.nix
View File

@ -1,20 +1,33 @@
{ lib, stdenv, fetchurl, getopt, ip2location-c, openssl, perl
, libmaxminddb ? null, geolite-legacy ? null }:
{ lib
, stdenv
, fetchFromGitHub
, getopt
, ip2location-c
, openssl
, perl
, libmaxminddb ? null
, geolite-legacy ? null
}:
stdenv.mkDerivation rec {
pname = "ipv6calc";
version = "2.2.0";
version = "3.2.0";
src = fetchurl {
urls = [
"https://www.deepspace6.net/ftp/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz"
"ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz"
"ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${pname}-${version}.tar.gz"
];
sha256 = "18acy0sy3n6jcjjwpxskysinw06czyayx1q4rqc7zc3ic4pkad8r";
src = fetchFromGitHub {
owner = "pbiering";
repo = pname;
rev = version;
sha256 = "1iis7qw803k9z52j30hn9sv8c3b0xyr9v7kb4fvcyiry1iaxcgfk";
};
buildInputs = [ libmaxminddb geolite-legacy getopt ip2location-c openssl perl ];
buildInputs = [
libmaxminddb
geolite-legacy
getopt
ip2location-c
openssl
perl
];
postPatch = ''
patchShebangs *.sh */*.sh
@ -30,9 +43,13 @@ stdenv.mkDerivation rec {
"--disable-bundled-md5"
"--disable-dynamic-load"
"--enable-shared"
] ++ lib.optional (libmaxminddb != null) "--enable-mmdb"
++ lib.optional (geolite-legacy != null) "--with-geoip-db=${geolite-legacy}/share/GeoIP"
++ lib.optional (ip2location-c != null) "--enable-ip2location";
] ++ lib.optional (libmaxminddb != null) [
"--enable-mmdb"
] ++ lib.optional (geolite-legacy != null) [
"--with-geoip-db=${geolite-legacy}/share/GeoIP"
] ++ lib.optional (ip2location-c != null) [
"--enable-ip2location"
];
enableParallelBuilding = true;
@ -47,7 +64,8 @@ stdenv.mkDerivation rec {
Now only one utiltity is needed to do a lot.
'';
homepage = "http://www.deepspace6.net/projects/ipv6calc.html";
license = licenses.gpl2;
license = licenses.gpl2Only;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}