Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5ccfd0ee34ae
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9e40faf0d5b5
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 9, 2018

  1. whois: 5.2.18 -> 5.2.20

    @dtzWill
    dtzWill committed Jan 9, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    mogorman Matthew O'Gorman
    GPG key ID: F71F32386DEAE4B2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    90c67ea View commit details

  2. whois: use libidn2 to support various 'international' domains

    @dtzWill
    dtzWill committed Jan 9, 2018
    Copy the full SHA
    364b219 View commit details

  3. whois: prefer not overwriting phases, use libiconv

    @dtzWill
    dtzWill committed Jan 9, 2018
    Copy the full SHA
    eb7af7a View commit details

Commits on Jan 13, 2018

  1. Merge pull request #33650 from dtzWill/feature/whois-idn-and-update 

    whois: use idn, libiconv; update
    @Mic92
    Mic92 authored Jan 13, 2018
    Copy the full SHA
    9e40faf View commit details
Showing with 10 additions and 6 deletions.
  1. +10 −6 pkgs/tools/networking/whois/default.nix
16 changes: 10 additions & 6 deletions pkgs/tools/networking/whois/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
{ stdenv, fetchFromGitHub, perl, gettext }:
{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:

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 ];
nativeBuildInputs = [ perl gettext pkgconfig ];
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";