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

mongodb-4_2: drop

Browse Source
This commit is contained in:
Weijia Wang 2023-06-06 14:26:11 +03:00
parent ac6d8999f0
commit 3f467ff45f
13 changed files with 4 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/networking/unifi.nix
View File

@ -42,10 +42,10 @@ in
services.unifi.mongodbPackage = mkOption {
type = types.package;
default = pkgs.mongodb-4_2;
default = pkgs.mongodb-4_4;
defaultText = literalExpression "pkgs.mongodb";
description = lib.mdDoc ''
The mongodb package to use. Please note: unifi7 officially only supports mongodb up until 3.6 but works with 4.2.
The mongodb package to use. Please note: unifi7 officially only supports mongodb up until 3.6 but works with 4.4.
'';
};

2
nixos/modules/services/video/unifi-video.nix
View File

@ -123,7 +123,7 @@ in
mongodbPackage = mkOption {
type = types.package;
default = pkgs.mongodb-4_2;
default = pkgs.mongodb-4_4;
defaultText = literalExpression "pkgs.mongodb";
description = lib.mdDoc ''
The mongodb package to use.

2
nixos/tests/mongodb.nix
View File

@ -33,7 +33,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
nodes = {
node = {...}: {
environment.systemPackages = with pkgs; [
mongodb-4_2
mongodb-4_4
mongodb-5_0
];
@ -43,7 +42,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
testScript = ''
node.start()
''
+ runMongoDBTest pkgs.mongodb-4_2
+ runMongoDBTest pkgs.mongodb-4_4
+ runMongoDBTest pkgs.mongodb-5_0
+ ''

22
pkgs/servers/nosql/mongodb/asio-no-experimental-string-view-4-2.patch
View File

@ -1,22 +0,0 @@
--- 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)

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

@ -1,20 +0,0 @@
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__)

17
pkgs/servers/nosql/mongodb/forget-build-dependencies-3-4.patch
View File

@ -1,17 +0,0 @@
--- a/site_scons/mongo_scons_utils.py
+++ b/site_scons/mongo_scons_utils.py
@@ -84,14 +84,11 @@
def default_buildinfo_environment_data():
return (
('distmod', '$MONGO_DISTMOD', True, True,),
('distarch', '$MONGO_DISTARCH', True, True,),
('cc', '$CC_VERSION', True, False,),
- ('ccflags', '$CCFLAGS', True, False,),
('cxx', '$CXX_VERSION', True, False,),
- ('cxxflags', '$CXXFLAGS', True, False,),
- ('linkflags', '$LINKFLAGS', True, False,),
('target_arch', '$TARGET_ARCH', True, True,),
('target_os', '$TARGET_OS', True, False,),
)
# If you want buildInfo and --version to be relatively empty, set

36
pkgs/servers/nosql/mongodb/forget-build-dependencies-4-2.patch
View File

@ -1,36 +0,0 @@
# 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',

16
pkgs/servers/nosql/mongodb/forget-build-dependencies.patch
View File

@ -1,16 +0,0 @@
# 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
@@ -18,10 +18,7 @@ def default_buildinfo_environment_data():
('distmod', '$MONGO_DISTMOD', True, True,),
('distarch', '$MONGO_DISTARCH', True, True,),
('cc', '$CC_VERSION', True, False,),
- ('ccflags', '$CCFLAGS', True, False,),
('cxx', '$CXX_VERSION', True, False,),
- ('cxxflags', '$CXXFLAGS', True, False,),
- ('linkflags', '$LINKFLAGS', True, False,),
('target_arch', '$TARGET_ARCH', True, True,),
('target_os', '$TARGET_OS', True, False,),
)

27
pkgs/servers/nosql/mongodb/mozjs-45_fix-3-byte-opcode.patch
View File

@ -1,27 +0,0 @@
# HG changeset patch
# User Dan Gohman <sunfish@mozilla.com>
# Parent d9b405d82cffb07343a5f2fd941e029298c7f6c4
# Bug 1390214 - IonMonkey: Don't test for a 3-byte opcode in a 2-byte opcode predicate.
# https://bug1390214.bmoattachments.org/attachment.cgi?id=8902972
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
--- 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
@@ -310,17 +310,16 @@ enum ThreeByteOpcodeID {
// Test whether the given opcode should be printed with its operands reversed.
inline bool IsXMMReversedOperands(TwoByteOpcodeID opcode)
{
switch (opcode) {
case OP2_MOVSD_WsdVsd: // also OP2_MOVPS_WpsVps
case OP2_MOVAPS_WsdVsd:
case OP2_MOVDQ_WdqVdq:
- case OP3_PEXTRD_EdVdqIb:
return true;
default:
break;
}
return false;
}
enum ThreeByteEscape {

14
pkgs/servers/nosql/mongodb/patches/mongodb-4.0-glibc-2.34.patch
View File

@ -1,14 +0,0 @@
--- a/src/mongo/stdx/thread.h
+++ b/src/mongo/stdx/thread.h
@@ -103,10 +103,7 @@ private:
// . N Y : 4,344 | 13,048 | 7,352
// . Y Y : 4,424 | 13,672 | 8,392
// ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt )
- static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10;
-
- static constexpr std::size_t kStackSize =
- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ});
+ static constexpr std::size_t kStackSize = std::size_t{64} << 10;
std::unique_ptr<char[]> _stackStorage = std::make_unique<char[]>(kStackSize);
#else // !MONGO_HAS_SIGALTSTACK

27
pkgs/servers/nosql/mongodb/v4_2.nix
View File

@ -1,27 +0,0 @@
{ stdenv, callPackage, fetchpatch, 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.24";
sha256 = "sha256-O6nR4wfmupuc/Vjm72Vt8WFmbGm9GHR3p1GlEtgEJpg=";
patches = [
./forget-build-dependencies-4-2.patch
(fetchpatch {
name = "mongodb-4.4.1-gcc11.patch";
url = "https://raw.githubusercontent.com/gentoo/gentoo/7168257cad6ea7c4856b01c5703d0ed5b764367c/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch";
sha256 = "sha256-RvfCP462RG+ZVjcb23DgCuxCdfPl2/UgH8N7FgCghGI=";
})
(fetchpatch {
name = "mongodb-4.4.15-adjust-the-cache-alignment-assumptions.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/mongodb-4.4.15-adjust-cache-alignment-assumptions.patch.arm64?h=mongodb44";
sha256 = "Ah4zdSFgXUJ/HSN8VRLJqDpNy3CjMCBnRqlpALXzx+g=";
})
] ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ];
}

1
pkgs/top-level/aliases.nix
View File

@ -1057,6 +1057,7 @@ mapAliases ({
mongodb-3_4 = throw "mongodb-3_4 has been removed, it's end of life since January 2020"; # Added 2022-11-30
mongodb-3_6 = throw "mongodb-3_6 has been removed, it's end of life since April 2021"; # Added 2022-11-30
mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05
mongodb-4_2 = throw "mongodb-4_2 has been removed, it's end of life since April 2023"; # Added 2023-06-06
monodevelop = throw "monodevelop has been removed from nixpkgs"; # Added 2022-01-15
mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07
mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18

7
pkgs/top-level/all-packages.nix
View File

@ -25985,13 +25985,6 @@ with pkgs;
mongodb = hiPrio mongodb-6_0;
mongodb-4_2 = callPackage ../servers/nosql/mongodb/v4_2.nix {
sasl = cyrus_sasl;
boost = boost169;
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
mongodb-4_4 = callPackage ../servers/nosql/mongodb/4.4.nix {
sasl = cyrus_sasl;
boost = boost17x.override { enableShared = false; };