about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-04-11 09:11:36 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-04-11 09:11:36 +0000
commit9e26da96e501e255119eae558d099c10f933cc27 (patch)
tree6ad815133c5a81991ffe3bb5de488444b4ef631c
parentebdd3924092aefcf4e0a81d714629441e6bea72a (diff)
downloadnixlib-9e26da96e501e255119eae558d099c10f933cc27.tar
nixlib-9e26da96e501e255119eae558d099c10f933cc27.tar.gz
nixlib-9e26da96e501e255119eae558d099c10f933cc27.tar.bz2
nixlib-9e26da96e501e255119eae558d099c10f933cc27.tar.lz
nixlib-9e26da96e501e255119eae558d099c10f933cc27.tar.xz
nixlib-9e26da96e501e255119eae558d099c10f933cc27.tar.zst
nixlib-9e26da96e501e255119eae558d099c10f933cc27.zip
* Update DBI and DBD::SQLite.
svn path=/nixpkgs/trunk/; revision=26775
-rw-r--r--pkgs/development/perl-modules/DBD-SQLite/default.nix9
-rw-r--r--pkgs/top-level/perl-packages.nix6
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix
index 22348709a8a0..b37dd422ee61 100644
--- a/pkgs/development/perl-modules/DBD-SQLite/default.nix
+++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix
@@ -1,11 +1,11 @@
 {fetchurl, buildPerlPackage, DBI, sqlite}:
 
 buildPerlPackage rec {
-  name = "DBD-SQLite-1.29";
+  name = "DBD-SQLite-1.31";
   
   src = fetchurl {
     url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
-    sha256 = "0rq8f9avaxqbnjq2zpd2knz2wsn8qiffnbbphp7a3bakwhlxbl2i";
+    sha256 = "1xi9bfxfndb4kajixc1y7rrz2sjjv2z7vcm5msrxznx3vr358zlq";
   };
   
   propagatedBuildInputs = [DBI];
@@ -17,7 +17,10 @@ buildPerlPackage rec {
     ./external-sqlite.patch
   ];
 
+  # Prevent warnings from `strip'.
+  postInstall = "chmod -R u+w $out";
+
   # Disabled because the tests can randomly fail due to timeouts
   # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t").
-  #doCheck = false;
+  doCheck = false;
 }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 29ca541ecb7d..b33a6e8e805c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -947,7 +947,7 @@ rec {
 
   DBDSQLite = import ../development/perl-modules/DBD-SQLite {
     inherit fetchurl buildPerlPackage DBI;
-    sqlite = pkgs.sqlite36;
+    inherit (pkgs) sqlite;
   };
 
   DBDmysql = import ../development/perl-modules/DBD-mysql {
@@ -966,10 +966,10 @@ rec {
   };
 
   DBI = buildPerlPackage rec {
-    name = "DBI-1.609";
+    name = "DBI-1.616";
     src = fetchurl {
       url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz";
-      sha256 = "0hfnd8i696x01a52v6vx97bdwaymai7m0gyr2w64lrsyws7ni6wv";
+      sha256 = "0m6hk66xprjl314d5c665hnd1vch9a0b9y6ywvmf04kdqj33kkk0";
     };
   };