From 97d4a54698a4dea4b57ec4124591d75a740ee44e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Dec 2010 10:22:23 +0000 Subject: [PATCH] * nixSqlite: bump. Also, go back to using SQLite 3.7 because 3.6 also gives random "database image is malformed" errors. svn path=/nixpkgs/trunk/; revision=25050 --- pkgs/tools/package-management/nix/sqlite.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix index c1c051a82bb..0a69564c539 100644 --- a/pkgs/tools/package-management/nix/sqlite.nix +++ b/pkgs/tools/package-management/nix/sqlite.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre25024"; + name = "nix-1.0pre25036"; src = fetchurl { - url = "http://hydra.nixos.org/build/786470/download/4/${name}.tar.bz2"; - sha256 = "35962fcca9b69db7103331a595524443d6403a9a9121bddef4421601b2473528"; + url = "http://hydra.nixos.org/build/787041/download/4/${name}.tar.bz2"; + sha256 = "ccba5f44b75801187b766d4b98a53bccf335df35cde32aeab71630bfca7882f6"; }; buildInputs = [ perl curl openssl pkgconfig boehmgc ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77a45b665f4..43993e3e093 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7205,7 +7205,6 @@ let nixSqlite = lowPrio (callPackage ../tools/package-management/nix/sqlite.nix { storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; - sqlite = sqlite36; }); nixCustomFun = src: preConfigure: enableScripts: configureFlags: