Skip to content

Commit

Permalink
Merge pull request #308863 from lucperkins/move-into-by-name
Browse files Browse the repository at this point in the history
treewide: move packages maintained by lucperkins to pkgs/by-name
  • Loading branch information
Aleksanaa committed May 6, 2024
2 parents 21b0896 + 1271860 commit 97ae4fc
Show file tree
Hide file tree
Showing 15 changed files with 4 additions and 35 deletions.
File renamed without changes.
File renamed without changes.
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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
File renamed without changes.
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 @@ -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 { };
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 { };
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 { };
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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 { };
Expand Down Expand Up @@ -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 { };
Expand Down Expand Up @@ -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 { };
Expand Down Expand Up @@ -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 { };
Expand Down

0 comments on commit 97ae4fc

Please sign in to comment.