From 6eff98293278b4502539bc5fad6c25caa8afa6fc Mon Sep 17 00:00:00 2001 From: zendo Date: Sun, 25 Aug 2024 10:55:15 +0800 Subject: [PATCH] deploy-rs: move to by-name --- .../default.nix => by-name/de/deploy-rs/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 8 deletions(-) rename pkgs/{tools/package-management/deploy-rs/default.nix => by-name/de/deploy-rs/package.nix} (87%) diff --git a/pkgs/tools/package-management/deploy-rs/default.nix b/pkgs/by-name/de/deploy-rs/package.nix similarity index 87% rename from pkgs/tools/package-management/deploy-rs/default.nix rename to pkgs/by-name/de/deploy-rs/package.nix index ad656ca385e4..08d83e701d0d 100644 --- a/pkgs/tools/package-management/deploy-rs/default.nix +++ b/pkgs/by-name/de/deploy-rs/package.nix @@ -2,8 +2,7 @@ , stdenv , fetchFromGitHub , rustPlatform -, CoreServices -, SystemConfiguration +, darwin }: rustPlatform.buildRustPackage { @@ -20,8 +19,8 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-Vo/45cZM/sBAaoikhEwCvduhMQjurwSZwCjwrIQn7IA="; buildInputs = lib.optionals stdenv.isDarwin [ - CoreServices - SystemConfiguration + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.SystemConfiguration ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff352964cc01..95c66ea41521 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38122,10 +38122,6 @@ with pkgs; dell-530cdn = callPackage ../misc/drivers/dell-530cdn { }; - deploy-rs = callPackage ../tools/package-management/deploy-rs { - inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; - }; - dockutil = callPackage ../os-specific/darwin/dockutil { }; eiciel = callPackage ../tools/filesystems/eiciel { };