From fd093df307236f3c2c9a4d4ab6d8a01d65bcbe26 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sun, 26 Jul 2026 12:23:30 -0400 Subject: [PATCH] coreutils: move to pkgs/by-name --- .../co}/coreutils/CVE-2026-56391.patch | 0 .../co}/coreutils/CVE-2026-56392.patch | 0 .../default.nix => by-name/co/coreutils/package.nix} | 0 pkgs/top-level/all-packages.nix | 11 +++++------ 4 files changed, 5 insertions(+), 6 deletions(-) rename pkgs/{tools/misc => by-name/co}/coreutils/CVE-2026-56391.patch (100%) rename pkgs/{tools/misc => by-name/co}/coreutils/CVE-2026-56392.patch (100%) rename pkgs/{tools/misc/coreutils/default.nix => by-name/co/coreutils/package.nix} (100%) diff --git a/pkgs/tools/misc/coreutils/CVE-2026-56391.patch b/pkgs/by-name/co/coreutils/CVE-2026-56391.patch similarity index 100% rename from pkgs/tools/misc/coreutils/CVE-2026-56391.patch rename to pkgs/by-name/co/coreutils/CVE-2026-56391.patch diff --git a/pkgs/tools/misc/coreutils/CVE-2026-56392.patch b/pkgs/by-name/co/coreutils/CVE-2026-56392.patch similarity index 100% rename from pkgs/tools/misc/coreutils/CVE-2026-56392.patch rename to pkgs/by-name/co/coreutils/CVE-2026-56392.patch diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/by-name/co/coreutils/package.nix similarity index 100% rename from pkgs/tools/misc/coreutils/default.nix rename to pkgs/by-name/co/coreutils/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d1176e60ba4..b235d4e5aa23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1845,12 +1845,11 @@ with pkgs; comet-gog_heroic = callPackage ../by-name/co/comet-gog/package.nix { comet-gog_kind = "heroic"; }; - coreutils = callPackage ../tools/misc/coreutils { }; - - # The coreutils above are built with dependencies from - # bootstrapping. We cannot override it here, because that pulls in - # openssl from the previous stage as well. - coreutils-full = callPackage ../tools/misc/coreutils { minimal = false; }; + # The `coreutils` package (in pkgs/by-name) is built with dependencies from + # bootstrapping. We cannot override it for `coreutils-full`, because that + # pulls in openssl from the previous stage as well. + # `coreutils-prefixed` does not use openssl, though, so it can be overridden. + coreutils-full = callPackage ../by-name/co/coreutils/package.nix { minimal = false; }; coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false;