From b1200f1a28d9a96dac4476afa1f29b23f8e64aa9 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik <mathijs@bluescreen303.nl> Date: Fri, 22 Mar 2013 21:23:25 +0100 Subject: [PATCH] mongodb: upgrade to 2.4.0 --- pkgs/servers/nosql/mongodb/default.nix | 13 ++++++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 345234ba25e8..d99cff6b667b 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -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 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39fdc0a2f348..aff1585c768b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;