From 4fbe41403dfa0ea20a28d0552802353d8a264be3 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 2 Sep 2024 19:27:03 -0400 Subject: [PATCH] darwin.CommonCrypto: remove and replace with stubs --- .../CommonCrypto/default.nix | 42 ------------------- .../darwin/apple-source-releases/default.nix | 1 - .../apple-source-releases/macos-11.0.1.nix | 1 - pkgs/top-level/darwin-packages.nix | 1 + 4 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix deleted file mode 100644 index 32e142981f2d..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, appleDerivation', stdenvNoCC }: - -appleDerivation' stdenvNoCC { - installPhase = '' - mkdir -p $out/include/CommonCrypto - cp include/* $out/include/CommonCrypto - ''; - - appleHeaders = '' - CommonCrypto/CommonBaseXX.h - CommonCrypto/CommonBigNum.h - CommonCrypto/CommonCMACSPI.h - CommonCrypto/CommonCRC.h - CommonCrypto/CommonCrypto.h - CommonCrypto/CommonCryptoError.h - CommonCrypto/CommonCryptoPriv.h - CommonCrypto/CommonCryptor.h - CommonCrypto/CommonCryptorSPI.h - CommonCrypto/CommonDH.h - CommonCrypto/CommonDigest.h - CommonCrypto/CommonDigestSPI.h - CommonCrypto/CommonECCryptor.h - CommonCrypto/CommonHMAC.h - CommonCrypto/CommonHMacSPI.h - CommonCrypto/CommonKeyDerivation.h - CommonCrypto/CommonKeyDerivationSPI.h - CommonCrypto/CommonNumerics.h - CommonCrypto/CommonRSACryptor.h - CommonCrypto/CommonRandom.h - CommonCrypto/CommonRandomSPI.h - CommonCrypto/CommonSymmetricKeywrap.h - CommonCrypto/aes.h - CommonCrypto/lionCompat.h - CommonCrypto/module.modulemap - ''; - - meta = with lib; { - maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.darwin; - license = licenses.apple-psl20; - }; -} diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index c5aa21827244..0161f7ff14dc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -261,7 +261,6 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { inherit (self.adv_cmds) ps locale; architecture = applePackage "architecture" "osx-10.11.6" "sha256-cUKeMx6mOAxBSRHIdfzsrR65Qv86m7+20XvpKqVfwVI=" {}; AvailabilityVersions = callPackage ./AvailabilityVersions/package.nix { }; - CommonCrypto = applePackage "CommonCrypto" "osx-10.12.6" "sha256-FLgODBrfv+XsGaAjddncYAm/BIJJYw6LcwX/z7ncKFM=" {}; configd = applePackage "configd" "osx-10.8.5" "sha256-6I3FWNjTgds5abEcZrD++s9b+P9a2+qUf8KFAb72DwI=" { Security = applePackage "Security/boot.nix" "osx-10.9.5" "sha256-7qr0IamjCXCobIJ6V9KtvbMBkJDfRCy4C5eqpHJlQLI=" {}; inherit (pkgs.darwin.apple_sdk.libs) xpc; diff --git a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix index 7e54ac9a1978..f827d95b74ef 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix @@ -3,7 +3,6 @@ { applePackage', callPackage }: { -CommonCrypto = applePackage' "CommonCrypto" "60178.40.2" "macos-11.0.1" "129gsxhhcxqycg0zjrdrz2ay4dv2ih1ckafqh33qrc499z8dam2p" {}; Csu = applePackage' "Csu" "88" "macos-11.0.1" "1lzp9x8iv60c2h12q2s89nf49b5hvpqq4a9li44zr2fxszn8lqxh" {}; ICU = callPackage ./ICU/package.nix { }; Libc = applePackage' "Libc" "1439.40.11" "macos-11.0.1" "12k5sbz2k1pl839w2lk9iw414zzl50zdjzgq2x6bm20yjbfj69qm" {}; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 1f8ce509550d..549bca1ad45c 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -70,6 +70,7 @@ makeScopeWithSplicing' { } // lib.genAttrs [ "CF" "CarbonHeaders" + "CommonCrypto" ] (mkStub apple_sdk.version); in