git.iko.soy/typeable/nixpkgs
on master help sign in
mongodb: 3.4.20 -> 3.4.22, 3.6.12 -> 3.6.13, 4.0.9 -> 4.0.11
commit165d8bda8265ca9c247d1ab5e1137117c3236e25 authorNathan Smyth <nathan.smyth@mongodb.com> dateSun 4 Aug 2019, 13:09 (7 years ago) parent97c4dff
6 files changed+61−35
pkgs/servers/nosql/mongodb/mongodb.nix+14−18 pkgs/servers/nosql/mongodb/mozjs-45_fix-3-byte-opcode.patch+27 pkgs/servers/nosql/mongodb/v3_4.nix+4−4 pkgs/servers/nosql/mongodb/v3_6.nix+4−4 pkgs/servers/nosql/mongodb/v4_0.nix+5−4 pkgs/top-level/all-packages.nix+7−5
pkgs/servers/nosql/mongodb/mongodb.nix+14−18
@@ -1,6 +1,6 @@
1−{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy, zlib
2−, libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security, python27, libtool
3−, curl }:
1+{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy, zlib,
2+ libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security, python27, curl, CoreFoundation, cctools
3+}:
44
55# Note:
66# The command line tools are written in Go as part of a different package (mongodb-tools)
@@ -35,20 +35,9 @@ in stdenv.mkDerivation rec {
3535
3636 nativeBuildInputs = [ scons ];
3737 buildInputs = [
38− sasl
39− boost
40− gperftools
41− pcre-cpp
42− snappy
43− zlib
44− libyamlcpp
45− sasl
46− openssl.dev
47− openssl.out
48− libpcap
49− python
50− curl
51− ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libtool ];
38+ sasl boost gperftools pcre-cpp snappy
39+ zlib libyamlcpp sasl openssl.dev openssl.out libpcap python curl
40+ ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ];
5241
5342 # MongoDB keeps track of its build parameters, which tricks nix into
5443 # keeping dependencies to build inputs in the final output.
@@ -60,6 +49,9 @@ in stdenv.mkDerivation rec {
6049 substituteInPlace SConstruct \
6150 --replace "env = Environment(" "env = Environment(ENV = os.environ,"
6251 '' + stdenv.lib.optionalString stdenv.isDarwin ''
52+ substituteInPlace src/third_party/asio-master/asio/include/asio/detail/config.hpp --replace ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW ASIO_HAS_STD_STRING_VIEW
53+
54+ substituteInPlace src/third_party/mozjs-45/extract/js/src/jsmath.cpp --replace 'defined(HAVE_SINCOS)' 0
6355
6456 substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder
6557 substituteInPlace src/third_party/s2/s1interval.cc --replace drem remainder
@@ -80,7 +72,7 @@ in stdenv.mkDerivation rec {
8072 "--release"
8173 "--ssl"
8274 #"--rocksdb" # Don't have this packaged yet
83− "--wiredtiger=${if stdenv.is64bit then "on" else "off"}"
75+ "--wiredtiger=on"
8476 "--js-engine=mozjs"
8577 "--use-sasl-client"
8678 "--disable-warnings-as-errors"
@@ -92,6 +84,10 @@ in stdenv.mkDerivation rec {
9284 sconsFlags+=" CXX=$CXX"
9385 '' + optionalString stdenv.isAarch64 ''
9486 sconsFlags+=" CCFLAGS='-march=armv8-a+crc'"
87+ '' + optionalString stdenv.isDarwin ''
88+ sconsFlags+=" CPPPATH=${openssl.dev}/include"
89+ '' + optionalString stdenv.isDarwin ''
90+ sconsFlags+=" LIBPATH=${openssl.out}/lib"
9591 '';
9692
9793 preInstall = ''
pkgs/servers/nosql/mongodb/mozjs-45_fix-3-byte-opcode.patchnew file+27
@@ -0,0 +1,27 @@
1+# HG changeset patch
2+# User Dan Gohman <sunfish@mozilla.com>
3+# Parent d9b405d82cffb07343a5f2fd941e029298c7f6c4
4+# Bug 1390214 - IonMonkey: Don't test for a 3-byte opcode in a 2-byte opcode predicate.
5+# https://bug1390214.bmoattachments.org/attachment.cgi?id=8902972
6+
7+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
8+--- a/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h
9++++ b/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h
10+@@ -310,17 +310,16 @@ enum ThreeByteOpcodeID {
11+
12+ // Test whether the given opcode should be printed with its operands reversed.
13+ inline bool IsXMMReversedOperands(TwoByteOpcodeID opcode)
14+ {
15+ switch (opcode) {
16+ case OP2_MOVSD_WsdVsd: // also OP2_MOVPS_WpsVps
17+ case OP2_MOVAPS_WsdVsd:
18+ case OP2_MOVDQ_WdqVdq:
19+- case OP3_PEXTRD_EdVdqIb:
20+ return true;
21+ default:
22+ break;
23+ }
24+ return false;
25+ }
26+
27+ enum ThreeByteEscape {
pkgs/servers/nosql/mongodb/v3_4.nix+4−4
@@ -1,11 +1,11 @@
1−{ stdenv, callPackage, lib, sasl, boost, Security }:
1+{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
22
33let
4− buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; };
4+ buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; inherit CoreFoundation; inherit cctools; };
55in
66 buildMongoDB {
7− version = "3.4.20";
8− sha256 = "15avrhakbspz0q1w5n7dqzjjfkxi7md64a9axl97gfxi4ln7mhz0";
7+ version = "3.4.22";
8+ sha256 = "1rizrr69b26y7fb973n52hk387sf3mxzqg8wka4f3zdjdidfyiny";
99 patches = [
1010 ./forget-build-dependencies-3-4.patch
1111 ];
pkgs/servers/nosql/mongodb/v3_6.nix+4−4
@@ -1,11 +1,11 @@
1−{ stdenv, callPackage, lib, sasl, boost, Security }:
1+{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
22
33let
4− buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; };
4+ buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; inherit CoreFoundation; inherit cctools; };
55in
66 buildMongoDB {
7− version = "3.6.12";
8− sha256 = "1fi1ccid4rnfjg6yn3183qrhjqc8hz7jfgdpwp1dy6piw6z85n3l";
7+ version = "3.6.13";
8+ sha256 = "1mbvk4bmabrswjdm01jssxcygjpq5799zqyx901nsi12vlcymwg4";
99 patches = [
1010 ./forget-build-dependencies.patch
1111 ];
pkgs/servers/nosql/mongodb/v4_0.nix+5−4
@@ -1,12 +1,13 @@
1−{ stdenv, callPackage, lib, sasl, boost, Security }:
1+{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
22
33let
4− buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; };
4+ buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; inherit CoreFoundation; inherit cctools; };
55in
66 buildMongoDB {
7− version = "4.0.9";
8− sha256 = "0klm6dl1pr9wq4ghm2jjn3wzs1zpj1aabqjqjfddanxq2an7scph";
7+ version = "4.0.11";
8+ sha256 = "0kry8kzzpah0l7j8xa333y1ixwvarc28ip3f6lx5590yy11j8ry2";
99 patches = [
1010 ./forget-build-dependencies.patch
11+ ./mozjs-45_fix-3-byte-opcode.patch
1112 ];
1213 }
pkgs/top-level/all-packages.nix+7−5
@@ -15899,20 +15899,22 @@ in
1589915899 mongodb-3_4 = callPackage ../servers/nosql/mongodb/v3_4.nix {
1590015900 sasl = cyrus_sasl;
1590115901 boost = boost160;
15902− inherit (darwin.apple_sdk.frameworks) Security;
15902+ inherit (darwin) cctools;
15903+ inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
1590315904 };
1590415905
1590515906 mongodb-3_6 = callPackage ../servers/nosql/mongodb/v3_6.nix {
1590615907 sasl = cyrus_sasl;
1590715908 boost = boost160;
15908− inherit (darwin.apple_sdk.frameworks) Security;
15909+ inherit (darwin) cctools;
15910+ inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
1590915911 };
1591015912
1591115913 mongodb-4_0 = callPackage ../servers/nosql/mongodb/v4_0.nix {
1591215914 sasl = cyrus_sasl;
15913− boost = boost160;
15914− openssl = openssl_1_0_2;
15915− inherit (darwin.apple_sdk.frameworks) Security;
15915+ boost = boost169;
15916+ inherit (darwin) cctools;
15917+ inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
1591615918 };
1591715919
1591815920 nginx-sso = callPackage ../servers/nginx-sso { };