Unverified Commit d2ca8b19 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #303318 from wegank/mongodb-4-drop 

mongodb-4_4: drop
parents 32aca9b2 11f3e0c1

nixos/doc/manual/release-notes/rl-2405.section.md

+2 −0
Original line number Diff line number Diff line
@@ -219,6 +219,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 


- `unifiLTS`, `unifi5` and `unifi6` have been removed, as they require MongoDB versions which are end-of-life. All these versions can be upgraded to `unifi7` directly.



- `mongodb-4_4` has been removed as it has reached end of life. Consequently, `unifi7` and `unifi8` now use MongoDB 5.0 by default.



- `nitter` requires a `guest_accounts.jsonl` to be provided as a path or loaded into the default location at `/var/lib/nitter/guest_accounts.jsonl`. See [Guest Account Branch Deployment](https://github.com/zedeus/nitter/wiki/Guest-Account-Branch-Deployment) for details.



- `boot.supportedFilesystems` and `boot.initrd.supportedFilesystems` are now attribute sets instead of lists. Assignment from lists as done previously is still supported, but checking whether a filesystem is enabled must now by done using `supportedFilesystems.fs or false` instead of using `lib.elem "fs" supportedFilesystems` as was done previously.

nixos/modules/services/networking/unifi.nix

+2 −2
Original line number Diff line number Diff line
@@ -39,10 +39,10 @@ in 
    services.unifi.unifiPackage = lib.mkPackageOption pkgs "unifi5" { };



    services.unifi.mongodbPackage = lib.mkPackageOption pkgs "mongodb" {

      default = "mongodb-4_4";

      default = "mongodb-5_0";

      extraDescription = ''

        ::: {.note}

        unifi7 officially only supports mongodb up until 3.6 but works with 4.4.

        unifi7 officially only supports mongodb up until 4.4 but works with 5.0.

        :::

      '';

    };

nixos/modules/services/video/unifi-video.nix

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ in 
    unifiVideoPackage = mkPackageOption pkgs "unifi-video" { };



    mongodbPackage = mkPackageOption pkgs "mongodb" {

      default = "mongodb-4_4";

      default = "mongodb-5_0";

    };



    logDir = mkOption {

nixos/tests/mongodb.nix

+0 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import ./make-test-python.nix ({ pkgs, ... }: 
    nodes = {

      node = {...}: {

        environment.systemPackages = with pkgs; [

          mongodb-4_4

          mongodb-5_0

        ];

      };
@@ -42,7 +41,6 @@ import ./make-test-python.nix ({ pkgs, ... }: 
    testScript = ''

      node.start()

    ''

      + runMongoDBTest pkgs.mongodb-4_4

      + runMongoDBTest pkgs.mongodb-5_0

      + ''

        node.shutdown()

pkgs/servers/nosql/mongodb/4.4.nix

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
{ stdenv, callPackage, lib, fetchpatch, sasl, boost, Security, CoreFoundation, cctools }:



let

  buildMongoDB = callPackage ./mongodb.nix {

    inherit sasl boost Security CoreFoundation cctools;

  };

in

buildMongoDB {

  version = "4.4.28";

  sha256 = "sha256-aq4dJl2FOTOhQ3bzVj0L/0CE3obE7lCx2ecjGNYC8X4=";

  patches = [

    ./forget-build-dependencies-4-4.patch

    ./fix-build-with-boost-1.79-4_4.patch

    (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-4.patch ];

}