diff options
| -rw-r--r-- | pkgs/development/perl-modules/module-pluggable.patch | 92 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 36 insertions, 70 deletions
diff --git a/pkgs/development/perl-modules/module-pluggable.patch b/pkgs/development/perl-modules/module-pluggable.patch index defe8e01ff64..51a029c106b9 100644 --- a/pkgs/development/perl-modules/module-pluggable.patch +++ b/pkgs/development/perl-modules/module-pluggable.patch @@ -1,65 +1,27 @@ -diff -rc Module-Pluggable-3.5-orig/lib/Module/Pluggable/Object.pm Module-Pluggable-3.5/lib/Module/Pluggable/Object.pm -*** Module-Pluggable-3.5-orig/lib/Module/Pluggable/Object.pm 2007-01-30 00:13:00.000000000 +0100 ---- Module-Pluggable-3.5/lib/Module/Pluggable/Object.pm 2007-03-13 14:29:34.000000000 +0100 -*************** -*** 136,147 **** - my $sp = catdir($dir, (split /::/, $searchpath)); - - # if it doesn't exist or it's not a dir then skip it -! next unless ( -e $sp && -d _ ); # Use the cached stat the second time - - my @files = $self->find_files($sp); - - # foreach one we've found - foreach my $file (@files) { - # untaint the file; accept .pm only - next unless ($file) = ($file =~ /(.*$file_regex)$/); - # parse the file to get the name ---- 136,148 ---- - my $sp = catdir($dir, (split /::/, $searchpath)); - - # if it doesn't exist or it's not a dir then skip it -! next unless ( -d $sp ); - - my @files = $self->find_files($sp); - - # foreach one we've found - foreach my $file (@files) { -+ - # untaint the file; accept .pm only - next unless ($file) = ($file =~ /(.*$file_regex)$/); - # parse the file to get the name -*************** -*** 161,167 **** - - my $err = $self->handle_finding_plugin($plugin); - carp "Couldn't require $plugin : $err" if $err; -! - push @plugins, $plugin; - } - ---- 162,168 ---- - - my $err = $self->handle_finding_plugin($plugin); - carp "Couldn't require $plugin : $err" if $err; -! - push @plugins, $plugin; - } - -*************** -*** 201,207 **** - (my $path = $File::Find::name) =~ s#^\\./##; - push @files, $path; - } -! }, $search_path ); - } - #chdir $cwd; - return @files; ---- 202,208 ---- - (my $path = $File::Find::name) =~ s#^\\./##; - push @files, $path; - } -! }, "$search_path/." ); - } - #chdir $cwd; - return @files; +diff -ru Module-Pluggable-4.8/lib/Module/Pluggable/Object.pm Module-Pluggable-4.8-new/lib/Module/Pluggable/Object.pm +--- Module-Pluggable-4.8/lib/Module/Pluggable/Object.pm 2013-05-28 01:30:06.000000000 +0200 ++++ Module-Pluggable-4.8-new/lib/Module/Pluggable/Object.pm 2013-06-02 23:24:52.704125205 +0200 +@@ -180,12 +180,13 @@ + my $sp = catdir($dir, (split /::/, $searchpath)); + + # if it doesn't exist or it's not a dir then skip it +- next unless ( -e $sp && -d _ ); # Use the cached stat the second time ++ next unless ( -d $sp ); + + my @files = $self->find_files($sp); + + # foreach one we've found + foreach my $file (@files) { ++ + # untaint the file; accept .pm only + next unless ($file) = ($file =~ /(.*$file_regex)$/); + # parse the file to get the name +@@ -314,7 +315,7 @@ + (my $path = $File::Find::name) =~ s#^\\./##; + push @files, $path; + } +- }, $search_path ); ++ }, "$search_path/." ); + } + #chdir $cwd; + return @files; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e927d55025b8..8fe62df82202 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3292,16 +3292,20 @@ rec { propagatedBuildInputs = [ version ]; }; - ModulePluggable = buildPerlPackage rec { - name = "Module-Pluggable-3.9"; + ModulePluggable = buildPerlPackage { + name = "Module-Pluggable-4.8"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SI/SIMONW/${name}.tar.gz"; - sha256 = "0psryh1dz828zly92db9zcv905n82in2awixzqngqhzg4y7fg4wc"; + url = mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-4.8.tar.gz; + sha256 = "0gc2sanga3207l3dnmb05isc7m87l1j94v9ll3z4sbb3vs49gdd2"; }; patches = [ # !!! merge this patch into Perl itself (which contains Module::Pluggable as well) ../development/perl-modules/module-pluggable.patch ]; + meta = { + description = "Automatically give your module the ability to have plugins"; + license = "perl5"; + }; }; ModulePluggableFast = buildPerlPackage { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20bbc37e4d69..e5dc28a2fb04 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1951,7 +1951,7 @@ pythonPackages = python.modules // rec { }; meta = { - homepage = "http://code.google.com/p/httplib2"; + homepage = http://code.google.com/p/httplib2; description = "A comprehensive HTTP client library"; license = pkgs.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; |