cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

mongodb-4_4: 4.4.13 -> 4.4.19

Browse source
This commit is contained in:
Adrian Pistol 2023-03-27 19:49:17 +02:00
parent bae4239b72
commit af412536e8
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/servers/nosql/mongodb/4.4.nix
View file

@ -1,4 +1,4 @@
{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: { stdenv, callPackage, lib, fetchpatch, sasl, boost, Security, CoreFoundation, cctools }:
let let
buildMongoDB = callPackage ./mongodb.nix { buildMongoDB = callPackage ./mongodb.nix {
@ -6,10 +6,15 @@ let
}; };
in in
buildMongoDB { buildMongoDB {
version = "4.4.13"; version = "4.4.19";
sha256 = "sha256-ebg3R6P+tjRvizDzsl7mZzhTfqIaRJPfHBu0IfRvtS8="; sha256 = "sha256-DqkEOsTGB9gDYPxdEi9Kv3xJDz6XBe3fI59pnI1Upnk=";
patches = [ patches = [
./forget-build-dependencies-4-4.patch ./forget-build-dependencies-4-4.patch
./fix-build-with-boost-1.79-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 ]; ] ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-4.patch ];
} }

12
pkgs/servers/nosql/mongodb/fix-build-with-boost-1.79-4_4.patch
View file

@ -1,4 +1,4 @@
From 9a4c7b33e49cdf121ff9dee858539568d009fc27 Mon Sep 17 00:00:00 2001 From f0c7e9190e9d61515ab3f95c6665754d3b972cd1 Mon Sep 17 00:00:00 2001
From: Et7f3 <cadeaudeelie@gmail.com> From: Et7f3 <cadeaudeelie@gmail.com>
Date: Tue, 19 Jul 2022 22:11:11 +0200 Date: Tue, 19 Jul 2022 22:11:11 +0200
Subject: [PATCH] build: Upgrade boost to 1.79.0 Subject: [PATCH] build: Upgrade boost to 1.79.0
@ -17,6 +17,8 @@ would catch this error.
In upstream they fixed in a simmilar way In upstream they fixed in a simmilar way
https://github.com/mongodb/mongo/commit/13389dc222fc372442be8c147e09685bb9a26a3a https://github.com/mongodb/mongo/commit/13389dc222fc372442be8c147e09685bb9a26a3a
Co-Authored-By: Adrian Pistol <vifino@tty.sh>
--- ---
src/mongo/db/storage/storage_repair_observer.cpp | 1 + src/mongo/db/storage/storage_repair_observer.cpp | 1 +
src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp | 1 + src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp | 1 +
@ -38,7 +40,7 @@ index 22b76a6a39c..453f48229cd 100644
#include "mongo/db/dbhelpers.h" #include "mongo/db/dbhelpers.h"
#include "mongo/db/operation_context.h" #include "mongo/db/operation_context.h"
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
index 85121941458..7464022fb28 100644 index ee87aca4723..bde2c1b2b83 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp --- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
@ -46,9 +48,9 @@ index 85121941458..7464022fb28 100644
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
+#include <boost/filesystem/fstream.hpp> +#include <boost/filesystem/fstream.hpp>
#include <pcrecpp.h>
#include "mongo/base/simple_string_data_comparator.h" #include "mongo/base/simple_string_data_comparator.h"
#include "mongo/bson/bsonobjbuilder.h"
diff --git a/src/mongo/shell/shell_utils_extended.cpp b/src/mongo/shell/shell_utils_extended.cpp diff --git a/src/mongo/shell/shell_utils_extended.cpp b/src/mongo/shell/shell_utils_extended.cpp
index 8cd7f035f1d..cd672eb513f 100644 index 8cd7f035f1d..cd672eb513f 100644
--- a/src/mongo/shell/shell_utils_extended.cpp --- a/src/mongo/shell/shell_utils_extended.cpp
@ -62,7 +64,7 @@ index 8cd7f035f1d..cd672eb513f 100644
#include "mongo/bson/bson_validate.h" #include "mongo/bson/bson_validate.h"
diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp
index de4b84bca5a..7fa9d5d128e 100644 index 9063f140988..d74949d45fc 100644
--- a/src/mongo/util/processinfo_linux.cpp --- a/src/mongo/util/processinfo_linux.cpp
+++ b/src/mongo/util/processinfo_linux.cpp +++ b/src/mongo/util/processinfo_linux.cpp
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
@ -87,5 +89,5 @@ index 4667a261ab7..73a36015bd6 100644
#include <cstdint> #include <cstdint>
#include <cstdlib> #include <cstdlib>
-- --
2.32.1 (Apple Git-133) 2.39.2