From 0348f11e22b9575873d831cbc3a9bdcc08adbb33 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Jan 2012 14:23:41 +0000
Subject: [PATCH] * DBD::SQLite updated to 1.35.

svn path=/nixpkgs/trunk/; revision=31277
---
 pkgs/development/perl-modules/DBD-SQLite/default.nix |  6 +++---
 pkgs/top-level/perl-packages.nix                     | 10 +---------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix
index b37dd422ee6..8e1faf900a0 100644
--- a/pkgs/development/perl-modules/DBD-SQLite/default.nix
+++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix
@@ -1,14 +1,14 @@
 {fetchurl, buildPerlPackage, DBI, sqlite}:
 
 buildPerlPackage rec {
-  name = "DBD-SQLite-1.31";
+  name = "DBD-SQLite-1.35";
   
   src = fetchurl {
     url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
-    sha256 = "1xi9bfxfndb4kajixc1y7rrz2sjjv2z7vcm5msrxznx3vr358zlq";
+    sha256 = "0zdwnj0jmkaqb2grkh451g1jc8nsdy4sf6lhn8xd0my0a3pd227z";
   };
   
-  propagatedBuildInputs = [DBI];
+  propagatedBuildInputs = [ DBI ];
   
   makeMakerFlags = "SQLITE_LOCATION=${sqlite}";
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8b591231820..421c03ea0af 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1101,15 +1101,7 @@ rec {
 
   DBDSQLite = import ../development/perl-modules/DBD-SQLite {
     inherit fetchurl buildPerlPackage DBI;
-
-    # sqlite-3.7.9 breaks DBDSQLite, overriding locally for now
-    sqlite = pkgs.lib.overrideDerivation pkgs.sqlite (args: {
-      name = "sqlite-3.7.7.1";
-      src = fetchurl {
-        url = http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz;
-        sha256 = "1pvf72gb6yidc4zjml3k6kwhlvvhbgmbm8hfin9y5jvvbyr3dk3x";
-      };
-    });
+    inherit (pkgs) sqlite;
   };
 
   DBDmysql = import ../development/perl-modules/DBD-mysql {