diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix index cb4bbf53279f..2009607e8421 100644 --- a/pkgs/servers/nosql/mongodb/7.0.nix +++ b/pkgs/servers/nosql/mongodb/7.0.nix @@ -21,8 +21,8 @@ let in buildMongoDB { inherit avxSupport; - version = "7.0.22"; - sha256 = "sha256-Je4vPG8tz1vqCEXzWyYi5KWQaxzlH0hOKSpWBgPs0Hs="; + version = "7.0.24"; + sha256 = "sha256-ANPg60OAxwwq1FhRTMOQ0dHBOuKpob1sXnAZMJWhtds="; patches = [ # ModuleNotFoundError: No module named 'mongo_tooling_metrics': # NameError: name 'SConsToolingMetrics' is not defined: diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index b847dfc278df..985dbda33bdf 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -5,8 +5,6 @@ buildPackages, boost, gperftools, - pcre2, - pcre-cpp, snappy, zlib, yaml-cpp, @@ -49,6 +47,7 @@ let system-libraries = [ "boost" + #pcre2 -- breaks on pcre2-10.46 with at least version 7.0.24 "snappy" "yaml" "zlib" @@ -57,13 +56,7 @@ let #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source. #"wiredtiger" ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ "tcmalloc" ] - ++ lib.optionals (lib.versionOlder version "7.0") [ - "pcre" - ] - ++ lib.optionals (lib.versionAtLeast version "7.0") [ - "pcre2" - ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ "tcmalloc" ]; inherit (lib) systems subtractLists; in @@ -92,8 +85,6 @@ stdenv.mkDerivation rec { yaml-cpp openssl openldap - pcre2 - pcre-cpp sasl snappy zlib