diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/by-name/ry/rye/Cargo.lock similarity index 100% rename from pkgs/development/tools/rye/Cargo.lock rename to pkgs/by-name/ry/rye/Cargo.lock diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/by-name/ry/rye/package.nix similarity index 94% rename from pkgs/development/tools/rye/default.nix rename to pkgs/by-name/ry/rye/package.nix index d713767450e0..c881e1d4f3a6 100644 --- a/pkgs/development/tools/rye/default.nix +++ b/pkgs/by-name/ry/rye/package.nix @@ -5,9 +5,7 @@ , pkg-config , openssl , stdenv -, CoreServices -, Libsystem -, SystemConfiguration +, darwin , nix-update-script , testers , rye @@ -41,11 +39,11 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ - CoreServices + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk; [ + frameworks.CoreServices + frameworks.SystemConfiguration Libsystem - SystemConfiguration - ]; + ]); postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd rye \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6d1116db509..344a838cca9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18847,11 +18847,6 @@ with pkgs; rufo = callPackage ../development/tools/rufo { }; - rye = darwin.apple_sdk_11_0.callPackage ../development/tools/rye { - inherit (darwin.apple_sdk_11_0) Libsystem; - inherit (darwin.apple_sdk_11_0.frameworks) CoreServices SystemConfiguration; - }; - samurai = callPackage ../development/tools/build-managers/samurai { }; muon = callPackage ../development/tools/build-managers/muon { };