Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mongodb: 3.2.9 -> 3.4.1 #22050

Merged
merged 2 commits into from
Nov 1, 2017
Merged

mongodb: 3.2.9 -> 3.4.1 #22050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
107a11f
mongodb: 3.2.9 -> 3.4.2
Avaq Jan 20, 2017
a387a0f
mongodb: fix darwin build
LnL7 Nov 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions pkgs/servers/nosql/mongodb/default.nix
View file
Open in desktop
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";
Copy link
Member Author

@Avaq Avaq Jan 23, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Domain changed to fastdl because that's what I found on the MongoDB website.

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
View file
Open in desktop

This file was deleted.