diff options
author | Nathan Smyth <nathan.smyth@mongodb.com> | 2019-08-21 19:33:51 +1000 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-03-26 14:02:49 +0100 |
commit | de69821b541a6143c7b5d31afe463ab3c2cf918b (patch) | |
tree | d0b349a5aa60ff42c5a2fc99ca61a13e63bfc118 /pkgs/servers/nosql | |
parent | 44641ed00bf3b1d5914a685137f16910f6454951 (diff) | |
download | nixpkgs-de69821b541a6143c7b5d31afe463ab3c2cf918b.tar nixpkgs-de69821b541a6143c7b5d31afe463ab3c2cf918b.tar.gz nixpkgs-de69821b541a6143c7b5d31afe463ab3c2cf918b.tar.bz2 nixpkgs-de69821b541a6143c7b5d31afe463ab3c2cf918b.tar.lz nixpkgs-de69821b541a6143c7b5d31afe463ab3c2cf918b.tar.xz nixpkgs-de69821b541a6143c7b5d31afe463ab3c2cf918b.tar.zst nixpkgs-de69821b541a6143c7b5d31afe463ab3c2cf918b.zip |
mongodb-4_0: 4.0.11 -> 4.0.12
Diffstat (limited to 'pkgs/servers/nosql')
-rw-r--r-- | pkgs/servers/nosql/mongodb/asio-no-experimental-string-view.patch | 20 | ||||
-rw-r--r-- | pkgs/servers/nosql/mongodb/mongodb.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/nosql/mongodb/v3_6.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/nosql/mongodb/v4_0.nix | 7 |
4 files changed, 26 insertions, 6 deletions
diff --git a/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view.patch b/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view.patch new file mode 100644 index 00000000000..eb5db1818fe --- /dev/null +++ b/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view.patch @@ -0,0 +1,20 @@ +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 +index 7fe6a95a..ff4cc56b 100644 +--- a/src/third_party/asio-master/asio/include/asio/detail/config.hpp ++++ b/src/third_party/asio-master/asio/include/asio/detail/config.hpp +@@ -786,7 +786,6 @@ + # if (__cplusplus >= 201402) + # if __has_include(<experimental/string_view>) + # define ASIO_HAS_STD_STRING_VIEW 1 +-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1 + # endif // __has_include(<experimental/string_view>) + # endif // (__cplusplus >= 201402) + # endif // defined(__clang__) +@@ -794,7 +793,6 @@ + # if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4) + # if (__cplusplus >= 201402) + # define ASIO_HAS_STD_STRING_VIEW 1 +-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1 + # endif // (__cplusplus >= 201402) + # endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4) + # endif // defined(__GNUC__) diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index da4b46a69da..3f5aeb4d7da 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -58,8 +58,6 @@ 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 diff --git a/pkgs/servers/nosql/mongodb/v3_6.nix b/pkgs/servers/nosql/mongodb/v3_6.nix index 8da901c00c5..68f83631c80 100644 --- a/pkgs/servers/nosql/mongodb/v3_6.nix +++ b/pkgs/servers/nosql/mongodb/v3_6.nix @@ -11,5 +11,6 @@ let in buildMongoDB { version = "3.6.13"; sha256 = "1mbvk4bmabrswjdm01jssxcygjpq5799zqyx901nsi12vlcymwg4"; - patches = [ ./forget-build-dependencies.patch ]; + patches = [ ./forget-build-dependencies.patch ] + ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; } diff --git a/pkgs/servers/nosql/mongodb/v4_0.nix b/pkgs/servers/nosql/mongodb/v4_0.nix index 95606317f31..51ce1e25062 100644 --- a/pkgs/servers/nosql/mongodb/v4_0.nix +++ b/pkgs/servers/nosql/mongodb/v4_0.nix @@ -9,8 +9,9 @@ let inherit cctools; }; in buildMongoDB { - version = "4.0.11"; - sha256 = "0kry8kzzpah0l7j8xa333y1ixwvarc28ip3f6lx5590yy11j8ry2"; + version = "4.0.12"; + sha256 = "1j8dqa4jr623y87jrdanyib9r7x18srrvdx952q4azcc8zrdwci1"; patches = - [ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ]; + [ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ] + ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; } |