various packages: use new darwin sdk pattern (#358263)

This commit is contained in:
Nick Cao
2024-12-04 10:02:04 -05:00
committed by GitHub
12 changed files with 7 additions and 52 deletions
@@ -2,8 +2,6 @@
lib,
rustPlatform,
fetchFromGitHub,
stdenv,
libiconv,
}:
rustPlatform.buildRustPackage rec {
@@ -19,8 +17,6 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU=";
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
checkFlags = [
# The following tests require empty CARGO_BUILD_TARGET env variable, but we
# set it ever since https://github.com/NixOS/nixpkgs/pull/298108.
+1 -3
View File
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, rustPlatform, stdenv, libiconv }:
{ lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "cargo-fuzz";
@@ -13,8 +13,6 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-sfvepPpYtgA0TuUlu0CD50HX933AVQbUGzJBNAzFR94=";
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
doCheck = false;
meta = with lib; {
-4
View File
@@ -2,8 +2,6 @@
, rustPlatform
, fetchFromGitHub
, nix-update-script
, stdenv
, libiconv
}:
rustPlatform.buildRustPackage rec {
@@ -19,8 +17,6 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
passthru = {
updateScript = nix-update-script { };
};
-5
View File
@@ -1,9 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, darwin
, libiconv
}:
rustPlatform.buildRustPackage {
@@ -19,8 +16,6 @@ rustPlatform.buildRustPackage {
cargoHash = "sha256-mMeHTYCUIZR3jVvTxfyH4I9wGfUdCWcyn9djnksAY8k=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
# Doc tests are broken on 0.3.3
doCheck = false;
+1 -5
View File
@@ -1,14 +1,11 @@
{ lib
, gitSupport ? true
, stdenv
, fetchFromGitHub
, rustPlatform
, cmake
, pandoc
, pkg-config
, zlib
, darwin
, libiconv
, installShellFiles
# once eza upstream gets support for setting up a compatibility symlink for exa, we should change
# the handling here from postInstall to passing the required argument to the builder.
@@ -29,8 +26,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-fXrw753Hn4fbeX6+GRoH9MKrH0udjxnBK7AVCHnqIcs=";
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
buildInputs = [ zlib ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
buildInputs = [ zlib ];
buildNoDefaultFeatures = true;
buildFeatures = lib.optional gitSupport "git";
@@ -8,7 +8,6 @@
, dbus
, testers
, openpgp-card-tools
, darwin
}:
rustPlatform.buildRustPackage rec {
@@ -27,10 +26,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ installShellFiles pkg-config rustPlatform.bindgenHook ];
buildInputs = [ pcsclite dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.PCSC
darwin.apple_sdk.frameworks.Security
];
buildInputs = [ pcsclite dbus ];
passthru = {
tests.version = testers.testVersion {
@@ -8,7 +8,6 @@
, zlib
, ostree
, stdenv
, darwin
, util-linux
, skopeo
, gnutar
@@ -44,9 +43,6 @@ rustPlatform.buildRustPackage rec {
openssl
zlib
ostree
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Security
];
checkFlags = [
+2 -9
View File
@@ -3,9 +3,6 @@
, fetchFromGitHub
, pkg-config
, openssl
, stdenv
, libiconv
, darwin
, nix-update-script
}:
@@ -23,12 +20,8 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-OjA0OKotAdRLGRkl8n3Gn2+Z8JVcGjQYHtOszWnnFdM=";
nativeBuildInputs = [ pkg-config ];
buildInputs =
[ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
libiconv
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.CoreServices
];
buildInputs = [ openssl ];
passthru.updateScript = nix-update-script { };
@@ -6,7 +6,6 @@
, nettle
, openssl
, sqlite
, darwin
}:
rustPlatform.buildRustPackage rec {
@@ -31,9 +30,6 @@ rustPlatform.buildRustPackage rec {
nettle
openssl
sqlite
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];
# gpgconf: error creating socket directory
@@ -1,6 +1,5 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
@@ -9,7 +8,6 @@
rustc,
setuptools,
setuptools-rust,
libiconv,
}:
buildPythonPackage rec {
@@ -42,8 +40,6 @@ buildPythonPackage rec {
cargo
];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
# has no tests
doCheck = false;
+1 -2
View File
@@ -6,7 +6,6 @@
, pkg-config
, protobuf
, cacert
, Security
, garage
, nixosTests
}:
@@ -35,7 +34,7 @@ let
buildInputs = [
openssl
] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
];
checkInputs = [
cacert
+1 -3
View File
@@ -3481,9 +3481,7 @@ with pkgs;
gaphor = python3Packages.callPackage ../tools/misc/gaphor { };
inherit (callPackages ../tools/filesystems/garage {
inherit (darwin.apple_sdk.frameworks) Security;
})
inherit (callPackages ../tools/filesystems/garage { })
garage
garage_0_8 garage_0_9
garage_0_8_7 garage_0_9_4