swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

mongodb: 3.2.9 -> 3.4.2

Browse source
This commit is contained in:
Avaq 2017-01-20 18:26:11 +01:00 committed by Daiderd Jordan
parent 737b466031
commit 107a11f573
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 3 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/servers/nosql/mongodb/default.nix
View file

@ -7,7 +7,7 @@
with stdenv.lib;
let version = "3.2.9";
let version = "3.4.2";
system-libraries = [
"pcre"
#"asio" -- XXX use package?
@ -43,8 +43,8 @@ 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 ];
@ -52,12 +52,6 @@ in stdenv.mkDerivation rec {
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.

25
pkgs/servers/nosql/mongodb/valgrind-include.patch
View file

@ -1,25 +0,0 @@
diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript
index 6add602..6e232d8 100644
--- a/src/mongo/util/SConscript
+++ b/src/mongo/util/SConscript
@@ -241,9 +241,6 @@ if get_option('allocator') == 'tcmalloc':
# Add in the include path for our vendored tcmalloc.
tcmspEnv.InjectThirdPartyIncludePaths('gperftools')
- # Include valgrind since tcmalloc disables itself while running under valgrind
- tcmspEnv.InjectThirdPartyIncludePaths('valgrind')
-
# If our changes to tcmalloc are ever upstreamed, this should become set based on a top
# level configure check, though its effects should still be scoped just to these files.
tcmspEnv.Append(
@@ -252,6 +249,10 @@ if get_option('allocator') == 'tcmalloc':
]
)
+ # Include valgrind since tcmalloc disables itself while running under valgrind
+ if not use_system_version_of_library('valgrind'):
+ tcmspEnv.InjectThirdPartyIncludePaths('valgrind')
+
tcmspEnv.Library(
target='tcmalloc_set_parameter',
source=[