diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix index 67347541dd66..c26dc3ac32d3 100644 --- a/nixos/tests/mongodb.nix +++ b/nixos/tests/mongodb.nix @@ -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 diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 7be4064dd7f3..2f06e8f42ce6 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -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" diff --git a/pkgs/servers/nosql/mongodb/v4_0.nix b/pkgs/servers/nosql/mongodb/v4_0.nix deleted file mode 100644 index 1235123c94a2..000000000000 --- a/pkgs/servers/nosql/mongodb/v4_0.nix +++ /dev/null @@ -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="; - }) - ]; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7041d012f4b2..81a6f04ba71c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -956,6 +956,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 104f8eef991a..7a1ad7535259 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24462,13 +24462,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;