Merge staging into closure-size
The most complex problems were from dealing with switches reverted in the meantime (gcc5, gmp6, ncurses6). It's likely that darwin is (still) broken nontrivially.
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, buildPerlPackage, DBI, postgresql }:
|
||||
|
||||
buildPerlPackage rec {
|
||||
name = "DBD-Pg-3.0.0";
|
||||
name = "DBD-Pg-3.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/T/TU/TURNSTEP/${name}.tar.gz";
|
||||
sha256 = "10s1dhpxxqfl421388l6gzfdm1gzxf5iah42i1w6yji9mgkz8hf8";
|
||||
sha256 = "03m9w1cd0yyrbqwkwcl92j1cpmasmm69f3hwvcrlfsi5fnwsk63y";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ fetchurl, buildPerlPackage, DBI, mysql }:
|
||||
|
||||
buildPerlPackage rec {
|
||||
name = "DBD-mysql-4.031";
|
||||
name = "DBD-mysql-4.033";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz";
|
||||
sha256 = "1lngnkfi71gcpfk93xhil2x9i3w3rqjpxlvn5n92jd5ikwry8bmf";
|
||||
sha256 = "0769xakykps0cx368g4vaips4w3bjk383rianiavq7sq6g6bp66c";
|
||||
};
|
||||
|
||||
buildInputs = [ mysql.lib ] ;
|
||||
|
||||
23
pkgs/development/perl-modules/dbix-class-fix-52leaks.patch
Normal file
23
pkgs/development/perl-modules/dbix-class-fix-52leaks.patch
Normal file
@@ -0,0 +1,23 @@
|
||||
From e9d552de92cde6552f35cd45a3572df1e25609cc Mon Sep 17 00:00:00 2001
|
||||
From: Peter Rabbitson <ribasushi@cpan.org>
|
||||
Date: Tue, 19 May 2015 05:49:48 +0200
|
||||
Subject: [PATCH] Make sure tests pass without a compiler present (another step
|
||||
to RT#74706)
|
||||
|
||||
--- a/t/52leaks.t
|
||||
+++ b/t/52leaks.t
|
||||
@@ -446,6 +446,14 @@ for my $addr (keys %$weak_registry) {
|
||||
delete $weak_registry->{$addr}
|
||||
unless $cleared->{hash_merge_singleton}{$weak_registry->{$addr}{weakref}{behavior}}++;
|
||||
}
|
||||
+ elsif ($names =~ /^B::Hooks::EndOfScope::PP::_TieHintHashFieldHash/m) {
|
||||
+ # there is one tied lexical which stays alive until GC time
|
||||
+ # https://metacpan.org/source/ETHER/B-Hooks-EndOfScope-0.15/lib/B/Hooks/EndOfScope/PP/FieldHash.pm#L24
|
||||
+ # simply ignore it here, instead of teaching the leaktracer to examine ties
|
||||
+ # the latter is possible yet terrible: https://github.com/dbsrgits/dbix-class/blob/v0.082820/t/lib/DBICTest/Util/LeakTracer.pm#L113-L117
|
||||
+ delete $weak_registry->{$addr}
|
||||
+ unless $cleared->{bheos_pptiehinthashfieldhash}++;
|
||||
+ }
|
||||
elsif ($names =~ /^DateTime::TimeZone::UTC/m) {
|
||||
# DT is going through a refactor it seems - let it leak zones for now
|
||||
delete $weak_registry->{$addr};
|
||||
@@ -1,52 +0,0 @@
|
||||
diff --git a/t/multi_create/standard.t b/t/multi_create/standard.t
|
||||
index 5a02947..6c1efd8 100644
|
||||
--- a/t/multi_create/standard.t
|
||||
+++ b/t/multi_create/standard.t
|
||||
@@ -444,7 +444,11 @@ throws_ok ( sub {
|
||||
#$t->cd($t->new_related('cd', { artist => undef } ) );
|
||||
#$t->{_rel_in_storage} = 0;
|
||||
$t->insert;
|
||||
-}, qr/cd.artist may not be NULL/, "Exception propogated properly");
|
||||
+}, qr/DBI Exception.+(?x:
|
||||
+ \QNOT NULL constraint failed: cd.artist\E
|
||||
+ |
|
||||
+ \Qcd.artist may not be NULL\E
|
||||
+)/s, "Exception propogated properly");
|
||||
|
||||
lives_ok ( sub {
|
||||
$schema->resultset('CD')->create ({
|
||||
diff --git a/t/relationship/update_or_create_multi.t b/t/relationship/update_or_create_multi.t
|
||||
index 8710048..c7cce7a 100644
|
||||
--- a/t/relationship/update_or_create_multi.t
|
||||
+++ b/t/relationship/update_or_create_multi.t
|
||||
@@ -69,7 +69,12 @@ throws_ok {
|
||||
year => 2020,
|
||||
title => 'the best thing since sliced bread',
|
||||
})
|
||||
-} qr/\Qcd.artist may not be NULL/, 'ambiguous find + create failed';
|
||||
+} qr/DBI Exception.+(?x:
|
||||
+ \QNOT NULL constraint failed: cd.artist\E
|
||||
+ |
|
||||
+ \Qcd.artist may not be NULL\E
|
||||
+)/s, 'ambiguous find + create failed'
|
||||
+;
|
||||
|
||||
# expect a create, after a failed search using *only* the
|
||||
# *current* relationship and the unique column constraints
|
||||
diff --git a/t/storage/error.t b/t/storage/error.t
|
||||
index d5980eb..61d6782 100644
|
||||
--- a/t/storage/error.t
|
||||
+++ b/t/storage/error.t
|
||||
@@ -15,7 +15,11 @@ warnings_are ( sub {
|
||||
sub {
|
||||
$schema->resultset('CD')->create({ title => 'vacation in antarctica' })
|
||||
},
|
||||
- qr/DBI Exception.+cd\.artist.+NULL/s
|
||||
+ qr/DBI Exception.+(?x:
|
||||
+ \QNOT NULL constraint failed: cd.artist\E
|
||||
+ |
|
||||
+ \Qcd.artist may not be NULL\E
|
||||
+ )/s
|
||||
); # as opposed to some other error
|
||||
}, [], 'No warnings besides exception' );
|
||||
|
||||
Reference in New Issue
Block a user