From d27020a7b1f4e60b6f5e103aca6fbfbe259f1568 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 6 Nov 2024 13:12:38 -0800 Subject: [PATCH 01/11] agate: migrate to new apple sdk structure --- pkgs/by-name/ag/agate/package.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix index 1d2763dd324a..53f44b3ef7fd 100644 --- a/pkgs/by-name/ag/agate/package.nix +++ b/pkgs/by-name/ag/agate/package.nix @@ -4,8 +4,6 @@ nixosTests, fetchFromGitHub, rustPlatform, - libiconv, - darwin, openssl, pkg-config, nix-update-script, @@ -26,12 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = [ openssl ]; doInstallCheck = true; installCheckPhase = '' From 28329a0d5f17d794b7e370b1f5eee52e2ae9b5db Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 6 Nov 2024 13:41:03 -0800 Subject: [PATCH 02/11] anchor: migrate to new apple sdk structure --- pkgs/by-name/an/anchor/package.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix index c2abce641531..1acd8246a1d8 100644 --- a/pkgs/by-name/an/anchor/package.nix +++ b/pkgs/by-name/an/anchor/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,9 +16,7 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoPatches = [ - ./0001-update-time-rs.patch - ]; + cargoPatches = [ ./0001-update-time-rs.patch ]; cargoLock = { lockFile = ./Cargo.lock; @@ -29,11 +25,6 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - checkFlags = [ # the following test cases try to access network, skip them "--skip=tests::test_check_and_get_full_commit_when_full_commit" From ffeb11e9734de73a0787f7375e7d18abd4276584 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 6 Nov 2024 13:46:28 -0800 Subject: [PATCH 03/11] asfa: migrate to new apple sdk structure --- pkgs/by-name/as/asfa/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/as/asfa/package.nix b/pkgs/by-name/as/asfa/package.nix index e9be2526dd72..4d60c0b1d5e8 100644 --- a/pkgs/by-name/as/asfa/package.nix +++ b/pkgs/by-name/as/asfa/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, stdenv, - darwin, help2man, openssl, pkg-config, @@ -29,9 +28,7 @@ rustPlatform.buildRustPackage { "man" ]; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ help2man From 8f355174381f6baff8d34616a65f65f7f85f10bf Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 6 Nov 2024 13:52:54 -0800 Subject: [PATCH 04/11] asm-lsp: migrate to new apple sdk structure --- pkgs/by-name/as/asm-lsp/package.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index 08da3009f6bb..28b97237e0f9 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -5,8 +5,6 @@ fetchFromGitHub, pkg-config, openssl, - darwin, - libiconv, }: let pname = "asm-lsp"; @@ -24,12 +22,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.buildPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - libiconv - ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; cargoHash = "sha256-AtCnYOOtViMpg+rz8miuBZg1pENBPaf9kamSPaVUyiw="; From 15ea5e43f427455b1aea24383a4e309aa516be63 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 6 Nov 2024 13:56:17 -0800 Subject: [PATCH 05/11] atac: migrate to new apple sdk structure --- pkgs/by-name/at/atac/package.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index 000b41b1b904..2ed394ee20ae 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, pkg-config, oniguruma, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { pname = "atac"; @@ -20,19 +18,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-sNgtqvFiwHSYMDf0379i8Yl9NrkCRVLo/ogjbHFgKBY="; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - oniguruma - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ oniguruma ]; env = { RUSTONIG_SYSTEM_LIBONIG = true; @@ -42,7 +30,7 @@ rustPlatform.buildRustPackage rec { description = "Simple API client (postman like) in your terminal"; homepage = "https://github.com/Julien-cpsn/ATAC"; license = licenses.mit; - maintainers = with maintainers; [vinnymeller]; + maintainers = with maintainers; [ vinnymeller ]; mainProgram = "atac"; }; } From 9b0eff2d00d64687ad6a624b82a12394bff9b6d4 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 6 Nov 2024 14:01:04 -0800 Subject: [PATCH 06/11] attract-mode: migrate to new apple sdk structure --- pkgs/by-name/at/attract-mode/package.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/by-name/at/attract-mode/package.nix b/pkgs/by-name/at/attract-mode/package.nix index 1a488894e8dd..2e3117b04db8 100644 --- a/pkgs/by-name/at/attract-mode/package.nix +++ b/pkgs/by-name/at/attract-mode/package.nix @@ -13,7 +13,6 @@ zlib, openal, fontconfig, - darwin, }: stdenv.mkDerivation { @@ -43,13 +42,6 @@ stdenv.mkDerivation { ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openal fontconfig - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Carbon - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.CoreVideo - darwin.apple_sdk.frameworks.OpenAL ]; makeFlags = [ From 409fcceb99390e9015cd123bbf0b871fee3f1e94 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 6 Nov 2024 14:03:16 -0800 Subject: [PATCH 07/11] avbroot: migrate to new apple sdk structure --- pkgs/by-name/av/avbroot/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix index 249ed14233ee..9b245baf8418 100644 --- a/pkgs/by-name/av/avbroot/package.nix +++ b/pkgs/by-name/av/avbroot/package.nix @@ -6,7 +6,6 @@ protobuf, bzip2, stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -33,9 +32,7 @@ rustPlatform.buildRustPackage rec { protobuf ]; - buildInputs = [ - bzip2 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ bzip2 ]; meta = { description = "Sign (and root) Android A/B OTAs with custom keys while preserving Android Verified Boot"; From 852656d6b3f3aa1976fe66ccc43519dce95de9f0 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 6 Nov 2024 14:06:56 -0800 Subject: [PATCH 08/11] bacon: migrate to new apple sdk structure --- pkgs/by-name/ba/bacon/package.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 21b4295f0a1d..b5dd84fdbea4 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitHub, - darwin, versionCheckHook, nix-update-script, }: @@ -21,13 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-rlWNrkzUDs3rbQ5ZV4fKU/EKEy4fVbxEP0+wNwXi7Ag="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - - nativeInstallCheckInputs = [ - versionCheckHook - ]; + nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; From b1840e418cd373e470552419e17fb027ae416f5c Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 6 Nov 2024 14:15:22 -0800 Subject: [PATCH 09/11] biome: migrate to new apple sdk structure --- pkgs/by-name/bi/biome/package.nix | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index 6fe531b2df0d..993e087d6dec 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -6,8 +6,6 @@ libgit2, rust-jemalloc-sys, zlib, - stdenv, - darwin, git, }: rustPlatform.buildRustPackage rec { @@ -23,23 +21,15 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-4vITbsXfgNFoeWMHz7a9Rk7FrsEZRe75nHiyHSMujEQ="; - nativeBuildInputs = [ - pkg-config + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libgit2 + rust-jemalloc-sys + zlib ]; - buildInputs = - [ - libgit2 - rust-jemalloc-sys - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - nativeCheckInputs = [ - git - ]; + nativeCheckInputs = [ git ]; cargoBuildFlags = [ "-p=biome_cli" ]; cargoTestFlags = From 988bb62ec6aa710265581772b83acceb681d90e0 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 6 Nov 2024 14:19:18 -0800 Subject: [PATCH 10/11] buckle: migrate to new apple sdk structure --- pkgs/by-name/bu/buckle/package.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/bu/buckle/package.nix b/pkgs/by-name/bu/buckle/package.nix index 51c5e1486d54..a4b96ce46927 100644 --- a/pkgs/by-name/bu/buckle/package.nix +++ b/pkgs/by-name/bu/buckle/package.nix @@ -1,9 +1,7 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { @@ -18,18 +16,13 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eWhcDzw+6I5N0dse5avwhcQ/y6YZ6b3QKyBwWBrA/xo="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - checkFlags = [ # Both tests access the network. "--skip=test_buck2_latest" "--skip=test_buck2_specific_version" ]; - meta = with lib; { + meta = { description = "Buck2 launcher"; longDescription = '' Buckle is a launcher for [Buck2](https://buck2.build). It manages @@ -39,8 +32,8 @@ rustPlatform.buildRustPackage rec { enforcing the prelude is upgraded in sync. ''; homepage = "https://github.com/benbrittain/buckle"; - license = licenses.mit; - maintainers = with maintainers; [ cbarrete ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ cbarrete ]; mainProgram = "buckle"; }; } From 31a776f3472806088a90d2d2a54fc63bfa3cdaed Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 6 Nov 2024 14:21:23 -0800 Subject: [PATCH 11/11] bulloak: migrate to new apple sdk, elide "with lib" --- pkgs/by-name/bu/bulloak/package.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/bu/bulloak/package.nix b/pkgs/by-name/bu/bulloak/package.nix index 6b395068e914..36ee18ae8175 100644 --- a/pkgs/by-name/bu/bulloak/package.nix +++ b/pkgs/by-name/bu/bulloak/package.nix @@ -1,9 +1,9 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, fetchurl -, stdenv -, darwin +{ + lib, + fetchFromGitHub, + rustPlatform, + fetchurl, + stdenv, }: let @@ -42,19 +42,20 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-lj/wmLu4cBjDjzMD8DlIz+6Rnag0h+zWiE7lfcTC7lY="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; - # tests run in CI on the source repo doCheck = false; # provide the list of solc versions to the `svm-rs-builds` dependency SVM_RELEASES_LIST_JSON = solc-versions.${stdenv.hostPlatform.system}; - meta = with lib; { + meta = { description = "Solidity test generator based on the Branching Tree Technique"; homepage = "https://github.com/alexfertel/bulloak"; - license = with licenses; [ mit asl20 ]; + license = with lib.licenses; [ + mit + asl20 + ]; mainProgram = "bulloak"; - maintainers = with maintainers; [ beeb ]; + maintainers = with lib.maintainers; [ beeb ]; }; }