Unverified Commit 76bec615 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

mongodb-7_0: 7.0.22 -> 7.0.24, disable --use-system-pcre2 (#443586)

parents 183c4ed1 196d1a5c

pkgs/servers/nosql/mongodb/7.0.nix

+2 −2
Original line number Diff line number Diff line
@@ -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:

pkgs/servers/nosql/mongodb/mongodb.nix

+2 −11
Original line number Diff line number Diff line
@@ -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