Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: move packages maintained by lucperkins to pkgs/by-name #308863

Merged
merged 1 commit into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, pkg-config
, stdenv
, openssl
, Security
, darwin
}:

rustPlatform.buildRustPackage rec {
Expand All @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
, libiconv
, openssl
, rustPlatform
, Security
, stdenv
, SystemConfiguration
, darwin
}:

rustPlatform.buildRustPackage rec {
Expand All @@ -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;

Expand Down
30 changes: 0 additions & 30 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down Expand Up @@ -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 { };
Expand Down Expand Up @@ -4881,8 +4877,6 @@ with pkgs;

dante = callPackage ../servers/dante { };

dapr-cli = callPackage ../development/tools/dapr/cli { };

dasel = callPackage ../applications/misc/dasel { };

dasher = callPackage ../applications/accessibility/dasher { };
Expand Down Expand Up @@ -4957,8 +4951,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 {
Expand Down Expand Up @@ -5025,8 +5017,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 {
Expand Down Expand Up @@ -5550,8 +5540,6 @@ with pkgs;

hr = callPackage ../applications/misc/hr { };

humioctl = callPackage ../applications/logging/humioctl { };

huniq = callPackage ../tools/text/huniq { };

hunt = callPackage ../tools/misc/hunt { };
Expand Down Expand Up @@ -11329,8 +11317,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 {
Expand Down Expand Up @@ -14079,8 +14065,6 @@ with pkgs;

up = callPackage ../tools/misc/up { };

upbound = callPackage ../development/tools/upbound { };

upterm = callPackage ../tools/misc/upterm { };

upx = callPackage ../tools/compression/upx { };
Expand Down Expand Up @@ -16784,7 +16768,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;
};
Expand Down Expand Up @@ -16822,9 +16805,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;
};
Expand Down Expand Up @@ -17759,10 +17739,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 { };
Expand Down Expand Up @@ -18683,8 +18659,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 { };
Expand Down Expand Up @@ -40372,8 +40346,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 { };
Expand Down Expand Up @@ -40542,8 +40514,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 { };
Expand Down
Loading