Unverified Commit f6b0b922 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

parents e8afaf8b 67dfca03

pkgs/servers/nosql/mongodb/6.0.nix

+0 −4
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
  fetchpatch,

  sasl,

  boost,

  Security,

  CoreFoundation,

  cctools,

  avxSupport ? stdenv.hostPlatform.avxSupport,

}:
@@ -15,8 +13,6 @@ let 
    inherit

      sasl

      boost

      Security

      CoreFoundation

      cctools

      stdenv

      ;

pkgs/servers/nosql/mongodb/7.0.nix

+0 −4
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
  callPackage,

  sasl,

  boost,

  Security,

  CoreFoundation,

  cctools,

  avxSupport ? stdenv.hostPlatform.avxSupport,

  nixosTests,
@@ -16,8 +14,6 @@ let 
    inherit

      sasl

      boost

      Security

      CoreFoundation

      cctools

      stdenv

      ;

pkgs/servers/nosql/mongodb/mongodb.nix

+0 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
  openssl,

  libpcap,

  curl,

  Security,

  CoreFoundation,

  cctools,

  xz,

}:
@@ -102,8 +100,6 @@ stdenv.mkDerivation rec { 
      zlib

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      Security

      CoreFoundation

      cctools

    ]

    ++ lib.optional stdenv.hostPlatform.isLinux net-snmp

pkgs/top-level/all-packages.nix

+2 −18
Original line number Diff line number Diff line
@@ -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 { };