Unverified Commit a3cc57a9 authored by Emily's avatar Emily Committed by GitHub
Browse files

treewide: unpin apple-sdk_11 pt 8 (#370654)

parents a748f4ce ce1f9eb4

pkgs/by-name/ed/edencommon/package.nix

+9 −16
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
  wangle,

  fbthrift,

  gtest,

  apple-sdk_11,

  darwinMinVersionHook,



  nix-update-script,

}:
@@ -48,8 +46,7 @@ stdenv.mkDerivation (finalAttrs: { 
    removeReferencesTo

  ];



  buildInputs =

    [

  buildInputs = [

    glog

    gflags

    folly
@@ -57,10 +54,6 @@ stdenv.mkDerivation (finalAttrs: { 
    wangle

    fbthrift

    gtest

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      apple-sdk_11

      (darwinMinVersionHook "11.0")

  ];



  cmakeFlags = [

pkgs/by-name/fb/fb303/package.nix

+8 −15
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
  fbthrift,

  fizz,

  wangle,

  apple-sdk_11,

  darwinMinVersionHook,



  nix-update-script,

}:
@@ -40,18 +38,13 @@ stdenv.mkDerivation (finalAttrs: { 
    ninja

  ];



  buildInputs =

    [

  buildInputs = [

    gflags

    glog

    folly

    fbthrift

    fizz

    wangle

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      apple-sdk_11

      (darwinMinVersionHook "11.0")

  ];



  cmakeFlags = [

pkgs/by-name/fb/fbthrift/package.nix

+11 −18
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
  zlib,

  zstd,

  xxHash,

  apple-sdk_11,

  darwinMinVersionHook,



  mvfst,
@@ -56,8 +54,7 @@ stdenv.mkDerivation (finalAttrs: { 
    removeReferencesTo

  ];



  buildInputs =

    [

  buildInputs = [

    openssl

    gflags

    glog
@@ -67,10 +64,6 @@ stdenv.mkDerivation (finalAttrs: { 
    zlib

    zstd

    xxHash

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      apple-sdk_11

      (darwinMinVersionHook "11.0")

  ];



  propagatedBuildInputs = [

pkgs/by-name/fi/fizz/package.nix

+8 −15
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
  zstd,

  gflags,

  libevent,

  apple-sdk_11,

  darwinMinVersionHook,



  folly,

  libsodium,
@@ -49,18 +47,13 @@ stdenv.mkDerivation (finalAttrs: { 
    removeReferencesTo

  ];



  buildInputs =

    [

  buildInputs = [

    openssl

    glog

    double-conversion

    zstd

    gflags

    libevent

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      apple-sdk_11

      (darwinMinVersionHook "11.0")

  ];



  propagatedBuildInputs = [

pkgs/by-name/fo/folly/package.nix

+15 −22
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
  zstd,

  libiberty,

  libunwind,

  apple-sdk_11,

  darwinMinVersionHook,



  boost,

  fmt_11,
@@ -64,8 +62,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  # See CMake/folly-deps.cmake in the Folly source tree.

  buildInputs =

    [

  buildInputs = [

    boost

    double-conversion

    fast-float
@@ -79,10 +76,6 @@ stdenv.mkDerivation (finalAttrs: { 
    zstd

    libiberty

    libunwind

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      apple-sdk_11

      (darwinMinVersionHook "11.0")

  ];



  propagatedBuildInputs =