diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-05 13:11:16 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-05 13:45:59 +0200 |
| commit | d94c072f8ed20045015fd80cc10ad8ac64a35dc7 (patch) | |
| tree | d1a10500054988b24ea31bdbec83ec20ceec4c90 | |
| parent | 0aa75206705afc71b991cceeede644c87088d583 (diff) | |
| download | nixpkgs-d94c072f8ed20045015fd80cc10ad8ac64a35dc7.tar nixpkgs-d94c072f8ed20045015fd80cc10ad8ac64a35dc7.tar.gz nixpkgs-d94c072f8ed20045015fd80cc10ad8ac64a35dc7.tar.bz2 nixpkgs-d94c072f8ed20045015fd80cc10ad8ac64a35dc7.tar.lz nixpkgs-d94c072f8ed20045015fd80cc10ad8ac64a35dc7.tar.xz nixpkgs-d94c072f8ed20045015fd80cc10ad8ac64a35dc7.tar.zst nixpkgs-d94c072f8ed20045015fd80cc10ad8ac64a35dc7.zip | |
DBD::SQLite: 1.48 -> 1.50
| -rw-r--r-- | pkgs/development/perl-modules/DBD-SQLite/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 14 |
2 files changed, 4 insertions, 16 deletions
diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index 897e82c68e1..bf3089ebfb9 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildPerlPackage, DBI, sqlite }: buildPerlPackage rec { - name = "DBD-SQLite-1.48"; + name = "DBD-SQLite-1.50"; src = fetchurl { url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz"; - sha256 = "19hf0fc4dlnpmxsxx3jjbh2z6d2jafgdlqhwz4irkp2cbl7j75xk"; + sha256 = "1qcw2nzla03ywrl6mx1qklvbc8n5bn4gxqbjnvadfkwlffmi7i9s"; }; propagatedBuildInputs = [ DBI ]; @@ -37,7 +37,7 @@ buildPerlPackage rec { # 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; meta.platforms = stdenv.lib.platforms.unix; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 695f91a0230..5934e0dd681 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3544,19 +3544,7 @@ let self = _self // overrides; _self = with self; { DBDSQLite = import ../development/perl-modules/DBD-SQLite { inherit stdenv fetchurl buildPerlPackage DBI; - # inherit (pkgs) sqlite; - - # Workaround to address DBIxClass test failure. - # https://rt.cpan.org/Public/Bug/Display.html?id=117271#txn-1662798 - # https://github.com/NixOS/nixpkgs/pull/18083#issuecomment-243408430 - sqlite = pkgs.sqlite.overrideDerivation (_: { - name = "sqlite-3.13.0"; - - src = fetchurl { - url = "http://sqlite.org/2016/sqlite-autoconf-3130000.tar.gz"; - sha256 = "0sq88jbwsk48i41f7m7rkw9xvijq011nsbs7pl49s31inck70yg2"; - }; - }); + inherit (pkgs) sqlite; }; DBDmysql = import ../development/perl-modules/DBD-mysql { |