From f5bf68f9a8f2ffefba569d562590d99f33e7f915 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 2 Feb 2008 20:39:44 +0000 Subject: [PATCH] wget: version 1.11 added, made default. svn path=/nixpkgs/branches/stdenv-updates/; revision=10456 --- .../networking/wget/{default.nix => 1.10.2.nix} | 0 pkgs/tools/networking/wget/1.11.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) rename pkgs/tools/networking/wget/{default.nix => 1.10.2.nix} (100%) create mode 100644 pkgs/tools/networking/wget/1.11.nix diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/1.10.2.nix similarity index 100% rename from pkgs/tools/networking/wget/default.nix rename to pkgs/tools/networking/wget/1.10.2.nix diff --git a/pkgs/tools/networking/wget/1.11.nix b/pkgs/tools/networking/wget/1.11.nix new file mode 100644 index 00000000000..c7295f1df94 --- /dev/null +++ b/pkgs/tools/networking/wget/1.11.nix @@ -0,0 +1,16 @@ +args: with args; + +stdenv.mkDerivation rec { + name = "wget-" + version; + src = fetchurl { + url = "mirror://gnu/wget/${name}.tar.bz2"; + sha256 = "0mhd3181zdp1fwirxw0km7502sfvjmm1ncska9w6s2drczf37aix"; + }; + + buildInputs = [gettext]; + + meta = { + description = "A console downloading program. Has some features for mirroring sites."; + homepage = http://www.gnu.org/software/wget; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 143cf980c47..3d558190b97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -832,10 +832,12 @@ rec { inherit fetchurl stdenv; }; - wget = import ../tools/networking/wget { + wgetFun = lib.sumArgs (selectVersion ../tools/networking/wget "1.11") { inherit fetchurl stdenv gettext; }; + wget = wgetFun null; + which = import ../tools/system/which { inherit fetchurl stdenv readline; };