From 6f7502f325084646dbc9b04fb7e2fd9cace7b25b Mon Sep 17 00:00:00 2001 From: Jamie Quigley Date: Sun, 19 Jun 2022 17:41:16 +0100 Subject: [PATCH] treewide: move all cargo subcommands to `pkgs/development/tools/rust/` --- .../tools/rust}/cargo-about/default.nix | 0 .../rust}/cargo-about/zstd-pkg-config.patch | 0 .../tools/rust}/cargo-audit/default.nix | 0 .../tools/rust}/cargo-deb/default.nix | 0 .../tools/rust}/cargo-deps/default.nix | 0 .../tools/rust}/cargo-download/Cargo.nix | 0 .../tools/rust}/cargo-download/crates-io.nix | 0 .../tools/rust}/cargo-download/default.nix | 0 .../tools/rust}/cargo-edit/default.nix | 0 .../{ => rust}/cargo-flamegraph/default.nix | 0 .../tools/rust}/cargo-graph/default.nix | 0 .../tools/rust}/cargo-kcov/default.nix | 0 .../tools/rust}/cargo-license/default.nix | 0 .../tools/rust}/cargo-outdated/default.nix | 0 .../tools/rust}/cargo-release/default.nix | 0 .../tools/rust}/cargo-update/default.nix | 0 .../tools/{ => rust}/cargo-web/default.nix | 0 pkgs/top-level/all-packages.nix | 28 +++++++++---------- 18 files changed, 14 insertions(+), 14 deletions(-) rename pkgs/{tools/package-management => development/tools/rust}/cargo-about/default.nix (100%) rename pkgs/{tools/package-management => development/tools/rust}/cargo-about/zstd-pkg-config.patch (100%) rename pkgs/{tools/package-management => development/tools/rust}/cargo-audit/default.nix (100%) rename pkgs/{tools/package-management => development/tools/rust}/cargo-deb/default.nix (100%) rename pkgs/{tools/package-management => development/tools/rust}/cargo-deps/default.nix (100%) rename pkgs/{tools/package-management => development/tools/rust}/cargo-download/Cargo.nix (100%) rename pkgs/{tools/package-management => development/tools/rust}/cargo-download/crates-io.nix (100%) rename pkgs/{tools/package-management => development/tools/rust}/cargo-download/default.nix (100%) rename pkgs/{tools/package-management => development/tools/rust}/cargo-edit/default.nix (100%) rename pkgs/development/tools/{ => rust}/cargo-flamegraph/default.nix (100%) rename pkgs/{tools/package-management => development/tools/rust}/cargo-graph/default.nix (100%) rename pkgs/{tools/package-management => development/tools/rust}/cargo-kcov/default.nix (100%) rename pkgs/{tools/package-management => development/tools/rust}/cargo-license/default.nix (100%) rename pkgs/{tools/package-management => development/tools/rust}/cargo-outdated/default.nix (100%) rename pkgs/{tools/package-management => development/tools/rust}/cargo-release/default.nix (100%) rename pkgs/{tools/package-management => development/tools/rust}/cargo-update/default.nix (100%) rename pkgs/development/tools/{ => rust}/cargo-web/default.nix (100%) diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix similarity index 100% rename from pkgs/tools/package-management/cargo-about/default.nix rename to pkgs/development/tools/rust/cargo-about/default.nix diff --git a/pkgs/tools/package-management/cargo-about/zstd-pkg-config.patch b/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch similarity index 100% rename from pkgs/tools/package-management/cargo-about/zstd-pkg-config.patch rename to pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/development/tools/rust/cargo-audit/default.nix similarity index 100% rename from pkgs/tools/package-management/cargo-audit/default.nix rename to pkgs/development/tools/rust/cargo-audit/default.nix diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix similarity index 100% rename from pkgs/tools/package-management/cargo-deb/default.nix rename to pkgs/development/tools/rust/cargo-deb/default.nix diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/pkgs/development/tools/rust/cargo-deps/default.nix similarity index 100% rename from pkgs/tools/package-management/cargo-deps/default.nix rename to pkgs/development/tools/rust/cargo-deps/default.nix diff --git a/pkgs/tools/package-management/cargo-download/Cargo.nix b/pkgs/development/tools/rust/cargo-download/Cargo.nix similarity index 100% rename from pkgs/tools/package-management/cargo-download/Cargo.nix rename to pkgs/development/tools/rust/cargo-download/Cargo.nix diff --git a/pkgs/tools/package-management/cargo-download/crates-io.nix b/pkgs/development/tools/rust/cargo-download/crates-io.nix similarity index 100% rename from pkgs/tools/package-management/cargo-download/crates-io.nix rename to pkgs/development/tools/rust/cargo-download/crates-io.nix diff --git a/pkgs/tools/package-management/cargo-download/default.nix b/pkgs/development/tools/rust/cargo-download/default.nix similarity index 100% rename from pkgs/tools/package-management/cargo-download/default.nix rename to pkgs/development/tools/rust/cargo-download/default.nix diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix similarity index 100% rename from pkgs/tools/package-management/cargo-edit/default.nix rename to pkgs/development/tools/rust/cargo-edit/default.nix diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix similarity index 100% rename from pkgs/development/tools/cargo-flamegraph/default.nix rename to pkgs/development/tools/rust/cargo-flamegraph/default.nix diff --git a/pkgs/tools/package-management/cargo-graph/default.nix b/pkgs/development/tools/rust/cargo-graph/default.nix similarity index 100% rename from pkgs/tools/package-management/cargo-graph/default.nix rename to pkgs/development/tools/rust/cargo-graph/default.nix diff --git a/pkgs/tools/package-management/cargo-kcov/default.nix b/pkgs/development/tools/rust/cargo-kcov/default.nix similarity index 100% rename from pkgs/tools/package-management/cargo-kcov/default.nix rename to pkgs/development/tools/rust/cargo-kcov/default.nix diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/pkgs/development/tools/rust/cargo-license/default.nix similarity index 100% rename from pkgs/tools/package-management/cargo-license/default.nix rename to pkgs/development/tools/rust/cargo-license/default.nix diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix similarity index 100% rename from pkgs/tools/package-management/cargo-outdated/default.nix rename to pkgs/development/tools/rust/cargo-outdated/default.nix diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix similarity index 100% rename from pkgs/tools/package-management/cargo-release/default.nix rename to pkgs/development/tools/rust/cargo-release/default.nix diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix similarity index 100% rename from pkgs/tools/package-management/cargo-update/default.nix rename to pkgs/development/tools/rust/cargo-update/default.nix diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/rust/cargo-web/default.nix similarity index 100% rename from pkgs/development/tools/cargo-web/default.nix rename to pkgs/development/tools/rust/cargo-web/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f32d5264aebb..1f5de00558f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13810,11 +13810,11 @@ with pkgs; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; cratesIO = callPackage ../build-support/rust/crates-io.nix { }; - cargo-web = callPackage ../development/tools/cargo-web { + cargo-web = callPackage ../development/tools/rust/cargo-web { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - cargo-flamegraph = callPackage ../development/tools/cargo-flamegraph { + cargo-flamegraph = callPackage ../development/tools/rust/cargo-flamegraph { inherit (darwin.apple_sdk.frameworks) Security; inherit (linuxPackages) perf; }; @@ -13823,9 +13823,9 @@ with pkgs; defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; - cargo-about = callPackage ../tools/package-management/cargo-about { }; + cargo-about = callPackage ../development/tools/rust/cargo-about { }; cargo-all-features = callPackage ../development/tools/rust/cargo-all-features { }; - cargo-audit = callPackage ../tools/package-management/cargo-audit { + cargo-audit = callPackage ../development/tools/rust/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { @@ -13839,29 +13839,29 @@ with pkgs; cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-deb = callPackage ../tools/package-management/cargo-deb { + cargo-deb = callPackage ../development/tools/rust/cargo-deb { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-deps = callPackage ../tools/package-management/cargo-deps { }; - cargo-download = callPackage ../tools/package-management/cargo-download { }; - cargo-edit = callPackage ../tools/package-management/cargo-edit { + cargo-deps = callPackage ../development/tools/rust/cargo-deps { }; + cargo-download = callPackage ../development/tools/rust/cargo-download { }; + cargo-edit = callPackage ../development/tools/rust/cargo-edit { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-kcov = callPackage ../tools/package-management/cargo-kcov { }; - cargo-graph = callPackage ../tools/package-management/cargo-graph { }; - cargo-license = callPackage ../tools/package-management/cargo-license { }; + cargo-kcov = callPackage ../development/tools/rust/cargo-kcov { }; + cargo-graph = callPackage ../development/tools/rust/cargo-graph { }; + cargo-license = callPackage ../development/tools/rust/cargo-license { }; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; - cargo-outdated = callPackage ../tools/package-management/cargo-outdated { + cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - cargo-release = callPackage ../tools/package-management/cargo-release { + cargo-release = callPackage ../development/tools/rust/cargo-release { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-rr = callPackage ../development/tools/rust/cargo-rr { }; cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-update = callPackage ../tools/package-management/cargo-update { + cargo-update = callPackage ../development/tools/rust/cargo-update { inherit (darwin.apple_sdk.frameworks) Security; };