Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mongodb{,-6_0}: use new apple sdk pattern #370666

Merged
merged 1 commit into from
Jan 3, 2025
Merged

mongodb{,-6_0}: use new apple sdk pattern #370666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions pkgs/servers/nosql/mongodb/6.0.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
fetchpatch,
sasl,
boost,
Security,
CoreFoundation,
cctools,
avxSupport ? stdenv.hostPlatform.avxSupport,
}:
Expand All @@ -15,8 +13,6 @@ let
inherit
sasl
boost
Security
CoreFoundation
cctools
stdenv
;
Expand Down
4 changes: 0 additions & 4 deletions pkgs/servers/nosql/mongodb/7.0.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
callPackage,
sasl,
boost,
Security,
CoreFoundation,
cctools,
avxSupport ? stdenv.hostPlatform.avxSupport,
nixosTests,
Expand All @@ -16,8 +14,6 @@ let
inherit
sasl
boost
Security
CoreFoundation
cctools
stdenv
;
Expand Down
4 changes: 0 additions & 4 deletions pkgs/servers/nosql/mongodb/mongodb.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
openssl,
libpcap,
curl,
Security,
CoreFoundation,
cctools,
xz,
}:
Expand Down Expand Up @@ -102,8 +100,6 @@ stdenv.mkDerivation rec {
zlib
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Security
CoreFoundation
cctools
]
++ lib.optional stdenv.hostPlatform.isLinux net-snmp
Expand Down
20 changes: 2 additions & 18 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11735,30 +11735,14 @@ with pkgs;

mongodb = hiPrio mongodb-7_0;

mongodb-6_0 = darwin.apple_sdk_11_0.callPackage ../servers/nosql/mongodb/6.0.nix {
mongodb-6_0 = callPackage ../servers/nosql/mongodb/6.0.nix {
sasl = cyrus_sasl;
boost = boost178.override { enableShared = false; };
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
stdenv = if stdenv.hostPlatform.isDarwin then
darwin.apple_sdk_11_0.stdenv.override (old: {
hostPlatform = old.hostPlatform // { darwinMinVersion = "10.14"; };
buildPlatform = old.buildPlatform // { darwinMinVersion = "10.14"; };
targetPlatform = old.targetPlatform // { darwinMinVersion = "10.14"; };
}) else
if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
};

mongodb-7_0 = darwin.apple_sdk_11_0.callPackage ../servers/nosql/mongodb/7.0.nix {
mongodb-7_0 = callPackage ../servers/nosql/mongodb/7.0.nix {
sasl = cyrus_sasl;
boost = boost179.override { enableShared = false; };
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
stdenv = if stdenv.hostPlatform.isDarwin then
darwin.apple_sdk_11_0.stdenv.override (old: {
hostPlatform = old.hostPlatform // { darwinMinVersion = "10.14"; };
buildPlatform = old.buildPlatform // { darwinMinVersion = "10.14"; };
targetPlatform = old.targetPlatform // { darwinMinVersion = "10.14"; };
}) else
if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
};

influxdb = callPackage ../servers/nosql/influxdb { };
Expand Down
Loading