From 2b5a60700e5d58a2aff1de03e41cdaeae5c23dc9 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 21 Jul 2015 20:55:48 +0200 Subject: [PATCH 1/5] perl-URI: 1.60 -> 1.68 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8aaf05d8bc0..0f4a3cce4fe 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10380,14 +10380,15 @@ let self = _self // overrides; _self = with self; { }; URI = buildPerlPackage { - name = "URI-1.60"; + name = "URI-1.68"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/URI-1.60.tar.gz; - sha256 = "0xr31mf7lfrwhyvlx4pzp6p7alls5gi4bj8pk5g89f5cckfd74hz"; + url = mirror://cpan/authors/id/E/ET/ETHER/URI-1.68.tar.gz; + sha256 = "c840d30f7657bfd4b2acbb311bd764232911cd3dc97e92415fbd0a242185c358"; }; meta = { description = "Uniform Resource Identifiers (absolute and relative)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; From 04bf08c70704a045a41bdb9ab00f731d25802c96 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 21 Jul 2015 20:56:33 +0200 Subject: [PATCH 2/5] perl-Encode-Locale: 1.03 -> 1.05 --- pkgs/top-level/perl-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0f4a3cce4fe..d9f02d47074 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3401,16 +3401,21 @@ let self = _self // overrides; _self = with self; { }; EncodeLocale = buildPerlPackage rec { - name = "Encode-Locale-1.03"; + name = "Encode-Locale-1.05"; src = fetchurl { url = "mirror://cpan/modules/by-module/Encode/${name}.tar.gz"; - sha256 = "0m9d1vdphlyzybgmdanipwd9ndfvyjgk3hzw250r299jjgh3fqzp"; + sha256 = "176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1"; }; preCheck = if stdenv.isCygwin then '' sed -i"" -e "s@plan tests => 13@plan tests => 10@" t/env.t sed -i"" -e "s@ok(env(\"\\\x@#ok(env(\"\\\x@" t/env.t sed -i"" -e "s@ok(\$ENV{\"\\\x@#ok(\$ENV{\"\\\x@" t/env.t '' else null; + meta = { + description = "Determine the locale encoding"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; + }; }; EnvPath = buildPerlPackage { From 75193c15067548747c81f319d420cf7a5085c5e6 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 21 Jul 2015 20:56:55 +0200 Subject: [PATCH 3/5] perl-IO-HTML: 0.04 -> 1.001 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d9f02d47074..2fa62404fbf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4738,15 +4738,15 @@ let self = _self // overrides; _self = with self; { }; IOHTML = buildPerlPackage { - name = "IO-HTML-0.04"; + name = "IO-HTML-1.001"; src = fetchurl { - url = mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-0.04.tar.gz; - sha256 = "0c4hc76c1gypdwfasnibr2qlf9x3bnhyw357lhqlrczbm6vn8hw5"; + url = mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz; + sha256 = "ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0"; }; meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Open an HTML file with automatic charset detection"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; From 174613a95e0aa74015f0d4203153f06a162611f7 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 21 Jul 2015 20:57:20 +0200 Subject: [PATCH 4/5] perl-Net-HTTP: 6.06 -> 6.09 --- pkgs/top-level/perl-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2fa62404fbf..72b033db620 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6994,14 +6994,16 @@ let self = _self // overrides; _self = with self; { }; NetHTTP = buildPerlPackage { - name = "Net-HTTP-6.06"; + name = "Net-HTTP-6.09"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Net-HTTP-6.06.tar.gz; - sha256 = "1m1rvniffadq99gsy25298ia3lixwymr6kan64jd3ylyi7nkqkhx"; + url = mirror://cpan/authors/id/E/ET/ETHER/Net-HTTP-6.09.tar.gz; + sha256 = "52762b939d84806908ba544581c5708375f7938c3c0e496c128ca3fbc425e58d"; }; + propagatedBuildInputs = [ URI ]; meta = { description = "Low-level HTTP connection (client)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; From 8c7857d65ea686d74d5729d863a688d959c175ca Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 21 Jul 2015 20:58:10 +0200 Subject: [PATCH 5/5] perl-LWP: enable tests The added patch allows LWP to run its tests. --- .../lwp-test-with-localhost.patch | 75 +++++++++++++++++++ pkgs/top-level/perl-packages.nix | 4 +- 2 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/perl-modules/lwp-test-with-localhost.patch diff --git a/pkgs/development/perl-modules/lwp-test-with-localhost.patch b/pkgs/development/perl-modules/lwp-test-with-localhost.patch new file mode 100644 index 00000000000..25b96796d23 --- /dev/null +++ b/pkgs/development/perl-modules/lwp-test-with-localhost.patch @@ -0,0 +1,75 @@ +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 72b033db620..ef265115618 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5384,8 +5384,8 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "1cpqjl59viw50bnbdyn8xzrwzg7g54b2rszw0fifacqrppp17gaz"; }; - propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPNegotiate HTTPMessage LWPMediaTypes NetHTTP URI WWWRobotRules ]; - doCheck = false; # tries to start a daemon + patches = [ ../development/perl-modules/lwp-test-with-localhost.patch ]; + propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPMessage HTTPNegotiate LWPMediaTypes NetHTTP URI WWWRobotRules ]; meta = { description = "The World-Wide Web library for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];