Skip to content

Commit

Permalink
Merge pull request #22050 from Avaq/update-mongodb
Browse files Browse the repository at this point in the history
mongodb: 3.2.9 -> 3.4.1
  • Loading branch information
LnL7 authored Nov 1, 2017
2 parents 33cdc2b + a387a0f commit c8dd4e7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 34 deletions.
14 changes: 5 additions & 9 deletions pkgs/servers/nosql/mongodb/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

with stdenv.lib;

let version = "3.2.9";
let version = "3.4.2";
system-libraries = [
"pcre"
#"asio" -- XXX use package?
Expand Down Expand Up @@ -43,21 +43,15 @@ in stdenv.mkDerivation rec {
name = "mongodb-${version}";

src = fetchurl {
url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
sha256 = "06q6j2bjy31pjwqws53wdpmn2x8w2hafzsnv1s3wx15pc9vq3y15";
url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz";
sha256 = "0n8vspccrpd2z9xk3yjpz4gprd730dfacw914ksjzz9iadn0zdi9";
};

nativeBuildInputs = [ scons ];
inherit buildInputs;

patches =
[
# When not building with the system valgrind, the build should use the
# vendored header file - regardless of whether or not we're using the system
# tcmalloc - so we need to lift the include path manipulation out of the
# conditional.
./valgrind-include.patch

# MongoDB keeps track of its build parameters, which tricks nix into
# keeping dependencies to build inputs in the final output.
# We remove the build flags from buildInfo data.
Expand Down Expand Up @@ -87,6 +81,8 @@ in stdenv.mkDerivation rec {
--replace 'engine("wiredTiger")' 'engine("mmapv1")'
'';

NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unused-command-line-argument";

buildPhase = ''
scons -j $NIX_BUILD_CORES core --release ${other-args}
'';
Expand Down
25 changes: 0 additions & 25 deletions pkgs/servers/nosql/mongodb/valgrind-include.patch

This file was deleted.

0 comments on commit c8dd4e7

Please sign in to comment.