diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-04 14:23:41 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-04 14:23:41 +0000 |
commit | 0348f11e22b9575873d831cbc3a9bdcc08adbb33 (patch) | |
tree | d83a81a66867bc48f9aef690a2b1308f4ab7cb13 | |
parent | 25db5f1a9d49666486b49014d1eb7d9325172545 (diff) | |
download | nixlib-0348f11e22b9575873d831cbc3a9bdcc08adbb33.tar nixlib-0348f11e22b9575873d831cbc3a9bdcc08adbb33.tar.gz nixlib-0348f11e22b9575873d831cbc3a9bdcc08adbb33.tar.bz2 nixlib-0348f11e22b9575873d831cbc3a9bdcc08adbb33.tar.lz nixlib-0348f11e22b9575873d831cbc3a9bdcc08adbb33.tar.xz nixlib-0348f11e22b9575873d831cbc3a9bdcc08adbb33.tar.zst nixlib-0348f11e22b9575873d831cbc3a9bdcc08adbb33.zip |
* DBD::SQLite updated to 1.35.
svn path=/nixpkgs/trunk/; revision=31277
-rw-r--r-- | pkgs/development/perl-modules/DBD-SQLite/default.nix | 6 | ||||
-rw-r--r-- | 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 b37dd422ee61..8e1faf900a06 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 8b5912318204..421c03ea0af1 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 { |