public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mongodb-4_0: 4.0.11 -> 4.0.12

This commit is contained in:
Nathan Smyth 2019-08-21 19:33:51 +10:00 committed by Maximilian Bosch
parent 44641ed00b
commit de69821b54
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/servers/nosql/mongodb/asio-no-experimental-string-view.patch Normal file
View File

@ -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__)

2
pkgs/servers/nosql/mongodb/mongodb.nix
View File

@ -58,8 +58,6 @@ in stdenv.mkDerivation rec {
substituteInPlace SConstruct \ substituteInPlace SConstruct \
--replace "env = Environment(" "env = Environment(ENV = os.environ," --replace "env = Environment(" "env = Environment(ENV = os.environ,"
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + 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/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/s1angle.cc --replace drem remainder

3
pkgs/servers/nosql/mongodb/v3_6.nix
View File

@ -11,5 +11,6 @@ let
in buildMongoDB { in buildMongoDB {
version = "3.6.13"; version = "3.6.13";
sha256 = "1mbvk4bmabrswjdm01jssxcygjpq5799zqyx901nsi12vlcymwg4"; sha256 = "1mbvk4bmabrswjdm01jssxcygjpq5799zqyx901nsi12vlcymwg4";
patches = [ ./forget-build-dependencies.patch ]; patches = [ ./forget-build-dependencies.patch ]
++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ];
} }

7
pkgs/servers/nosql/mongodb/v4_0.nix
View File

@ -9,8 +9,9 @@ let
inherit cctools; inherit cctools;
}; };
in buildMongoDB { in buildMongoDB {
version = "4.0.11"; version = "4.0.12";
sha256 = "0kry8kzzpah0l7j8xa333y1ixwvarc28ip3f6lx5590yy11j8ry2"; sha256 = "1j8dqa4jr623y87jrdanyib9r7x18srrvdx952q4azcc8zrdwci1";
patches = 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 ];
} }