From af029e268dff50e271f7c8dd1d6633f57fbfb243 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 3 Jan 2025 17:33:44 +0000 Subject: [PATCH 1/9] conduwuit: remove code for macOS < 11 --- pkgs/by-name/co/conduwuit/package.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/by-name/co/conduwuit/package.nix b/pkgs/by-name/co/conduwuit/package.nix index bf5c4cdbfda6..135321c59470 100644 --- a/pkgs/by-name/co/conduwuit/package.nix +++ b/pkgs/by-name/co/conduwuit/package.nix @@ -6,8 +6,6 @@ bzip2, zstd, stdenv, - apple-sdk_15, - darwinMinVersionHook, rocksdb, nix-update-script, testers, @@ -55,12 +53,7 @@ rustPlatform.buildRustPackage rec { zstd ] ++ lib.optional enableJemalloc rust-jemalloc-sys' - ++ lib.optional enableLiburing liburing - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_15 - # aws-lc-sys requires CryptoKit's CommonCrypto, which is available on macOS 10.15+ - (darwinMinVersionHook "10.15") - ]; + ++ lib.optional enableLiburing liburing; env = { ZSTD_SYS_USE_PKG_CONFIG = true; From 6945ed91ddb878785b8f6b165fd592a4b0a3f630 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 3 Jan 2025 17:38:01 +0000 Subject: [PATCH 2/9] golem: remove code for macOS < 11 --- pkgs/by-name/go/golem/package.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/go/golem/package.nix b/pkgs/by-name/go/golem/package.nix index a04ebeddbe60..cabb64312a08 100644 --- a/pkgs/by-name/go/golem/package.nix +++ b/pkgs/by-name/go/golem/package.nix @@ -11,8 +11,6 @@ # buildInputs fontconfig, openssl, - apple-sdk_15, - darwinMinVersionHook, redis, versionCheckHook, @@ -40,16 +38,10 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = - [ - fontconfig - (lib.getDev openssl) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_15 - # aws-lc-sys requires CryptoKit's CommonCrypto, which is available on macOS 10.15+ - (darwinMinVersionHook "10.15") - ]; + buildInputs = [ + fontconfig + (lib.getDev openssl) + ]; # Required for golem-wasm-rpc's build.rs to find the required protobuf files # https://github.com/golemcloud/wasm-rpc/blob/v1.0.6/wasm-rpc/build.rs#L7 From 41c903a7dd1cffdc33bffe6f5e431154baf228c1 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 3 Jan 2025 17:33:44 +0000 Subject: [PATCH 3/9] moltenvk: remove code for macOS < 11 --- pkgs/by-name/mo/moltenvk/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/mo/moltenvk/package.nix b/pkgs/by-name/mo/moltenvk/package.nix index 72c59cb3dc91..d758e2915773 100644 --- a/pkgs/by-name/mo/moltenvk/package.nix +++ b/pkgs/by-name/mo/moltenvk/package.nix @@ -5,7 +5,6 @@ fetchpatch2, gitUpdater, apple-sdk_15, - darwinMinVersionHook, cereal, libcxx, glslang, @@ -31,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ apple-sdk_15 cereal - (darwinMinVersionHook "10.15") glslang spirv-cross spirv-headers From eb7ca3b17aeb95d57740fc426aba3772aeb33c41 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 3 Jan 2025 17:35:03 +0000 Subject: [PATCH 4/9] vfkit: remove code for macOS < 11 --- pkgs/by-name/vf/vfkit/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/vf/vfkit/package.nix b/pkgs/by-name/vf/vfkit/package.nix index eae906003eee..bba85ce7f198 100644 --- a/pkgs/by-name/vf/vfkit/package.nix +++ b/pkgs/by-name/vf/vfkit/package.nix @@ -3,7 +3,6 @@ apple-sdk_14, buildGoModule, darwin, - darwinMinVersionHook, fetchFromGitHub, testers, vfkit, @@ -36,7 +35,6 @@ buildGoModule rec { buildInputs = [ apple-sdk_14 - (darwinMinVersionHook "11") ]; postFixup = '' From 9a69c7090c126ef07afcdf6adf6342e88f40c946 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 3 Jan 2025 17:37:29 +0000 Subject: [PATCH 5/9] python312Packages.materialx: remove code for macOS < 11 --- pkgs/development/python-modules/materialx/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index 2e7af7b89b1f..b3ad7bbe0804 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -11,7 +11,6 @@ openimageio, imath, python, - darwinMinVersionHook, apple-sdk_14, }: @@ -40,7 +39,6 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_14 - (darwinMinVersionHook "10.15") ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 From cd670972bec82054e8dd8997c530e15564336c88 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 3 Jan 2025 17:38:32 +0000 Subject: [PATCH 6/9] dosbox-staging: remove code for macOS < 11 --- pkgs/by-name/do/dosbox-staging/package.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix index 43d4377d614a..4c92038abd3b 100644 --- a/pkgs/by-name/do/dosbox-staging/package.nix +++ b/pkgs/by-name/do/dosbox-staging/package.nix @@ -29,8 +29,6 @@ stdenv, testers, zlib-ng, - apple-sdk_15, - darwinMinVersionHook, }: stdenv.mkDerivation (finalAttrs: { @@ -81,11 +79,7 @@ stdenv.mkDerivation (finalAttrs: { speexdsp zlib-ng ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_15 - (darwinMinVersionHook "10.15") # from https://www.dosbox-staging.org/releases/macos/ - ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; outputs = [ "out" "man" ]; From e05898e313547e4b7a0cc65add68b91dec565801 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 3 Jan 2025 17:40:41 +0000 Subject: [PATCH 7/9] swift: remove code for macOS < 11 --- pkgs/development/compilers/swift/compiler/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index b8a415900322..09a9e59eff3d 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -234,13 +234,11 @@ in stdenv.mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_swift - (darwinMinVersionHook deploymentVersion) ]; # Will effectively be `buildInputs` when swift is put in `nativeBuildInputs`. depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ apple-sdk_swift - (darwinMinVersionHook deploymentVersion) ]; # This is a partial reimplementation of our setup hook. Because we reuse From 6240f6c3e33c453e22c8c9497ba586bd5969a23c Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 3 Jan 2025 17:35:36 +0000 Subject: [PATCH 8/9] swiftpm: remove code for macOS < 11 --- pkgs/development/compilers/swift/swiftpm/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index 76b2ad2d7696..cb30fa8242c7 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -18,7 +18,6 @@ makeWrapper, DarwinTools, # sw_vers cctools, # vtool - darwinMinVersionHook, xcbuild, CryptoKit, LocalAuthentication, @@ -387,7 +386,7 @@ let swift-driver swift-system swift-tools-support-core - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (darwinMinVersionHook "10.15.4") ]; + ]; cmakeFlags = [ "-DUSE_CMAKE_INSTALL=ON" @@ -422,8 +421,7 @@ stdenv.mkDerivation ( ++ lib.optionals stdenv.hostPlatform.isDarwin [ CryptoKit LocalAuthentication - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ (darwinMinVersionHook "10.15.4") ]; + ]; configurePhase = generated.configure From 793706e9e674766afa395656dffc918bc1469501 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 3 Jan 2025 17:36:09 +0000 Subject: [PATCH 9/9] swiftpm: remove old Darwin SDK pattern detritus --- pkgs/development/compilers/swift/default.nix | 1 - .../compilers/swift/swiftpm/default.nix | 17 +++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 085f2750d5c8..d00ff1f4e92e 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -77,7 +77,6 @@ let swiftpm = callPackage ./swiftpm { inherit (darwin) DarwinTools; - inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; swift = swiftNoSwiftDriver; }; diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index cb30fa8242c7..53fd9fcb8ac9 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -19,8 +19,6 @@ DarwinTools, # sw_vers cctools, # vtool xcbuild, - CryptoKit, - LocalAuthentication, }: let @@ -412,16 +410,11 @@ stdenv.mkDerivation ( swift swiftpm-bootstrap ]; - buildInputs = - [ - ncursesInput - sqlite - XCTest - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CryptoKit - LocalAuthentication - ]; + buildInputs = [ + ncursesInput + sqlite + XCTest + ]; configurePhase = generated.configure