diff --git a/pkgs/development/perl-modules/lwp-test-with-localhost.patch b/pkgs/development/perl-modules/lwp-test-with-localhost.patch deleted file mode 100644 index 25b96796d23..00000000000 --- a/pkgs/development/perl-modules/lwp-test-with-localhost.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 2d7a479b39bb20a0d61f067ba6c2df92117fcb8c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 23 Apr 2014 12:45:38 +0200 -Subject: [PATCH] Connect to localhost instead of hostname -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The hostname does not have to be resolvable nor reachable. It's just -a machine name. - -Signed-off-by: Petr Písař ---- - t/local/http.t | 2 +- - t/robot/ua-get.t | 2 +- - t/robot/ua.t | 2 +- - talk-to-ourself | 3 +-- - 4 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/t/local/http.t b/t/local/http.t -index 779cc21..534b4c8 100644 ---- a/t/local/http.t -+++ b/t/local/http.t -@@ -20,7 +20,7 @@ if ($D eq 'daemon') { - - require HTTP::Daemon; - -- my $d = HTTP::Daemon->new(Timeout => 10); -+ my $d = HTTP::Daemon->new(Timeout => 10, LocalAddr => 'localhost'); - - print "Please to meet you at: url, ">\n"; - open(STDOUT, $^O eq 'VMS'? ">nl: " : ">/dev/null"); -diff --git a/t/robot/ua-get.t b/t/robot/ua-get.t -index 5754c4b..bf24589 100644 ---- a/t/robot/ua-get.t -+++ b/t/robot/ua-get.t -@@ -19,7 +19,7 @@ if ($D eq 'daemon') { - - require HTTP::Daemon; - -- my $d = new HTTP::Daemon Timeout => 10; -+ my $d = new HTTP::Daemon Timeout => 10, LocalAddr => 'localhost'; - - print "Please to meet you at: url, ">\n"; - open(STDOUT, $^O eq 'MSWin32' ? ">nul" : $^O eq 'VMS' ? ">NL:" : ">/dev/null"); -diff --git a/t/robot/ua.t b/t/robot/ua.t -index 21ad5c8..11fafa8 100644 ---- a/t/robot/ua.t -+++ b/t/robot/ua.t -@@ -19,7 +19,7 @@ if ($D eq 'daemon') { - - require HTTP::Daemon; - -- my $d = new HTTP::Daemon Timeout => 10; -+ my $d = new HTTP::Daemon Timeout => 10, LocalAddr => 'localhost'; - - print "Please to meet you at: url, ">\n"; - open(STDOUT, $^O eq 'MSWin32' ? ">nul" : $^O eq 'VMS' ? ">NL:" : ">/dev/null"); -diff --git a/talk-to-ourself b/talk-to-ourself -index 6c0257a..b4acda2 100644 ---- a/talk-to-ourself -+++ b/talk-to-ourself -@@ -9,8 +9,7 @@ require IO::Socket; - - if (@ARGV >= 2 && $ARGV[0] eq "--port") { - my $port = $ARGV[1]; -- require Sys::Hostname; -- my $host = Sys::Hostname::hostname(); -+ my $host = 'localhost'; - if (my $socket = IO::Socket::INET->new(PeerAddr => "$host:$port", Timeout => 5)) { - require IO::Select; - if (IO::Select->new($socket)->can_read(1)) { --- -1.9.0 - diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0e2581b6a29..89fad8071a6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6900,13 +6900,12 @@ let self = _self // overrides; _self = with self; { }; }; - LWP = buildPerlPackage rec { - name = "libwww-perl-6.13"; + "LWP" = buildPerlPackage rec { + name = "libwww-perl-6.15"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "1cpqjl59viw50bnbdyn8xzrwzg7g54b2rszw0fifacqrppp17gaz"; + sha256 = "6f349d45c21b1ec0501c4437dfcb70570940e6c3d5bff783bd91d4cddead8322"; }; - patches = [ ../development/perl-modules/lwp-test-with-localhost.patch ]; propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPMessage HTTPNegotiate LWPMediaTypes NetHTTP URI WWWRobotRules ]; meta = with stdenv.lib; { description = "The World-Wide Web library for Perl";