From 9f752d2c084ce7cac5fbd29dde8999c00709452a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 9 Jan 2025 11:54:45 +0100
Subject: [PATCH 1/3] uutils-coreutils: move to by-name

---
 .../uu/uutils-coreutils/package.nix}                | 13 +++----------
 pkgs/top-level/all-packages.nix                     |  5 -----
 2 files changed, 3 insertions(+), 15 deletions(-)
 rename pkgs/{tools/misc/uutils-coreutils/default.nix => by-name/uu/uutils-coreutils/package.nix} (89%)

diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix
similarity index 89%
rename from pkgs/tools/misc/uutils-coreutils/default.nix
rename to pkgs/by-name/uu/uutils-coreutils/package.nix
index 3c0c6aa8738a..31bfa78779ae 100644
--- a/pkgs/tools/misc/uutils-coreutils/default.nix
+++ b/pkgs/by-name/uu/uutils-coreutils/package.nix
@@ -4,9 +4,7 @@
   fetchFromGitHub,
   rustPlatform,
   cargo,
-  sphinx,
-  Security,
-  libiconv,
+  python3Packages,
   prefix ? "uutils-",
   buildMulticallBinary ? true,
 }:
@@ -30,17 +28,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     rustPlatform.cargoSetupHook
-    sphinx
-  ];
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    Security
-    libiconv
+    python3Packages.sphinx
   ];
 
   makeFlags =
     [
-      "CARGO=${cargo}/bin/cargo"
+      "CARGO=${lib.getExe cargo}"
       "PREFIX=${placeholder "out"}"
       "PROFILE=release"
       "INSTALLDIR_MAN=${placeholder "out"}/share/man/man1"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 678148fc1606..574c84ca64e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3170,11 +3170,6 @@ with pkgs;
 
   uusi = haskell.lib.compose.justStaticExecutables haskellPackages.uusi;
 
-  uutils-coreutils = callPackage ../tools/misc/uutils-coreutils {
-    inherit (python3Packages) sphinx;
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   uutils-coreutils-noprefix = uutils-coreutils.override { prefix = null; };
 
   vorta = qt6Packages.callPackage ../applications/backup/vorta { };

From 0f1e7eedbef40957ec627e0acb72da29527cdfc1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 9 Jan 2025 11:56:48 +0100
Subject: [PATCH 2/3] uutils-coreutils: add versionCheckHook

---
 pkgs/by-name/uu/uutils-coreutils/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix
index 31bfa78779ae..302ea994e8aa 100644
--- a/pkgs/by-name/uu/uutils-coreutils/package.nix
+++ b/pkgs/by-name/uu/uutils-coreutils/package.nix
@@ -5,6 +5,8 @@
   rustPlatform,
   cargo,
   python3Packages,
+  versionCheckHook,
+
   prefix ? "uutils-",
   buildMulticallBinary ? true,
 }:
@@ -44,6 +46,17 @@ stdenv.mkDerivation rec {
   # too many impure/platform-dependent tests
   doCheck = false;
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram =
+    let
+      prefix' = lib.optionalString (prefix != null) prefix;
+    in
+    "${placeholder "out"}/bin/${prefix'}ls";
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
   meta = {
     description = "Cross-platform Rust rewrite of the GNU coreutils";
     longDescription = ''

From 6921c8c947e0e908ff66a9c364b2620f4c57127c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 9 Jan 2025 15:04:06 +0100
Subject: [PATCH 3/3] uutils-coreutils: add updateScript

---
 pkgs/by-name/uu/uutils-coreutils/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix
index 302ea994e8aa..bc86e8166077 100644
--- a/pkgs/by-name/uu/uutils-coreutils/package.nix
+++ b/pkgs/by-name/uu/uutils-coreutils/package.nix
@@ -6,6 +6,7 @@
   cargo,
   python3Packages,
   versionCheckHook,
+  nix-update-script,
 
   prefix ? "uutils-",
   buildMulticallBinary ? true,
@@ -57,6 +58,10 @@ stdenv.mkDerivation rec {
   versionCheckProgramArg = [ "--version" ];
   doInstallCheck = true;
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Cross-platform Rust rewrite of the GNU coreutils";
     longDescription = ''