about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/by-name/as/assemblyscript/package.nix (renamed from pkgs/development/compilers/assemblyscript/default.nix)0
-rw-r--r--pkgs/by-name/ca/cargo-profiler/package.nix (renamed from pkgs/development/tools/rust/cargo-profiler/default.nix)0
-rw-r--r--pkgs/by-name/ca/cargo-wasi/package.nix (renamed from pkgs/development/tools/rust/cargo-wasi/default.nix)4
-rw-r--r--pkgs/by-name/da/dapr-cli/package.nix (renamed from pkgs/development/tools/dapr/cli/default.nix)0
-rw-r--r--pkgs/by-name/do/doppler/package.nix (renamed from pkgs/tools/security/doppler/default.nix)0
-rw-r--r--pkgs/by-name/ec/eclint/package.nix (renamed from pkgs/development/tools/eclint/default.nix)0
-rw-r--r--pkgs/by-name/hu/humioctl/package.nix (renamed from pkgs/applications/logging/humioctl/default.nix)0
-rw-r--r--pkgs/by-name/oh/oh-my-posh/package.nix (renamed from pkgs/development/tools/oh-my-posh/default.nix)0
-rw-r--r--pkgs/by-name/pr/protoc-gen-rust/package.nix (renamed from pkgs/development/tools/protoc-gen-rust/default.nix)0
-rw-r--r--pkgs/by-name/re/refinery-cli/package.nix (renamed from pkgs/development/tools/refinery-cli/default.nix)0
-rw-r--r--pkgs/by-name/tw/twiggy/package.nix (renamed from pkgs/development/tools/twiggy/default.nix)0
-rw-r--r--pkgs/by-name/up/upbound/package.nix (renamed from pkgs/development/tools/upbound/default.nix)0
-rw-r--r--pkgs/by-name/wa/wapm/package.nix (renamed from pkgs/tools/package-management/wapm/cli/default.nix)5
-rw-r--r--pkgs/by-name/wi/wizer/package.nix (renamed from pkgs/development/tools/wizer/default.nix)0
-rw-r--r--pkgs/top-level/all-packages.nix30
15 files changed, 4 insertions, 35 deletions
diff --git a/pkgs/development/compilers/assemblyscript/default.nix b/pkgs/by-name/as/assemblyscript/package.nix
index b0fd15d47941a..b0fd15d47941a 100644
--- a/pkgs/development/compilers/assemblyscript/default.nix
+++ b/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
index 595bf6d8d032e..595bf6d8d032e 100644
--- a/pkgs/development/tools/rust/cargo-profiler/default.nix
+++ b/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
index bead01fed4ed4..8e688c28cad08 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
index a672b9637e33b..a672b9637e33b 100644
--- a/pkgs/development/tools/dapr/cli/default.nix
+++ b/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
index cdeb12f08de2c..cdeb12f08de2c 100644
--- a/pkgs/tools/security/doppler/default.nix
+++ b/pkgs/by-name/do/doppler/package.nix
diff --git a/pkgs/development/tools/eclint/default.nix b/pkgs/by-name/ec/eclint/package.nix
index 3f449489743a1..3f449489743a1 100644
--- a/pkgs/development/tools/eclint/default.nix
+++ b/pkgs/by-name/ec/eclint/package.nix
diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/by-name/hu/humioctl/package.nix
index d9f780c0b3a21..d9f780c0b3a21 100644
--- a/pkgs/applications/logging/humioctl/default.nix
+++ b/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
index c2dd4cb8e5c61..c2dd4cb8e5c61 100644
--- a/pkgs/development/tools/oh-my-posh/default.nix
+++ b/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
index bba32dd81a4ed..bba32dd81a4ed 100644
--- a/pkgs/development/tools/protoc-gen-rust/default.nix
+++ b/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
index 609a2618f86c7..609a2618f86c7 100644
--- a/pkgs/development/tools/refinery-cli/default.nix
+++ b/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
index 25d8ab244d9ef..25d8ab244d9ef 100644
--- a/pkgs/development/tools/twiggy/default.nix
+++ b/pkgs/by-name/tw/twiggy/package.nix
diff --git a/pkgs/development/tools/upbound/default.nix b/pkgs/by-name/up/upbound/package.nix
index 92031aa6dddf0..92031aa6dddf0 100644
--- a/pkgs/development/tools/upbound/default.nix
+++ b/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
index bd345ca6940d1..658aa93ce758e 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
index 7a46d673af9c9..7a46d673af9c9 100644
--- a/pkgs/development/tools/wizer/default.nix
+++ b/pkgs/by-name/wi/wizer/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81ada7efa1a76..cd7277896fa6b 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 { };