From 951c2d636955e623d1c6f48fe89c4d4e3c513a80 Mon Sep 17 00:00:00 2001 From: whispers Date: Tue, 1 Sep 2026 23:34:29 -0400 Subject: [PATCH] rustup-toolchain-install-master: move to by-name generally preferred, and helps allow for merge bot --- .../0001-dynamically-patchelf-binaries.patch | 0 .../ru/rustup-toolchain-install-master/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 4 deletions(-) rename pkgs/{development/tools/rust => by-name/ru}/rustup-toolchain-install-master/0001-dynamically-patchelf-binaries.patch (100%) rename pkgs/{development/tools/rust/rustup-toolchain-install-master/default.nix => by-name/ru/rustup-toolchain-install-master/package.nix} (100%) diff --git a/pkgs/development/tools/rust/rustup-toolchain-install-master/0001-dynamically-patchelf-binaries.patch b/pkgs/by-name/ru/rustup-toolchain-install-master/0001-dynamically-patchelf-binaries.patch similarity index 100% rename from pkgs/development/tools/rust/rustup-toolchain-install-master/0001-dynamically-patchelf-binaries.patch rename to pkgs/by-name/ru/rustup-toolchain-install-master/0001-dynamically-patchelf-binaries.patch diff --git a/pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix b/pkgs/by-name/ru/rustup-toolchain-install-master/package.nix similarity index 100% rename from pkgs/development/tools/rust/rustup-toolchain-install-master/default.nix rename to pkgs/by-name/ru/rustup-toolchain-install-master/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b3c7c74cdff..70703ba73320 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4077,10 +4077,6 @@ with pkgs; rust-bindgen-unwrapped = callPackage ../development/tools/rust/bindgen/unwrapped.nix { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; rustup = callPackage ../development/tools/rust/rustup { }; - rustup-toolchain-install-master = - callPackage ../development/tools/rust/rustup-toolchain-install-master - { - }; scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; }; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; }; scala_3 = callPackage ../development/compilers/scala { };