pkgs/by-name/[ab].+: migrate to new apple sdk (#354097)

This commit is contained in:
Emily
2024-11-07 05:50:23 +00:00
committed by GitHub
11 changed files with 31 additions and 103 deletions
+1 -8
View File
@@ -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 = ''
+1 -10
View File
@@ -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"
+1 -4
View File
@@ -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
+1 -8
View File
@@ -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=";
+3 -15
View File
@@ -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";
};
}
-8
View File
@@ -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 = [
+1 -4
View File
@@ -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";
+1 -8
View File
@@ -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;
+7 -17
View File
@@ -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 =
+3 -10
View File
@@ -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";
};
}
+12 -11
View File
@@ -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 ];
};
}