From 086676017e98bb1f9f94481c26487774f810c0a8 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 1 Oct 2024 01:27:51 +0100 Subject: [PATCH] mongodb: mongodb-5_0 -> mongodb-7_0 --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++ nixos/tests/mongodb.nix | 4 ++-- pkgs/servers/nosql/mongodb/6.0.nix | 2 +- pkgs/servers/nosql/mongodb/7.0.nix | 4 ++++ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 3fd90f745561..121d93dbbe19 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -173,6 +173,9 @@ - `transmission-gtk`: `~/.config/transmission` - `transmission-daemon` using NixOS module: `${config.services.transmission.home}/.config/transmission-daemon` (defaults to `/var/lib/transmission/.config/transmission-daemon`) +- The default `mongodb` version has been updated from 5.0 to 7.0. + For more information, see the compatibility changes for MongoDB [6.0](https://www.mongodb.com/docs/manual/release-notes/6.0-compatibility/) and [7.0](https://www.mongodb.com/docs/manual/release-notes/7.0-compatibility/). + - `unifi` has been updated to UniFi 8. `unifi7` was removed as it is vulnerable to CVE-2024-42025 and required a version of MongoDB that has reached end of life. diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix index 1a260814f8b8..d82d5080e69c 100644 --- a/nixos/tests/mongodb.nix +++ b/nixos/tests/mongodb.nix @@ -34,7 +34,7 @@ import ./make-test-python.nix ({ pkgs, ... }: node = {...}: { environment.systemPackages = with pkgs; [ # remember to update mongodb.passthru.tests if you change this - mongodb-5_0 + mongodb-7_0 ]; }; }; @@ -42,7 +42,7 @@ import ./make-test-python.nix ({ pkgs, ... }: testScript = '' node.start() '' - + runMongoDBTest pkgs.mongodb-5_0 + + runMongoDBTest pkgs.mongodb-7_0 + '' node.shutdown() ''; diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index 7132039908b0..a3567e5234d8 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -25,5 +25,5 @@ buildMongoDB { # Fix building with python 3.12 since the imp module was removed ./mongodb-python312.patch ]; - # passthru.tests = { inherit (nixosTests) mongodb; }; # currently tests mongodb-5_0 + # passthru.tests = { inherit (nixosTests) mongodb; }; # currently tests mongodb-7_0 } diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix index ec7136119472..ccd5eade79b8 100644 --- a/pkgs/servers/nosql/mongodb/7.0.nix +++ b/pkgs/servers/nosql/mongodb/7.0.nix @@ -7,6 +7,7 @@ CoreFoundation, cctools, avxSupport ? stdenv.hostPlatform.avxSupport, + nixosTests, }: let @@ -34,4 +35,7 @@ buildMongoDB { # Fix building with python 3.12 since the imp module was removed ./mongodb-python312.patch ]; + passthru.tests = { + inherit (nixosTests) mongodb; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5dc2144814e..edbd9d85ab7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24974,7 +24974,7 @@ with pkgs; mariadb = mariadb_1011; mariadb-embedded = mariadb.override { withEmbedded = true; }; - mongodb = hiPrio mongodb-6_0; + mongodb = hiPrio mongodb-7_0; mongodb-5_0 = callPackage ../servers/nosql/mongodb/5.0.nix { sasl = cyrus_sasl;