From 90c67ea36a8396ed39bd3595d57431f6894d9745 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 9 Jan 2018 08:10:41 -0600 Subject: [PATCH 1/3] whois: 5.2.18 -> 5.2.20 --- pkgs/tools/networking/whois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index ed8f2eebc75..d73c5624aec 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext }: stdenv.mkDerivation rec { - version = "5.2.18"; + version = "5.2.20"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "0jzyq1rj6balc6a28swzgspv55xhkc75dw6wsn159in4ap61bzmi"; + sha256 = "1aamasivfnghr9my1j6c1rf0dfal45axjcjf3mpv0g942bkxqp5b"; }; buildInputs = [ perl gettext ]; From 364b21925fe4aa6b305a5bdd1a709aea2ee89e2d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 9 Jan 2018 08:22:58 -0600 Subject: [PATCH 2/3] whois: use libidn2 to support various 'international' domains --- pkgs/tools/networking/whois/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index d73c5624aec..bbee69e0c91 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, gettext }: +{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2 }: stdenv.mkDerivation rec { version = "5.2.20"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1aamasivfnghr9my1j6c1rf0dfal45axjcjf3mpv0g942bkxqp5b"; }; - buildInputs = [ perl gettext ]; + nativeBuildInputs = [ perl gettext pkgconfig ]; + buildInputs = [ libidn2 ]; preConfigure = '' for i in Makefile po/Makefile; do From eb7af7a82b9823d38a2dfdfa9bcd0093c18abaeb Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 9 Jan 2018 08:38:43 -0600 Subject: [PATCH 3/3] whois: prefer not overwriting phases, use libiconv --- pkgs/tools/networking/whois/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index bbee69e0c91..30ecf617873 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2 }: +{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { version = "5.2.20"; @@ -12,17 +12,20 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ perl gettext pkgconfig ]; - buildInputs = [ libidn2 ]; + buildInputs = [ libidn2 libiconv ]; preConfigure = '' for i in Makefile po/Makefile; do substituteInPlace $i --replace "prefix = /usr" "prefix = $out" done + + substituteInPlace Makefile --replace "DEFS += HAVE_ICONV" "DEFS += HAVE_ICONV\nwhois_LDADD += -liconv" ''; - buildPhase = "make whois"; + makeFlags = [ "HAVE_ICONV=1" ]; + buildFlags = [ "whois" ]; - installPhase = "make install-whois"; + installTargets = [ "install-whois" ]; meta = with stdenv.lib; { description = "Intelligent WHOIS client from Debian";