From c78251f17c9d5f0cbebefc4ec3f337c8cec89b96 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Mon, 6 Mar 2017 21:05:42 -0700 Subject: [PATCH 1/2] inetutils: Add perl to buildInputs `whois' uses perl for various things during its build. Without it, whois fails to build . --- pkgs/tools/networking/inetutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index a92c3432857..9ca2eab20ab 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ stdenv, fetchurl, ncurses, perl }: stdenv.mkDerivation rec { name = "inetutils-1.9.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy"; }; - buildInputs = [ ncurses /* for `talk' */ ]; + buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ ]; configureFlags = "--with-ncurses-include-dir=${ncurses.dev}/include"; From ba8b6b4a7a8b4c547fd77ac373356a657a2d96c6 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Mon, 6 Mar 2017 21:08:24 -0700 Subject: [PATCH 2/2] inetutils: Add patch for Canadian TLD server Cherry-picked from upstream (inetutils-1_9_4-31-g73e2811). Could be a long time before a new inetutils release is made. vcunat amended the patch to apply. --- pkgs/tools/networking/inetutils/default.nix | 2 ++ .../whois-Update-Canadian-TLD-server.patch | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 9ca2eab20ab..3a6e9b625b8 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy"; }; + patches = [ ./whois-Update-Canadian-TLD-server.patch ]; + buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ ]; configureFlags = "--with-ncurses-include-dir=${ncurses.dev}/include"; diff --git a/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch b/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch new file mode 100644 index 00000000000..d63d4e29daf --- /dev/null +++ b/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch @@ -0,0 +1,27 @@ +From 73e2811a0512556fd5359acc4387f46c79a9884a Mon Sep 17 00:00:00 2001 +From: Mats Erik Andersson +Date: Thu, 2 Mar 2017 15:38:38 +0100 +Subject: [PATCH] whois: Update Canadian TLD server. +Content-Type: text/plain; charset=utf-8 + +--- + ChangeLog | 8 ++++++++ (OMITTED) + whois/tld_serv_list | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/whois/tld_serv_list b/whois/tld_serv_list +index 056efcf..91697b8 100644 +--- a/whois/tld_serv_list ++++ b/whois/tld_serv_list +@@ -81,7 +81,7 @@ + #.bw # NIC? www.botsnet.bw + #.by NONE # NIC? http://unibel.by www.open.by + .bz NONE # http://www.psg.com/dns/bz/ +-.ca whois.cdnnet.ca ++.ca whois.cira.ca + .cc whois.nic.cc + .cd WEB http://www.nic.cd/database/cd/ + #.cf NONE # NIC? http://www.socatel.intnet.cf +-- +2.10.0 +