diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-09-13 11:53:06 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-09-13 17:18:49 +0000 |
commit | c3e005913d59b8ad64004e60888a71816688af1f (patch) | |
tree | f65b32f0d16acaa40f2ee82ac736d150de4b6cf5 /nixpkgs/pkgs/tools/networking/ipv6calc/default.nix | |
parent | 1c8034da05499ca3d999f57ba1f6b235e7711ee1 (diff) | |
parent | db88608d8c811a93b74c99cfa1224952afc78200 (diff) | |
download | nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.gz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.bz2 nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.lz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.xz nixlib-c3e005913d59b8ad64004e60888a71816688af1f.tar.zst nixlib-c3e005913d59b8ad64004e60888a71816688af1f.zip |
Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200'
Conflicts: nixpkgs/nixos/modules/config/update-users-groups.pl
Diffstat (limited to 'nixpkgs/pkgs/tools/networking/ipv6calc/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/networking/ipv6calc/default.nix | 48 |
1 files changed, 33 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix b/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix index 158a979fb40c..bb0d7e698f21 100644 --- a/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix +++ b/nixpkgs/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; }; } |