git.iko.soy/typeable/nixpkgs
on master help sign in
mongodb-4_0: 4.0.11 -> 4.0.12
commitde69821b541a6143c7b5d31afe463ab3c2cf918b authorNathan Smyth <nathan.smyth@mongodb.com> dateWed 21 Aug 2019, 19:33 (7 years ago) parent44641ed
4 files changed+26−6
pkgs/servers/nosql/mongodb/asio-no-experimental-string-view.patch+20 pkgs/servers/nosql/mongodb/mongodb.nix−2 pkgs/servers/nosql/mongodb/v3_6.nix+2−1 pkgs/servers/nosql/mongodb/v4_0.nix+4−3
pkgs/servers/nosql/mongodb/asio-no-experimental-string-view.patchnew file+20
@@ -0,0 +1,20 @@
1+diff --git a/src/third_party/asio-master/asio/include/asio/detail/config.hpp b/src/third_party/asio-master/asio/include/asio/detail/config.hpp
2+index 7fe6a95a..ff4cc56b 100644
3+--- a/src/third_party/asio-master/asio/include/asio/detail/config.hpp
4++++ b/src/third_party/asio-master/asio/include/asio/detail/config.hpp
5+@@ -786,7 +786,6 @@
6+ # if (__cplusplus >= 201402)
7+ # if __has_include(<experimental/string_view>)
8+ # define ASIO_HAS_STD_STRING_VIEW 1
9+-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
10+ # endif // __has_include(<experimental/string_view>)
11+ # endif // (__cplusplus >= 201402)
12+ # endif // defined(__clang__)
13+@@ -794,7 +793,6 @@
14+ # if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
15+ # if (__cplusplus >= 201402)
16+ # define ASIO_HAS_STD_STRING_VIEW 1
17+-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
18+ # endif // (__cplusplus >= 201402)
19+ # endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)
20+ # endif // defined(__GNUC__)
pkgs/servers/nosql/mongodb/mongodb.nix−2
@@ -58,8 +58,6 @@ in stdenv.mkDerivation rec {
5858 substituteInPlace SConstruct \
5959 --replace "env = Environment(" "env = Environment(ENV = os.environ,"
6060 '' + stdenv.lib.optionalString stdenv.isDarwin ''
61− substituteInPlace src/third_party/asio-master/asio/include/asio/detail/config.hpp --replace ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW ASIO_HAS_STD_STRING_VIEW
62−
6361 substituteInPlace src/third_party/mozjs-45/extract/js/src/jsmath.cpp --replace 'defined(HAVE_SINCOS)' 0
6462
6563 substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder
pkgs/servers/nosql/mongodb/v3_6.nix+2−1
@@ -11,5 +11,6 @@ let
1111in buildMongoDB {
1212 version = "3.6.13";
1313 sha256 = "1mbvk4bmabrswjdm01jssxcygjpq5799zqyx901nsi12vlcymwg4";
14− patches = [ ./forget-build-dependencies.patch ];
14+ patches = [ ./forget-build-dependencies.patch ]
15+ ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ];
1516}
pkgs/servers/nosql/mongodb/v4_0.nix+4−3
@@ -9,8 +9,9 @@ let
99 inherit cctools;
1010 };
1111in buildMongoDB {
12− version = "4.0.11";
13− sha256 = "0kry8kzzpah0l7j8xa333y1ixwvarc28ip3f6lx5590yy11j8ry2";
12+ version = "4.0.12";
13+ sha256 = "1j8dqa4jr623y87jrdanyib9r7x18srrvdx952q4azcc8zrdwci1";
1414 patches =
15− [ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ];
15+ [ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ]
16+ ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ];
1617}