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

perlPackages: fix build

Browse Source
This commit is contained in:
volth 2020-02-04 03:43:07 +00:00
parent 17d25f3714
commit 0cfef7224f
2 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch
View File

@ -1,33 +0,0 @@
diff --git a/t/003_basic_hash.t b/t/003_basic_hash.t
index 1f842ae..c21ac52 100644
--- a/t/003_basic_hash.t
+++ b/t/003_basic_hash.t
@@ -170,10 +170,10 @@ is_deeply($options->provides, {
is($options->type_constraint->type_parameter, 'Str', '... got the right container type');
$stuff->set_option( oink => "blah", xxy => "flop" );
-my @key_value = $stuff->key_value;
+my @key_value = sort{ $a->[0] cmp $b->[0] } $stuff->key_value;
is_deeply(
\@key_value,
- [ [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ],
+ [ sort{ $a->[0] cmp $b->[0] } [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ],
'... got the right key value pairs'
);
diff --git a/t/203_trait_hash.t b/t/203_trait_hash.t
index 8e876b1..451c0bb 100644
--- a/t/203_trait_hash.t
+++ b/t/203_trait_hash.t
@@ -156,10 +156,10 @@ is_deeply($options->provides, {
is($options->type_constraint->type_parameter, 'Str', '... got the right container type');
$stuff->set_option( oink => "blah", xxy => "flop" );
-my @key_value = $stuff->key_value;
+my @key_value = sort{ $a->[0] cmp $b->[0] } $stuff->key_value;
is_deeply(
\@key_value,
- [ [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ],
+ [ sort{ $a->[0] cmp $b->[0] } [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ],
'... got the right key value pairs'
);

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

@ -194,7 +194,7 @@ let
sha256 = "0b3dj1510fxldhicijvw390gnh5j1k6rjzcc2jzs9f8nwfkqh6r2";
};
propagatedBuildInputs = [ AlienBuild ];
buildInputs = [ MojoDOM58 SortVersions Test2Suite URI ];
buildInputs = [ pkgs.libxml2 MojoDOM58 SortVersions Test2Suite URI ];
meta = {
description = "Install the C libxml2 library on your system";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@ -12502,7 +12502,6 @@ let
url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-AttributeHelpers-0.25.tar.gz;
sha256 = "b0c819ec83999b258b248f82059fa5975a0cee365423abbee0efaca5401c5ec6";
};
patches = [ ../development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch ];
buildInputs = [ ModuleBuildTiny TestException ];
propagatedBuildInputs = [ Moose ];
meta = {
@ -20656,13 +20655,8 @@ let
sha256 = "1bp2d5jpfmp35f2giwqx60q2rmzq469szkxzfcqkd742x72h4ayc";
};
SKIP_SAX_INSTALL = 1;
buildInputs = [ pkgs.libxml2 AlienLibxml2 ];
buildInputs = [ AlienLibxml2 ];
propagatedBuildInputs = [ XMLSAX ];
# https://rt.cpan.org/Public/Bug/Display.html?id=122958
preCheck = ''
rm t/32xpc_variables.t
'';
};
XMLLibXMLSimple = buildPerlPackage {