Not strictly an upgrade, but adds a new mongodb-4_2 target with the current mongodb from that branch. Use matching client and server versions in mongodb tests- tests were using the mongo 3.4 client to connect, and this finally doesn't work with server 4.2. Per reviewer suggestion, adding myself as cheetah3 maintainer. Additionally, reestore comments describing the purpose of the build-dependencies patchwip/yesman
parent
1c26e6baec
commit
dbd0f3e957
@ -0,0 +1,20 @@ |
||||
{ lib, buildPythonPackage, fetchPypi, stdenv }: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "Cheetah3"; |
||||
version = "3.2.5"; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "ececc9ca7c58b9a86ce71eb95594c4619949e2a058d2a1af74c7ae8222515eb1"; |
||||
}; |
||||
|
||||
doCheck = false; # Circular dependency |
||||
|
||||
meta = { |
||||
homepage = "http://www.cheetahtemplate.org/"; |
||||
description = "A template engine and code generation tool"; |
||||
license = lib.licenses.mit; |
||||
maintainers = with stdenv.lib.maintainers; [ pjjw ]; |
||||
}; |
||||
} |
@ -0,0 +1,22 @@ |
||||
--- a/src/third_party/asio-master/asio/include/asio/detail/config.hpp
|
||||
+++ b/src/third_party/asio-master/asio/include/asio/detail/config.hpp
|
||||
@@ -831,20 +831,8 @@
|
||||
# endif // (__cplusplus >= 201402)
|
||||
# endif // (_LIBCPP_VERSION < 7000)
|
||||
# else // defined(ASIO_HAS_CLANG_LIBCXX)
|
||||
-# if (__cplusplus >= 201402)
|
||||
-# if __has_include(<experimental/string_view>)
|
||||
-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
|
||||
-# endif // __has_include(<experimental/string_view>)
|
||||
-# endif // (__cplusplus >= 201402)
|
||||
# endif // // defined(ASIO_HAS_CLANG_LIBCXX)
|
||||
# endif // defined(__clang__)
|
||||
-# if defined(__GNUC__)
|
||||
-# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
|
||||
-# if (__cplusplus >= 201402)
|
||||
-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
|
||||
-# endif // (__cplusplus >= 201402)
|
||||
-# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
|
||||
-# endif // defined(__GNUC__)
|
||||
# endif // !defined(ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
|
||||
#endif // !defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
|
@ -0,0 +1,36 @@ |
||||
# MongoDB keeps track of its build parameters, which tricks nix into
|
||||
# keeping dependencies to build inputs in the final output.
|
||||
# We remove the build flags from buildInfo data.
|
||||
--- a/site_scons/mongo/generators.py
|
||||
+++ b/site_scons/mongo/generators.py
|
||||
@@ -33,30 +33,12 @@ def default_buildinfo_environment_data():
|
||||
True,
|
||||
False,
|
||||
),
|
||||
- (
|
||||
- 'ccflags',
|
||||
- '$CCFLAGS',
|
||||
- True,
|
||||
- False,
|
||||
- ),
|
||||
(
|
||||
'cxx',
|
||||
'$CXX_VERSION',
|
||||
True,
|
||||
False,
|
||||
),
|
||||
- (
|
||||
- 'cxxflags',
|
||||
- '$CXXFLAGS',
|
||||
- True,
|
||||
- False,
|
||||
- ),
|
||||
- (
|
||||
- 'linkflags',
|
||||
- '$LINKFLAGS',
|
||||
- True,
|
||||
- False,
|
||||
- ),
|
||||
(
|
||||
'target_arch',
|
||||
'$TARGET_ARCH',
|
@ -0,0 +1,17 @@ |
||||
{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: |
||||
|
||||
let |
||||
buildMongoDB = callPackage ./mongodb.nix { |
||||
inherit sasl; |
||||
inherit boost; |
||||
inherit Security; |
||||
inherit CoreFoundation; |
||||
inherit cctools; |
||||
}; |
||||
in buildMongoDB { |
||||
version = "4.2.8"; |
||||
sha256 = "13yvhi1258skdni00bh6ph609whqsmhiimhyqy1gs2liwdvh5278"; |
||||
patches = |
||||
[ ./forget-build-dependencies-4-2.patch ] |
||||
++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ]; |
||||
} |
Loading…
Reference in new issue