From aa275908c0f70baa573a6795609c5585a3ffbc6c Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 20 Jan 2008 18:23:55 +0000 Subject: [PATCH] which: * update to 2.19 * add readline dependency * use mirror:// for download location svn path=/nixpkgs/trunk/; revision=10231 --- pkgs/tools/system/which/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix index 482d495ba83a..3552766020e0 100644 --- a/pkgs/tools/system/which/default.nix +++ b/pkgs/tools/system/which/default.nix @@ -1,9 +1,11 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { - name = "which-2.17"; +{stdenv, fetchurl, readline}: stdenv.mkDerivation { + name = "which-2.19"; src = fetchurl { - url = http://ftp.gnu.org/gnu/which/which-2.17.tar.gz; - sha256 = "1nnnbn83da8481blmcyv96gm15ccsilr93fmgmwdlzj8a72fjvqp"; + url = mirror://gnu/pub/gnu/which/which-2.19.tar.gz; + sha256 = "0lnd8mfpc0r1r2ch54vl3vc6r0fnzfl33sqdda2aq62iyrsbhybx"; }; + + buildInputs = [readline]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22bbc65cd410..faca8a7f3205 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -819,7 +819,7 @@ rec { }; which = import ../tools/system/which { - inherit fetchurl stdenv; + inherit fetchurl stdenv readline; }; wv = import ../tools/misc/wv {