mongodb: upgrade to 2.4.0

This commit is contained in:
Mathijs Kwik 2013-03-22 21:23:25 +01:00
parent 9f7aef51ea
commit b1200f1a28
2 changed files with 7 additions and 10 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, scons, which, v8, useV8 ? false}:
{ stdenv, fetchurl, scons, which, v8}:
with stdenv.lib;
@ -9,11 +9,11 @@ let installerPatch = fetchurl {
in
stdenv.mkDerivation rec {
name = "mongodb-2.2.0";
name = "mongodb-2.4.0";
src = fetchurl {
url = http://downloads.mongodb.org/src/mongodb-src-r2.2.0.tar.gz;
sha256 = "12v0cpq9j2gmagr9pbw08karqwqgl4j9r223w7x7sx5cfvj2cih8";
url = http://downloads.mongodb.org/src/mongodb-src-r2.4.0.tar.gz;
sha256 = "115wrw23naxpaiwh8ar6g40f2nsdbz1hdpkp88wbi5yc9m6drg41";
};
nativeBuildInputs = [ scons which ];
@ -24,18 +24,17 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace SConstruct --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR"
'' + optionalString useV8 ''
substituteInPlace SConstruct --replace "#/../v8" "${v8}" \
--replace "[\"${v8}/\"]" "[\"${v8}/lib\"]"
'';
buildPhase = ''
echo $PATH
scons all --cc=`which gcc` --cxx=`which g++` ${optionalString useV8 "--usev8"}
scons all --cc=`which gcc` --cxx=`which g++`
'';
installPhase = ''
scons install --cc=`which gcc` --cxx=`which g++` ${optionalString useV8 "--usev8"} --full --prefix=$out
scons install --cc=`which gcc` --cxx=`which g++` --full --prefix=$out
rm -rf $out/lib64 # exact same files as installed in $out/lib
'';

View File

@ -5464,9 +5464,7 @@ let
#monetdb = callPackage ../servers/sql/monetdb { };
mongodb = callPackage ../servers/nosql/mongodb {
useV8 = (config.mongodb.useV8 or false);
};
mongodb = callPackage ../servers/nosql/mongodb { };
mysql4 = import ../servers/sql/mysql {
inherit fetchurl stdenv ncurses zlib perl;