Move lucperkins packages into by-name
This commit is contained in:
parent
84419726df
commit
1271860b5e
15 changed files with 4 additions and 35 deletions
|
@ -4,7 +4,7 @@
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, stdenv
|
, stdenv
|
||||||
, openssl
|
, openssl
|
||||||
, Security
|
, darwin
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
|
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
|
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
|
# 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:
|
# about the surrounding environment that aren't Nix friendly. See these lines for specifics:
|
|
@ -4,9 +4,8 @@
|
||||||
, libiconv
|
, libiconv
|
||||||
, openssl
|
, openssl
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, Security
|
|
||||||
, stdenv
|
, stdenv
|
||||||
, SystemConfiguration
|
, darwin
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
|
@ -25,7 +24,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
nativeBuildInputs = [ perl ];
|
nativeBuildInputs = [ perl ];
|
||||||
|
|
||||||
buildInputs = [ libiconv openssl ]
|
buildInputs = [ libiconv openssl ]
|
||||||
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]);
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
|
@ -311,8 +311,6 @@ with pkgs;
|
||||||
|
|
||||||
asn1c = callPackage ../development/compilers/asn1c { };
|
asn1c = callPackage ../development/compilers/asn1c { };
|
||||||
|
|
||||||
assemblyscript = callPackage ../development/compilers/assemblyscript { };
|
|
||||||
|
|
||||||
authz0 = callPackage ../tools/security/authz0 { };
|
authz0 = callPackage ../tools/security/authz0 { };
|
||||||
|
|
||||||
auth0-cli = callPackage ../tools/admin/auth0-cli { };
|
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-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-tonic = callPackage ../development/tools/protoc-gen-tonic { };
|
||||||
|
|
||||||
protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { };
|
protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { };
|
||||||
|
@ -4881,8 +4877,6 @@ with pkgs;
|
||||||
|
|
||||||
dante = callPackage ../servers/dante { };
|
dante = callPackage ../servers/dante { };
|
||||||
|
|
||||||
dapr-cli = callPackage ../development/tools/dapr/cli { };
|
|
||||||
|
|
||||||
dasel = callPackage ../applications/misc/dasel { };
|
dasel = callPackage ../applications/misc/dasel { };
|
||||||
|
|
||||||
dasher = callPackage ../applications/accessibility/dasher { };
|
dasher = callPackage ../applications/accessibility/dasher { };
|
||||||
|
@ -4957,8 +4951,6 @@ with pkgs;
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
};
|
};
|
||||||
|
|
||||||
refinery-cli = callPackage ../development/tools/refinery-cli { };
|
|
||||||
|
|
||||||
digitemp = callPackage ../tools/misc/digitemp { };
|
digitemp = callPackage ../tools/misc/digitemp { };
|
||||||
|
|
||||||
dijo = callPackage ../tools/misc/dijo {
|
dijo = callPackage ../tools/misc/dijo {
|
||||||
|
@ -5025,8 +5017,6 @@ with pkgs;
|
||||||
|
|
||||||
dolibarr = callPackage ../servers/web-apps/dolibarr { };
|
dolibarr = callPackage ../servers/web-apps/dolibarr { };
|
||||||
|
|
||||||
doppler = callPackage ../tools/security/doppler { };
|
|
||||||
|
|
||||||
dosage = callPackage ../applications/graphics/dosage { };
|
dosage = callPackage ../applications/graphics/dosage { };
|
||||||
|
|
||||||
dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter {
|
dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter {
|
||||||
|
@ -5550,8 +5540,6 @@ with pkgs;
|
||||||
|
|
||||||
hr = callPackage ../applications/misc/hr { };
|
hr = callPackage ../applications/misc/hr { };
|
||||||
|
|
||||||
humioctl = callPackage ../applications/logging/humioctl { };
|
|
||||||
|
|
||||||
huniq = callPackage ../tools/text/huniq { };
|
huniq = callPackage ../tools/text/huniq { };
|
||||||
|
|
||||||
hunt = callPackage ../tools/misc/hunt { };
|
hunt = callPackage ../tools/misc/hunt { };
|
||||||
|
@ -11329,8 +11317,6 @@ with pkgs;
|
||||||
|
|
||||||
ogdf = callPackage ../development/libraries/ogdf { };
|
ogdf = callPackage ../development/libraries/ogdf { };
|
||||||
|
|
||||||
oh-my-posh = callPackage ../development/tools/oh-my-posh { };
|
|
||||||
|
|
||||||
oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { };
|
oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { };
|
||||||
|
|
||||||
ola = callPackage ../applications/misc/ola {
|
ola = callPackage ../applications/misc/ola {
|
||||||
|
@ -14079,8 +14065,6 @@ with pkgs;
|
||||||
|
|
||||||
up = callPackage ../tools/misc/up { };
|
up = callPackage ../tools/misc/up { };
|
||||||
|
|
||||||
upbound = callPackage ../development/tools/upbound { };
|
|
||||||
|
|
||||||
upterm = callPackage ../tools/misc/upterm { };
|
upterm = callPackage ../tools/misc/upterm { };
|
||||||
|
|
||||||
upx = callPackage ../tools/compression/upx { };
|
upx = callPackage ../tools/compression/upx { };
|
||||||
|
@ -16784,7 +16768,6 @@ with pkgs;
|
||||||
|
|
||||||
cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { };
|
cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { };
|
||||||
cargo-play = callPackage ../development/tools/rust/cargo-play { };
|
cargo-play = callPackage ../development/tools/rust/cargo-play { };
|
||||||
cargo-profiler = callPackage ../development/tools/rust/cargo-profiler { };
|
|
||||||
cargo-raze = callPackage ../development/tools/rust/cargo-raze {
|
cargo-raze = callPackage ../development/tools/rust/cargo-raze {
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
};
|
};
|
||||||
|
@ -16822,9 +16805,6 @@ with pkgs;
|
||||||
cargo-vet = callPackage ../development/tools/rust/cargo-vet {
|
cargo-vet = callPackage ../development/tools/rust/cargo-vet {
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
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 {
|
cargo-watch = callPackage ../development/tools/rust/cargo-watch {
|
||||||
inherit (darwin.apple_sdk.frameworks) Foundation Cocoa;
|
inherit (darwin.apple_sdk.frameworks) Foundation Cocoa;
|
||||||
};
|
};
|
||||||
|
@ -17759,10 +17739,6 @@ with pkgs;
|
||||||
|
|
||||||
waagent = callPackage ../applications/networking/cluster/waagent { };
|
waagent = callPackage ../applications/networking/cluster/waagent { };
|
||||||
|
|
||||||
wapm-cli = callPackage ../tools/package-management/wapm/cli {
|
|
||||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
|
|
||||||
};
|
|
||||||
|
|
||||||
wasm = ocamlPackages.wasm;
|
wasm = ocamlPackages.wasm;
|
||||||
|
|
||||||
wasm3 = callPackage ../development/interpreters/wasm3 { };
|
wasm3 = callPackage ../development/interpreters/wasm3 { };
|
||||||
|
@ -18683,8 +18659,6 @@ with pkgs;
|
||||||
|
|
||||||
easypdkprog = callPackage ../development/embedded/easypdkprog { };
|
easypdkprog = callPackage ../development/embedded/easypdkprog { };
|
||||||
|
|
||||||
eclint = callPackage ../development/tools/eclint { };
|
|
||||||
|
|
||||||
editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { };
|
editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { };
|
||||||
|
|
||||||
editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { };
|
editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { };
|
||||||
|
@ -40372,8 +40346,6 @@ with pkgs;
|
||||||
|
|
||||||
twitch-cli = callPackage ../development/tools/twitch-cli { };
|
twitch-cli = callPackage ../development/tools/twitch-cli { };
|
||||||
|
|
||||||
twiggy = callPackage ../development/tools/twiggy { };
|
|
||||||
|
|
||||||
uacme = callPackage ../tools/admin/uacme { };
|
uacme = callPackage ../tools/admin/uacme { };
|
||||||
|
|
||||||
ufiformat = callPackage ../tools/system/ufiformat { };
|
ufiformat = callPackage ../tools/system/ufiformat { };
|
||||||
|
@ -40542,8 +40514,6 @@ with pkgs;
|
||||||
|
|
||||||
with-shell = callPackage ../applications/misc/with-shell { };
|
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-core = callPackage ../tools/X11/wmutils-core { };
|
||||||
|
|
||||||
wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { };
|
wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { };
|
||||||
|
|
Loading…
Reference in a new issue