public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* nixSqlite: bump. Also, go back to using SQLite 3.7 because 3.6 also

Browse Source 
gives random "database image is malformed" errors.

svn path=/nixpkgs/trunk/; revision=25050
This commit is contained in:
Eelco Dolstra 2010-12-10 10:22:23 +00:00
parent 5b9427a829
commit 97d4a54698
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/package-management/nix/sqlite.nix
View File

@ -5,11 +5,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nix-1.0pre25024"; name = "nix-1.0pre25036";
src = fetchurl { src = fetchurl {
url = "http://hydra.nixos.org/build/786470/download/4/${name}.tar.bz2"; url = "http://hydra.nixos.org/build/787041/download/4/${name}.tar.bz2";
sha256 = "35962fcca9b69db7103331a595524443d6403a9a9121bddef4421601b2473528"; sha256 = "ccba5f44b75801187b766d4b98a53bccf335df35cde32aeab71630bfca7882f6";
}; };
buildInputs = [ perl curl openssl pkgconfig boehmgc ]; buildInputs = [ perl curl openssl pkgconfig boehmgc ];

1
pkgs/top-level/all-packages.nix
View File

@ -7205,7 +7205,6 @@ let
nixSqlite = lowPrio (callPackage ../tools/package-management/nix/sqlite.nix { nixSqlite = lowPrio (callPackage ../tools/package-management/nix/sqlite.nix {
storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
sqlite = sqlite36;
}); });
nixCustomFun = src: preConfigure: enableScripts: configureFlags: nixCustomFun = src: preConfigure: enableScripts: configureFlags: