diff options
author | Fabian Affolter <fabian@affolter-engineering.ch> | 2021-09-08 10:21:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-08 10:21:20 +0200 |
commit | 6eadd1532001253166b447407420e60d6cfe87aa (patch) | |
tree | 216c6bb1945a26661107cb267d218c1b97693bad | |
parent | ac79dfcefce2eb3b270c3bddce75798b00440d6e (diff) | |
parent | ed7e5ab31c6b300dce5c1b6b9878ae8fd156709f (diff) |
Merge pull request #136168 from fabaff/bump-ipv6calc
ipv6calc: 2.2.0 -> 3.2.0
-rw-r--r-- | pkgs/development/libraries/ip2location-c/default.nix | 23 | ||||
-rw-r--r-- | pkgs/tools/networking/ipv6calc/default.nix | 48 |
2 files changed, 49 insertions, 22 deletions
diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index 23801d3436da..510bc162501d 100644 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -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; }; } diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 158a979fb40c..bb0d7e698f21 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -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; }; } |