From cceff04ce9c2c4cc3eab27a10dd220cc5c381b3d Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Sun, 19 Mar 2023 17:30:48 +0100 Subject: [PATCH 1/3] mongodb-4_2: 4.2.19 -> 4.2.24 --- pkgs/servers/nosql/mongodb/v4_2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/v4_2.nix b/pkgs/servers/nosql/mongodb/v4_2.nix index 53b73b510e3..c115e111983 100644 --- a/pkgs/servers/nosql/mongodb/v4_2.nix +++ b/pkgs/servers/nosql/mongodb/v4_2.nix @@ -9,8 +9,8 @@ let inherit cctools; }; in buildMongoDB { - version = "4.2.19"; - sha256 = "sha256-fngTHd+fSdHqiqQYOYS7o6P5eHybeZy3iNKkGzFmjTw="; + version = "4.2.24"; + sha256 = "sha256-O6nR4wfmupuc/Vjm72Vt8WFmbGm9GHR3p1GlEtgEJpg="; patches = [ ./forget-build-dependencies-4-2.patch (fetchpatch { From 982e914e5786dbbd4935e244c010f5d8994f6eeb Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Sun, 19 Mar 2023 22:42:33 +0100 Subject: [PATCH 2/3] mongodb: Mark anything older than 6.0 broken on aarch64-darwin --- pkgs/servers/nosql/mongodb/mongodb.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 643d82a7fd2..76c3ab7691a 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -186,5 +186,6 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ bluescreen303 offline cstrahan ]; platforms = subtractLists systems.doubles.i686 systems.doubles.unix; + broken = (versionOlder version "6.0" && stdenv.system == "aarch64-darwin"); }; } From 084fd533740d946f783778b3d9931c600b976422 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Sun, 19 Mar 2023 23:37:20 +0100 Subject: [PATCH 3/3] mongodb-4_2: Add cache alignment fix for aarch64 --- pkgs/servers/nosql/mongodb/v4_2.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/nosql/mongodb/v4_2.nix b/pkgs/servers/nosql/mongodb/v4_2.nix index c115e111983..9cf419545a0 100644 --- a/pkgs/servers/nosql/mongodb/v4_2.nix +++ b/pkgs/servers/nosql/mongodb/v4_2.nix @@ -18,5 +18,10 @@ in buildMongoDB { 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 ]; }