mongodb: 3.4.20 -> 3.4.22, 3.6.12 -> 3.6.13, 4.0.9 -> 4.0.11

This commit is contained in:
Nathan Smyth 2019-08-04 13:09:49 +10:00 committed by Maximilian Bosch
parent 97c4dff158
commit 165d8bda82
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
6 changed files with 61 additions and 35 deletions

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy, zlib
, libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security, python27, libtool
, curl }:
{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy, zlib,
libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security, python27, curl, CoreFoundation, cctools
}:
# Note:
# The command line tools are written in Go as part of a different package (mongodb-tools)
@ -35,20 +35,9 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ scons ];
buildInputs = [
sasl
boost
gperftools
pcre-cpp
snappy
zlib
libyamlcpp
sasl
openssl.dev
openssl.out
libpcap
python
curl
] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libtool ];
sasl boost gperftools pcre-cpp snappy
zlib libyamlcpp sasl openssl.dev openssl.out libpcap python curl
] ++ stdenv.lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ];
# MongoDB keeps track of its build parameters, which tricks nix into
# keeping dependencies to build inputs in the final output.
@ -60,6 +49,9 @@ in stdenv.mkDerivation rec {
substituteInPlace SConstruct \
--replace "env = Environment(" "env = Environment(ENV = os.environ,"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace src/third_party/asio-master/asio/include/asio/detail/config.hpp --replace ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW ASIO_HAS_STD_STRING_VIEW
substituteInPlace src/third_party/mozjs-45/extract/js/src/jsmath.cpp --replace 'defined(HAVE_SINCOS)' 0
substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder
substituteInPlace src/third_party/s2/s1interval.cc --replace drem remainder
@ -80,7 +72,7 @@ in stdenv.mkDerivation rec {
"--release"
"--ssl"
#"--rocksdb" # Don't have this packaged yet
"--wiredtiger=${if stdenv.is64bit then "on" else "off"}"
"--wiredtiger=on"
"--js-engine=mozjs"
"--use-sasl-client"
"--disable-warnings-as-errors"
@ -92,6 +84,10 @@ in stdenv.mkDerivation rec {
sconsFlags+=" CXX=$CXX"
'' + optionalString stdenv.isAarch64 ''
sconsFlags+=" CCFLAGS='-march=armv8-a+crc'"
'' + optionalString stdenv.isDarwin ''
sconsFlags+=" CPPPATH=${openssl.dev}/include"
'' + optionalString stdenv.isDarwin ''
sconsFlags+=" LIBPATH=${openssl.out}/lib"
'';
preInstall = ''

View File

@ -0,0 +1,27 @@
# HG changeset patch
# User Dan Gohman <sunfish@mozilla.com>
# Parent d9b405d82cffb07343a5f2fd941e029298c7f6c4
# Bug 1390214 - IonMonkey: Don't test for a 3-byte opcode in a 2-byte opcode predicate.
# https://bug1390214.bmoattachments.org/attachment.cgi?id=8902972
diff --git a/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h b/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h
--- a/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h
+++ b/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h
@@ -310,17 +310,16 @@ enum ThreeByteOpcodeID {
// Test whether the given opcode should be printed with its operands reversed.
inline bool IsXMMReversedOperands(TwoByteOpcodeID opcode)
{
switch (opcode) {
case OP2_MOVSD_WsdVsd: // also OP2_MOVPS_WpsVps
case OP2_MOVAPS_WsdVsd:
case OP2_MOVDQ_WdqVdq:
- case OP3_PEXTRD_EdVdqIb:
return true;
default:
break;
}
return false;
}
enum ThreeByteEscape {

View File

@ -1,11 +1,11 @@
{ stdenv, callPackage, lib, sasl, boost, Security }:
{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
let
buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; };
buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; inherit CoreFoundation; inherit cctools; };
in
buildMongoDB {
version = "3.4.20";
sha256 = "15avrhakbspz0q1w5n7dqzjjfkxi7md64a9axl97gfxi4ln7mhz0";
version = "3.4.22";
sha256 = "1rizrr69b26y7fb973n52hk387sf3mxzqg8wka4f3zdjdidfyiny";
patches = [
./forget-build-dependencies-3-4.patch
];

View File

@ -1,11 +1,11 @@
{ stdenv, callPackage, lib, sasl, boost, Security }:
{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
let
buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; };
buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; inherit CoreFoundation; inherit cctools; };
in
buildMongoDB {
version = "3.6.12";
sha256 = "1fi1ccid4rnfjg6yn3183qrhjqc8hz7jfgdpwp1dy6piw6z85n3l";
version = "3.6.13";
sha256 = "1mbvk4bmabrswjdm01jssxcygjpq5799zqyx901nsi12vlcymwg4";
patches = [
./forget-build-dependencies.patch
];

View File

@ -1,12 +1,13 @@
{ stdenv, callPackage, lib, sasl, boost, Security }:
{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
let
buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; };
buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; inherit CoreFoundation; inherit cctools; };
in
buildMongoDB {
version = "4.0.9";
sha256 = "0klm6dl1pr9wq4ghm2jjn3wzs1zpj1aabqjqjfddanxq2an7scph";
version = "4.0.11";
sha256 = "0kry8kzzpah0l7j8xa333y1ixwvarc28ip3f6lx5590yy11j8ry2";
patches = [
./forget-build-dependencies.patch
./mozjs-45_fix-3-byte-opcode.patch
];
}

View File

@ -15899,20 +15899,22 @@ in
mongodb-3_4 = callPackage ../servers/nosql/mongodb/v3_4.nix {
sasl = cyrus_sasl;
boost = boost160;
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
mongodb-3_6 = callPackage ../servers/nosql/mongodb/v3_6.nix {
sasl = cyrus_sasl;
boost = boost160;
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
mongodb-4_0 = callPackage ../servers/nosql/mongodb/v4_0.nix {
sasl = cyrus_sasl;
boost = boost160;
openssl = openssl_1_0_2;
inherit (darwin.apple_sdk.frameworks) Security;
boost = boost169;
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
nginx-sso = callPackage ../servers/nginx-sso { };