From 1271860b5eb39783f3bba73bcebc9592da2d181f Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Fri, 3 May 2024 15:37:38 -0300 Subject: [PATCH] Move lucperkins packages into by-name --- .../as/assemblyscript/package.nix} | 0 .../ca/cargo-profiler/package.nix} | 0 .../ca/cargo-wasi/package.nix} | 4 +-- .../da/dapr-cli/package.nix} | 0 .../do/doppler/package.nix} | 0 .../ec/eclint/package.nix} | 0 .../hu/humioctl/package.nix} | 0 .../oh/oh-my-posh/package.nix} | 0 .../pr/protoc-gen-rust/package.nix} | 0 .../re/refinery-cli/package.nix} | 0 .../tw/twiggy/package.nix} | 0 .../up/upbound/package.nix} | 0 .../wa/wapm/package.nix} | 5 ++-- .../wi/wizer/package.nix} | 0 pkgs/top-level/all-packages.nix | 30 ------------------- 15 files changed, 4 insertions(+), 35 deletions(-) rename pkgs/{development/compilers/assemblyscript/default.nix => by-name/as/assemblyscript/package.nix} (100%) rename pkgs/{development/tools/rust/cargo-profiler/default.nix => by-name/ca/cargo-profiler/package.nix} (100%) rename pkgs/{development/tools/rust/cargo-wasi/default.nix => by-name/ca/cargo-wasi/package.nix} (91%) rename pkgs/{development/tools/dapr/cli/default.nix => by-name/da/dapr-cli/package.nix} (100%) rename pkgs/{tools/security/doppler/default.nix => by-name/do/doppler/package.nix} (100%) rename pkgs/{development/tools/eclint/default.nix => by-name/ec/eclint/package.nix} (100%) rename pkgs/{applications/logging/humioctl/default.nix => by-name/hu/humioctl/package.nix} (100%) rename pkgs/{development/tools/oh-my-posh/default.nix => by-name/oh/oh-my-posh/package.nix} (100%) rename pkgs/{development/tools/protoc-gen-rust/default.nix => by-name/pr/protoc-gen-rust/package.nix} (100%) rename pkgs/{development/tools/refinery-cli/default.nix => by-name/re/refinery-cli/package.nix} (100%) rename pkgs/{development/tools/twiggy/default.nix => by-name/tw/twiggy/package.nix} (100%) rename pkgs/{development/tools/upbound/default.nix => by-name/up/upbound/package.nix} (100%) rename pkgs/{tools/package-management/wapm/cli/default.nix => by-name/wa/wapm/package.nix} (86%) rename pkgs/{development/tools/wizer/default.nix => by-name/wi/wizer/package.nix} (100%) diff --git a/pkgs/development/compilers/assemblyscript/default.nix b/pkgs/by-name/as/assemblyscript/package.nix similarity index 100% rename from pkgs/development/compilers/assemblyscript/default.nix rename to pkgs/by-name/as/assemblyscript/package.nix diff --git a/pkgs/development/tools/rust/cargo-profiler/default.nix b/pkgs/by-name/ca/cargo-profiler/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-profiler/default.nix rename to pkgs/by-name/ca/cargo-profiler/package.nix diff --git a/pkgs/development/tools/rust/cargo-wasi/default.nix b/pkgs/by-name/ca/cargo-wasi/package.nix similarity index 91% rename from pkgs/development/tools/rust/cargo-wasi/default.nix rename to pkgs/by-name/ca/cargo-wasi/package.nix index bead01fed4ed..8e688c28cad0 100644 --- a/pkgs/development/tools/rust/cargo-wasi/default.nix +++ b/pkgs/by-name/ca/cargo-wasi/package.nix @@ -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: diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/by-name/da/dapr-cli/package.nix similarity index 100% rename from pkgs/development/tools/dapr/cli/default.nix rename to pkgs/by-name/da/dapr-cli/package.nix diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/by-name/do/doppler/package.nix similarity index 100% rename from pkgs/tools/security/doppler/default.nix rename to pkgs/by-name/do/doppler/package.nix diff --git a/pkgs/development/tools/eclint/default.nix b/pkgs/by-name/ec/eclint/package.nix similarity index 100% rename from pkgs/development/tools/eclint/default.nix rename to pkgs/by-name/ec/eclint/package.nix diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/by-name/hu/humioctl/package.nix similarity index 100% rename from pkgs/applications/logging/humioctl/default.nix rename to pkgs/by-name/hu/humioctl/package.nix diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/by-name/oh/oh-my-posh/package.nix similarity index 100% rename from pkgs/development/tools/oh-my-posh/default.nix rename to pkgs/by-name/oh/oh-my-posh/package.nix diff --git a/pkgs/development/tools/protoc-gen-rust/default.nix b/pkgs/by-name/pr/protoc-gen-rust/package.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-rust/default.nix rename to pkgs/by-name/pr/protoc-gen-rust/package.nix diff --git a/pkgs/development/tools/refinery-cli/default.nix b/pkgs/by-name/re/refinery-cli/package.nix similarity index 100% rename from pkgs/development/tools/refinery-cli/default.nix rename to pkgs/by-name/re/refinery-cli/package.nix diff --git a/pkgs/development/tools/twiggy/default.nix b/pkgs/by-name/tw/twiggy/package.nix similarity index 100% rename from pkgs/development/tools/twiggy/default.nix rename to pkgs/by-name/tw/twiggy/package.nix diff --git a/pkgs/development/tools/upbound/default.nix b/pkgs/by-name/up/upbound/package.nix similarity index 100% rename from pkgs/development/tools/upbound/default.nix rename to pkgs/by-name/up/upbound/package.nix diff --git a/pkgs/tools/package-management/wapm/cli/default.nix b/pkgs/by-name/wa/wapm/package.nix similarity index 86% rename from pkgs/tools/package-management/wapm/cli/default.nix rename to pkgs/by-name/wa/wapm/package.nix index bd345ca6940d..658aa93ce758 100644 --- a/pkgs/tools/package-management/wapm/cli/default.nix +++ b/pkgs/by-name/wa/wapm/package.nix @@ -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; diff --git a/pkgs/development/tools/wizer/default.nix b/pkgs/by-name/wi/wizer/package.nix similarity index 100% rename from pkgs/development/tools/wizer/default.nix rename to pkgs/by-name/wi/wizer/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81ada7efa1a7..cd7277896fa6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; @@ -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 { }; @@ -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 { @@ -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 { @@ -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 { }; @@ -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 { @@ -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 { }; @@ -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; }; @@ -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; }; @@ -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 { }; @@ -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 { }; @@ -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 { }; @@ -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 { };