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

perl-DBD-SQLite: 1.50 -> 1.54

Browse Source 
- This fixes tests after sqlite update, also tested via nixStable
  and via building some other perl reverse dependencies.
- The patch was conflicting due to upstream changes,
  but those changes allowed us to minimize the patch.
- meta from nix-generate-from-cpan
/cc #30927.
This commit is contained in:
Vladimír Čunát 2017-10-31 11:25:56 +01:00
parent dc1ef6ce8c
commit 5618691751
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/perl-modules/DBD-SQLite/default.nix
View File

@ -1,25 +1,24 @@
{ stdenv, fetchurl, buildPerlPackage, DBI, sqlite }: { stdenv, fetchurl, buildPerlPackage, DBI, sqlite }:
buildPerlPackage rec { buildPerlPackage rec {
name = "DBD-SQLite-1.50"; name = "DBD-SQLite-${version}";
version = "1.54";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz"; url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz";
sha256 = "1qcw2nzla03ywrl6mx1qklvbc8n5bn4gxqbjnvadfkwlffmi7i9s"; sha256 = "3929a6dbd8d71630f0cb57f85dcef9588cd7ac4c9fa12db79df77b9d3a4d7269";
}; };
propagatedBuildInputs = [ DBI ]; propagatedBuildInputs = [ DBI ];
buildInputs = [ sqlite ];
makeMakerFlags = "SQLITE_LOCATION=${sqlite.dev}";
patches = [ patches = [
# Support building against our own sqlite. # Support building against our own sqlite.
./external-sqlite.patch ./external-sqlite.patch
]; ];
sqlite_dev = sqlite.dev; SQLITE_INC = sqlite.dev + "/include";
sqlite_out = sqlite.out; SQLITE_LIB = sqlite.out + "/lib";
postPatch = "substituteAllInPlace Makefile.PL; cat Makefile.PL";
preBuild = preBuild =
'' ''
@ -39,5 +38,9 @@ buildPerlPackage rec {
# (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t"). # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t").
#doCheck = false; #doCheck = false;
meta.platforms = stdenv.lib.platforms.unix; meta = with stdenv.lib; {
description = "Self Contained SQLite RDBMS in a DBI Driver";
license = with licenses; [ artistic1 gpl1Plus ];
platforms = platforms.unix;
};
} }

36
pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch
View File

@ -1,33 +1,11 @@
diff --git a/Makefile.PL b/Makefile.PL --- a/Makefile.PL 2016-04-21 15:44:34.000000000 +0200
index 606b28d..0cea060 100644 +++ b/Makefile.PL 2017-10-31 11:04:28.389959946 +0100
--- a/Makefile.PL @@ -129,7 +129,7 @@
+++ b/Makefile.PL
@@ -128,24 +128,10 @@ SCOPE: {
# the system SQLite. We expect that anyone sophisticated enough to use
# a system sqlite is also sophisticated enough to have a patching system # a system sqlite is also sophisticated enough to have a patching system
# that can change the if ( 0 ) to if ( 1 ) # that can change the if ( 0 ) to if ( 1 )
-my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc); my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
-if ( 0 ) { -if ( 0 ) {
- require File::Spec;
- if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
- $sqlite_base =~ /=(.*)/;
- $sqlite_base = $1;
- $sqlite_lib = File::Spec->catdir( $sqlite_base, 'lib' );
- $sqlite_inc = File::Spec->catdir( $sqlite_base, 'include' );
- }
- if ( $sqlite_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0] ) {
- $sqlite_local =~ /=(.*)/;
- $sqlite_local = "$1" ? 1 : 0;
- if ( $sqlite_local ) {
- # Keep these from making into CFLAGS/LDFLAGS
- undef $sqlite_lib;
- undef $sqlite_inc;
- }
- }
+my ($sqlite_local, $sqlite_lib, $sqlite_inc);
+if ( 1 ) { +if ( 1 ) {
+ $sqlite_lib = '@sqlite_out@/lib'; require File::Spec;
+ $sqlite_inc = '@sqlite_dev@/include'; if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
$sqlite_base =~ /=(.*)/;
# Now check for a compatible sqlite3
unless ( $sqlite_local ) {