diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-02-02 20:39:44 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-02-02 20:39:44 +0000 |
| commit | f5bf68f9a8f2ffefba569d562590d99f33e7f915 (patch) | |
| tree | 5b6f6431accec65a7af81b1ffa8260be88519eca | |
| parent | 33bb9b56eb7d62556728cf5d23e68dbeb370a83b (diff) | |
| download | nixpkgs-f5bf68f9a8f2ffefba569d562590d99f33e7f915.tar nixpkgs-f5bf68f9a8f2ffefba569d562590d99f33e7f915.tar.gz nixpkgs-f5bf68f9a8f2ffefba569d562590d99f33e7f915.tar.bz2 nixpkgs-f5bf68f9a8f2ffefba569d562590d99f33e7f915.tar.lz nixpkgs-f5bf68f9a8f2ffefba569d562590d99f33e7f915.tar.xz nixpkgs-f5bf68f9a8f2ffefba569d562590d99f33e7f915.tar.zst nixpkgs-f5bf68f9a8f2ffefba569d562590d99f33e7f915.zip | |
wget: version 1.11 added, made default.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10456
| -rw-r--r-- | pkgs/tools/networking/wget/1.10.2.nix (renamed from pkgs/tools/networking/wget/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/tools/networking/wget/1.11.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/1.10.2.nix index 8817466432d..8817466432d 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/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; }; |