mongoc: 1.29.1 -> 1.29.2 (#373559)
This commit is contained in:
+5
-9
@@ -7,7 +7,6 @@
|
||||
pkg-config,
|
||||
mongoc,
|
||||
openssl,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -34,14 +33,11 @@ stdenv.mkDerivation rec {
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
mongoc
|
||||
openssl
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk_11_0.frameworks.Security
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
mongoc
|
||||
openssl
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# all three of these are required to use system libbson
|
||||
+10
-15
@@ -10,18 +10,17 @@
|
||||
icu,
|
||||
cyrus_sasl,
|
||||
snappy,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mongoc";
|
||||
version = "1.29.1";
|
||||
version = "1.29.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongo-c-driver";
|
||||
tag = version;
|
||||
hash = "sha256-81UgJ5GboznaK9omhr3ZMOeOQbIru33Ic42tQAazSzw=";
|
||||
hash = "sha256-nhAbe85onBgWDu20yxR9xapOpca28ayP7peXf4H6i+Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -29,18 +28,14 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
openssl
|
||||
zlib
|
||||
zstd
|
||||
icu
|
||||
cyrus_sasl
|
||||
snappy
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk_11_0.frameworks.Security
|
||||
];
|
||||
buildInputs = [
|
||||
openssl
|
||||
zlib
|
||||
zstd
|
||||
icu
|
||||
cyrus_sasl
|
||||
snappy
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_VERSION=${version}"
|
||||
@@ -7,6 +7,7 @@
|
||||
pnpm_9,
|
||||
python3,
|
||||
node-gyp,
|
||||
cctools,
|
||||
xcbuild,
|
||||
libkrb5,
|
||||
libmongocrypt,
|
||||
@@ -30,12 +31,17 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-Am9R2rfQiw1IPd22/UraqzEqvVeB5XuSrrLSYXWsWfU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pnpm_9.configHook
|
||||
python3 # required to build sqlite3 bindings
|
||||
node-gyp # required to build sqlite3 bindings
|
||||
makeWrapper
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin [ xcbuild ];
|
||||
nativeBuildInputs =
|
||||
[
|
||||
pnpm_9.configHook
|
||||
python3 # required to build sqlite3 bindings
|
||||
node-gyp # required to build sqlite3 bindings
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin [
|
||||
cctools
|
||||
xcbuild
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
nodejs
|
||||
|
||||
@@ -4154,8 +4154,6 @@ with pkgs;
|
||||
|
||||
libirc = libsForQt5.callPackage ../development/libraries/libirc { };
|
||||
|
||||
libmongocrypt = darwin.apple_sdk_11_0.callPackage ../development/libraries/libmongocrypt { };
|
||||
|
||||
libportal-gtk3 = libportal.override { variant = "gtk3"; };
|
||||
libportal-gtk4 = libportal.override { variant = "gtk4"; };
|
||||
libportal-qt5 = libportal.override { variant = "qt5"; };
|
||||
@@ -17669,8 +17667,6 @@ with pkgs;
|
||||
icu = icu71;
|
||||
};
|
||||
|
||||
mongoc = darwin.apple_sdk_11_0.callPackage ../development/libraries/mongoc { };
|
||||
|
||||
mongocxx = callPackage ../development/libraries/mongocxx/default.nix { };
|
||||
|
||||
muse = libsForQt5.callPackage ../applications/audio/muse { };
|
||||
|
||||
Reference in New Issue
Block a user