diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-14 10:24:46 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-14 10:24:46 +0200 |
| commit | f0a4305e0a9d4170d9d4e1848e2a8c12960b908b (patch) | |
| tree | b29886c35d5fe0f60bb872738ad321b5a47b2225 /pkgs/development/perl-modules | |
| parent | fa9015f511c98c3e81b488ba222783378e6317bc (diff) | |
| parent | 8abe5ee07ee6b23fb014709f01bb161a62407a44 (diff) | |
| download | nixpkgs-f0a4305e0a9d4170d9d4e1848e2a8c12960b908b.tar nixpkgs-f0a4305e0a9d4170d9d4e1848e2a8c12960b908b.tar.gz nixpkgs-f0a4305e0a9d4170d9d4e1848e2a8c12960b908b.tar.bz2 nixpkgs-f0a4305e0a9d4170d9d4e1848e2a8c12960b908b.tar.lz nixpkgs-f0a4305e0a9d4170d9d4e1848e2a8c12960b908b.tar.xz nixpkgs-f0a4305e0a9d4170d9d4e1848e2a8c12960b908b.tar.zst nixpkgs-f0a4305e0a9d4170d9d4e1848e2a8c12960b908b.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/perl-modules')
| -rw-r--r-- | pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch | 10 | ||||
| -rw-r--r-- | pkgs/development/perl-modules/dbiclassx-fix.patch | 24 |
2 files changed, 0 insertions, 34 deletions
diff --git a/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch b/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch deleted file mode 100644 index 7b513f21a29..00000000000 --- a/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- File-Slurp-9999.19.orig/lib/File/Slurp.pm 2011-05-30 21:58:53.000000000 +0200 -+++ File-Slurp-9999.19/lib/File/Slurp.pm 2017-04-28 10:05:59.047681755 +0200 -@@ -4,6 +4,7 @@ - - use strict; - use warnings ; -+no warnings 'deprecated'; - - use Carp ; - use Exporter ; diff --git a/pkgs/development/perl-modules/dbiclassx-fix.patch b/pkgs/development/perl-modules/dbiclassx-fix.patch deleted file mode 100644 index a46ffaa7bd9..00000000000 --- a/pkgs/development/perl-modules/dbiclassx-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -From adcc1df0049e0093cb94c867bd2be8c9fe242a61 Mon Sep 17 00:00:00 2001 -From: Peter Rabbitson <ribasushi@cpan.org> -Date: Tue, 13 Sep 2016 17:15:48 +0200 -Subject: [PATCH] Fix for upcoming (not yet available via DBD::SQLite) - libsqlite version - ---- - Changes | 2 ++ - t/prefetch/grouped.t | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/t/prefetch/grouped.t b/t/prefetch/grouped.t -index 4aad6b1..c0d2224 100644 ---- a/t/prefetch/grouped.t -+++ b/t/prefetch/grouped.t -@@ -101,7 +101,7 @@ my @cdids = sort $cd_rs->get_column ('cdid')->all; - - # add an extra track to one of the cds, and then make sure we can get it on top - # (check if limit works) -- my $top_cd = $cd_rs->slice (1,1)->next; -+ my $top_cd = $cd_rs->search({}, { order_by => 'cdid' })->slice (1,1)->next; - $top_cd->create_related ('tracks', { - title => 'over the top', - }); |