ipv6calc: 2.1.1 -> 2.2.0 (#71630)

* ipv6calc: 2.1.1 -> 2.2.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ipv6calc/versions

* ipv6calc: add https source url
+ use postPatch hook instead of overriding patchPhase

* ipv6calc: replace legacy geoip with maxminddb
+ define install dirs using configure flags

1 files changed, 17 insertions, 14 deletions

diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index 6e04859410f..5de4b8cecb7 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -1,34 +1,37 @@
 { stdenv, fetchurl, getopt, ip2location-c, openssl, perl
-, geoip ? null, geolite-legacy ? null }:
+, libmaxminddb ? null, geolite-legacy ? null }:
 
 stdenv.mkDerivation rec {
   pname = "ipv6calc";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchurl {
-    url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${pname}-${version}.tar.gz";
-    sha256 = "01a4p2g31y6p1r3kacymbv2hhvkwnv00yskhphgcgjq5jpkmfjcn";
+    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";
   };
 
-  buildInputs = [ geoip geolite-legacy getopt ip2location-c openssl ];
-  nativeBuildInputs = [ perl ];
+  buildInputs = [ libmaxminddb geolite-legacy getopt ip2location-c openssl perl ];
 
-  patchPhase = ''
+  postPatch = ''
+    patchShebangs *.sh */*.sh
     for i in {,databases/}lib/Makefile.in; do
-      substituteInPlace $i --replace /sbin/ldconfig true
-    done
-    for i in {{,databases/}lib,man}/Makefile.in; do
-      substituteInPlace $i --replace DESTDIR out
+      substituteInPlace $i --replace "/sbin/ldconfig" "ldconfig"
     done
   '';
 
   configureFlags = [
+    "--prefix=${placeholder "out"}"
+    "--libdir=${placeholder "out"}/lib"
     "--disable-bundled-getopt"
     "--disable-bundled-md5"
     "--disable-dynamic-load"
     "--enable-shared"
-  ] ++ stdenv.lib.optional (geoip != null ) [
-    "--enable-geoip"
+  ] ++ stdenv.lib.optional (libmaxminddb != null ) [
+    "--enable-mmdb"
   ] ++ stdenv.lib.optional (geolite-legacy != null) [
     "--with-geoip-db=${geolite-legacy}/share/GeoIP"
   ] ++ stdenv.lib.optional (ip2location-c != null ) [
@@ -47,7 +50,7 @@ stdenv.mkDerivation rec {
       difficult) migrating the Perl program ip6_int into.
       Now only one utiltity is needed to do a lot.
     '';
-    homepage = http://www.deepspace6.net/projects/ipv6calc.html;
+    homepage = "http://www.deepspace6.net/projects/ipv6calc.html";
     license = licenses.gpl2;
     platforms = platforms.linux;
   };