Merge pull request #308863 from lucperkins/move-into-by-name

treewide: move packages maintained by lucperkins to pkgs/by-name
This commit is contained in:
Aleksana 2024-05-06 22:56:00 +08:00 committed by GitHub
commit 97ae4fc750
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 4 additions and 35 deletions

View File

@ -4,7 +4,7 @@
, pkg-config
, stdenv
, openssl
, Security
, darwin
}:
rustPlatform.buildRustPackage rec {
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]);
# Checks need to be disabled here because the current test suite makes assumptions
# about the surrounding environment that aren't Nix friendly. See these lines for specifics:

View File

@ -4,9 +4,8 @@
, libiconv
, openssl
, rustPlatform
, Security
, stdenv
, SystemConfiguration
, darwin
}:
rustPlatform.buildRustPackage rec {
@ -25,7 +24,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ perl ];
buildInputs = [ libiconv openssl ]
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]);
doCheck = false;

View File

@ -311,8 +311,6 @@ with pkgs;
asn1c = callPackage ../development/compilers/asn1c { };
assemblyscript = callPackage ../development/compilers/assemblyscript { };
authz0 = callPackage ../tools/security/authz0 { };
auth0-cli = callPackage ../tools/admin/auth0-cli { };
@ -769,8 +767,6 @@ with pkgs;
protoc-gen-prost-serde = callPackage ../development/tools/protoc-gen-prost-serde { };
protoc-gen-rust = callPackage ../development/tools/protoc-gen-rust { };
protoc-gen-tonic = callPackage ../development/tools/protoc-gen-tonic { };
protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { };
@ -4895,8 +4891,6 @@ with pkgs;
dante = callPackage ../servers/dante { };
dapr-cli = callPackage ../development/tools/dapr/cli { };
dasel = callPackage ../applications/misc/dasel { };
dasher = callPackage ../applications/accessibility/dasher { };
@ -4971,8 +4965,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
refinery-cli = callPackage ../development/tools/refinery-cli { };
digitemp = callPackage ../tools/misc/digitemp { };
dijo = callPackage ../tools/misc/dijo {
@ -5039,8 +5031,6 @@ with pkgs;
dolibarr = callPackage ../servers/web-apps/dolibarr { };
doppler = callPackage ../tools/security/doppler { };
dosage = callPackage ../applications/graphics/dosage { };
dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter {
@ -5564,8 +5554,6 @@ with pkgs;
hr = callPackage ../applications/misc/hr { };
humioctl = callPackage ../applications/logging/humioctl { };
huniq = callPackage ../tools/text/huniq { };
hunt = callPackage ../tools/misc/hunt { };
@ -11337,8 +11325,6 @@ with pkgs;
ogdf = callPackage ../development/libraries/ogdf { };
oh-my-posh = callPackage ../development/tools/oh-my-posh { };
oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { };
ola = callPackage ../applications/misc/ola {
@ -14087,8 +14073,6 @@ with pkgs;
up = callPackage ../tools/misc/up { };
upbound = callPackage ../development/tools/upbound { };
upterm = callPackage ../tools/misc/upterm { };
upx = callPackage ../tools/compression/upx { };
@ -16792,7 +16776,6 @@ with pkgs;
cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { };
cargo-play = callPackage ../development/tools/rust/cargo-play { };
cargo-profiler = callPackage ../development/tools/rust/cargo-profiler { };
cargo-raze = callPackage ../development/tools/rust/cargo-raze {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -16830,9 +16813,6 @@ with pkgs;
cargo-vet = callPackage ../development/tools/rust/cargo-vet {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-wasi = callPackage ../development/tools/rust/cargo-wasi {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-watch = callPackage ../development/tools/rust/cargo-watch {
inherit (darwin.apple_sdk.frameworks) Foundation Cocoa;
};
@ -17767,10 +17747,6 @@ with pkgs;
waagent = callPackage ../applications/networking/cluster/waagent { };
wapm-cli = callPackage ../tools/package-management/wapm/cli {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
wasm = ocamlPackages.wasm;
wasm3 = callPackage ../development/interpreters/wasm3 { };
@ -18693,8 +18669,6 @@ with pkgs;
easypdkprog = callPackage ../development/embedded/easypdkprog { };
eclint = callPackage ../development/tools/eclint { };
editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { };
editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { };
@ -40373,8 +40347,6 @@ with pkgs;
twitch-cli = callPackage ../development/tools/twitch-cli { };
twiggy = callPackage ../development/tools/twiggy { };
uacme = callPackage ../tools/admin/uacme { };
ufiformat = callPackage ../tools/system/ufiformat { };
@ -40543,8 +40515,6 @@ with pkgs;
with-shell = callPackage ../applications/misc/with-shell { };
wizer = darwin.apple_sdk_11_0.callPackage ../development/tools/wizer { };
wmutils-core = callPackage ../tools/X11/wmutils-core { };
wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { };