summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2009-02-02 12:33:40 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2009-02-02 12:33:40 +0000
commitc696ea132643bf3f284a8aeaa9a24fff4bc42df9 (patch)
tree438da422dbc40c249d23887103ceec0d8161f044
parent46c842df279e3fbef80118c8ffd8430c38112b93 (diff)
downloadnixlib-c696ea132643bf3f284a8aeaa9a24fff4bc42df9.tar
nixlib-c696ea132643bf3f284a8aeaa9a24fff4bc42df9.tar.gz
nixlib-c696ea132643bf3f284a8aeaa9a24fff4bc42df9.tar.bz2
nixlib-c696ea132643bf3f284a8aeaa9a24fff4bc42df9.tar.lz
nixlib-c696ea132643bf3f284a8aeaa9a24fff4bc42df9.tar.xz
nixlib-c696ea132643bf3f284a8aeaa9a24fff4bc42df9.tar.zst
nixlib-c696ea132643bf3f284a8aeaa9a24fff4bc42df9.zip
* wget 1.11.4.
svn path=/nixpkgs/trunk/; revision=13948
-rw-r--r--pkgs/tools/networking/wget/1.10.2.nix15
-rw-r--r--pkgs/tools/networking/wget/default.nix (renamed from pkgs/tools/networking/wget/1.11.nix)7
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 5 insertions, 19 deletions
diff --git a/pkgs/tools/networking/wget/1.10.2.nix b/pkgs/tools/networking/wget/1.10.2.nix
deleted file mode 100644
index 8817466432da..000000000000
--- a/pkgs/tools/networking/wget/1.10.2.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, gettext}:
-
-stdenv.mkDerivation {
-  name = "wget-1.10.2";
-  src = fetchurl {
-    url = mirror://gnu/wget/wget-1.10.2.tar.gz;
-    md5 = "795fefbb7099f93e2d346b026785c4b8";
-  };
-
-  buildInputs = [gettext];
-
-  meta = {
-    description = "A console downloading program. Has some features for mirroring sites.";
-  };
-}
diff --git a/pkgs/tools/networking/wget/1.11.nix b/pkgs/tools/networking/wget/default.nix
index c7295f1df943..9ab6fbb81330 100644
--- a/pkgs/tools/networking/wget/1.11.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -1,10 +1,11 @@
-args: with args;
+{stdenv, fetchurl, gettext}:
 
 stdenv.mkDerivation rec {
-  name = "wget-" + version;
+  name = "wget-1.11.4";
+  
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.bz2";
-    sha256 = "0mhd3181zdp1fwirxw0km7502sfvjmm1ncska9w6s2drczf37aix";
+    sha256 = "1yr7w182n7lvkajvq07wnw65sw2vmxjkc3611kpc728vhvi54zwb";
   };
 
   buildInputs = [gettext];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bac967cd9ff5..07d0a26b91e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1344,7 +1344,7 @@ let
     inherit (gtkLibs) glib;
   };
 
-  wget = composedArgsAndFun (selectVersion ../tools/networking/wget "1.11") {
+  wget = import ../tools/networking/wget {
     inherit fetchurl stdenv gettext;
   };