Merge pull request #209191 from wegank/mongodb-more-drops

mongodb-4_0: drop
This commit is contained in:
Thiago Kenji Okada 2023-01-07 13:04:34 +00:00 committed by GitHub
commit c2fdf2d137
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 4 additions and 53 deletions

View File

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

View File

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

View File

@ -47,7 +47,7 @@ let
mozjsVersion = "60";
mozjsReplace = "defined(HAVE___SINCOS)";
} else if versionAtLeast version "4.2" then rec {
} else rec {
python = scons.python.withPackages (ps: with ps; [
pyyaml
cheetah3
@ -61,17 +61,7 @@ let
mozjsVersion = "60";
mozjsReplace = "defined(HAVE___SINCOS)";
} else rec {
python = scons.python.withPackages (ps: with ps; [
setuptools
typing
cheetah3
]);
scons = sconsPackages.scons_3_1_2;
mozjsVersion = "45";
mozjsReplace = "defined(HAVE_SINCOS)";
};
};
system-libraries = [
"boost"

View File

@ -1,31 +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.0.27";
sha256 = "sha256-ct33mnK4pszhYM4Is7j0GZQRyi8i8Qmy0wcklyq5LjM=";
patches = [
./forget-build-dependencies.patch
./mozjs-45_fix-3-byte-opcode.patch
./patches/mongodb-4.0-glibc-2.34.patch # https://github.com/NixOS/nixpkgs/issues/171928
(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=";
})
]
++ lib.optionals stdenv.isDarwin [
(fetchpatch {
name = "fix double link of isNamedError.";
url = "https://github.com/mongodb/mongo/commit/9c6751b9765d269b667324bb2efe1ca76a916d20.patch";
sha256 = "sha256-4mcafqhBh7039ocEI9d/gXWck51X68PqtWtz4dapwwI=";
})
];
}

View File

@ -959,6 +959,7 @@ mapAliases ({
monero = monero-cli; # Added 2021-11-28
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
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

View File

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