public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Module::Pluggable: Update to 4.8

Browse Source
This commit is contained in:
Eelco Dolstra 2013-06-02 23:32:59 +02:00
parent 6609df220b
commit f1c42a8331
3 changed files with 36 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pkgs/development/perl-modules/module-pluggable.patch
View File

@ -1,25 +1,12 @@
diff -rc Module-Pluggable-3.5-orig/lib/Module/Pluggable/Object.pm Module-Pluggable-3.5/lib/Module/Pluggable/Object.pm diff -ru Module-Pluggable-4.8/lib/Module/Pluggable/Object.pm Module-Pluggable-4.8-new/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-4.8/lib/Module/Pluggable/Object.pm 2013-05-28 01:30:06.000000000 +0200
--- Module-Pluggable-3.5/lib/Module/Pluggable/Object.pm 2007-03-13 14:29:34.000000000 +0100 +++ Module-Pluggable-4.8-new/lib/Module/Pluggable/Object.pm 2013-06-02 23:24:52.704125205 +0200
*************** @@ -180,12 +180,13 @@
*** 136,147 ****
my $sp = catdir($dir, (split /::/, $searchpath)); my $sp = catdir($dir, (split /::/, $searchpath));
# if it doesn't exist or it's not a dir then skip it # 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 ( -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
--- 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); my @files = $self->find_files($sp);
@ -29,37 +16,12 @@ diff -rc Module-Pluggable-3.5-orig/lib/Module/Pluggable/Object.pm Module-Pluggab
# untaint the file; accept .pm only # untaint the file; accept .pm only
next unless ($file) = ($file =~ /(.*$file_regex)$/); next unless ($file) = ($file =~ /(.*$file_regex)$/);
# parse the file to get the name # parse the file to get the name
*************** @@ -314,7 +315,7 @@
*** 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#^\\./##; (my $path = $File::Find::name) =~ s#^\\./##;
push @files, $path; push @files, $path;
} }
! }, $search_path ); - }, $search_path );
} + }, "$search_path/." );
#chdir $cwd;
return @files;
--- 202,208 ----
(my $path = $File::Find::name) =~ s#^\\./##;
push @files, $path;
}
! }, "$search_path/." );
} }
#chdir $cwd; #chdir $cwd;
return @files; return @files;

12
pkgs/top-level/perl-packages.nix
View File

@ -3292,16 +3292,20 @@ rec {
propagatedBuildInputs = [ version ]; propagatedBuildInputs = [ version ];
}; };
ModulePluggable = buildPerlPackage rec { ModulePluggable = buildPerlPackage {
name = "Module-Pluggable-3.9"; name = "Module-Pluggable-4.8";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/S/SI/SIMONW/${name}.tar.gz"; url = mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-4.8.tar.gz;
sha256 = "0psryh1dz828zly92db9zcv905n82in2awixzqngqhzg4y7fg4wc"; sha256 = "0gc2sanga3207l3dnmb05isc7m87l1j94v9ll3z4sbb3vs49gdd2";
}; };
patches = [ patches = [
# !!! merge this patch into Perl itself (which contains Module::Pluggable as well) # !!! merge this patch into Perl itself (which contains Module::Pluggable as well)
../development/perl-modules/module-pluggable.patch ../development/perl-modules/module-pluggable.patch
]; ];
meta = {
description = "Automatically give your module the ability to have plugins";
license = "perl5";
};
}; };
ModulePluggableFast = buildPerlPackage { ModulePluggableFast = buildPerlPackage {

2
pkgs/top-level/python-packages.nix
View File

@ -1951,7 +1951,7 @@ pythonPackages = python.modules // rec {
}; };
meta = { meta = {
homepage = "http://code.google.com/p/httplib2"; homepage = http://code.google.com/p/httplib2;
description = "A comprehensive HTTP client library"; description = "A comprehensive HTTP client library";
license = pkgs.lib.licenses.mit; license = pkgs.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.garbas ]; maintainers = [ stdenv.lib.maintainers.garbas ];