diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-09-04 23:05:48 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-09-04 23:05:48 +0000 |
| commit | b9b268eb012f8782c432d331db3ec71c305ed1e8 (patch) | |
| tree | 16aa6f2062cb26c627fa648d413ea53c9b1276ca /pkgs/tools/networking/wget | |
| parent | bad0bd10a8da210d5e8b7054814b81f055107e4c (diff) | |
GNU Wget 1.13.3.
svn path=/nixpkgs/trunk/; revision=29010
Diffstat (limited to 'pkgs/tools/networking/wget')
| -rw-r--r-- | pkgs/tools/networking/wget/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/networking/wget/gnutls-support.patch | 16 |
2 files changed, 3 insertions, 21 deletions
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index af15d85af4b6..b10d25ffc943 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }: stdenv.mkDerivation rec { - name = "wget-1.12"; + name = "wget-1.13.3"; src = fetchurl { - url = "mirror://gnu/wget/${name}.tar.bz2"; - sha256 = "16msgly5xn0qj6ngsw34q9j7ag8jkci6020w21d30jgqw8wdj8y8"; + url = "mirror://gnu/wget/${name}.tar.gz"; + sha256 = "07wxl38qiy95k3hv2fd1sglgrlp6z920pr9mcfsj8dg7iaxbhppi"; }; - patches = [ ./gnutls-support.patch ]; - preConfigure = '' for i in "doc/texi2pod.pl" "tests/run-px" "util/rmold.pl" do diff --git a/pkgs/tools/networking/wget/gnutls-support.patch b/pkgs/tools/networking/wget/gnutls-support.patch deleted file mode 100644 index fa0c5cc06c0f..000000000000 --- a/pkgs/tools/networking/wget/gnutls-support.patch +++ /dev/null @@ -1,16 +0,0 @@ -This patch fixes GnuTLS support: - - http.o: In function `gethttp': - http.c:(.text+0x26c6): undefined reference to `ssl_connect_wget' - ---- wget-1.12/src/http.c 2009-09-22 05:02:18.000000000 +0200 -+++ wget-1.12/src/http.c 2009-10-03 17:24:46.000000000 +0200 -@@ -1762,7 +1762,7 @@ gethttp (struct url *u, struct http_stat - - if (conn->scheme == SCHEME_HTTPS) - { -- if (!ssl_connect_wget (sock)) -+ if (!ssl_connect (sock)) - { - fd_close (sock); - return CONSSLERR; |