From a36ec3e6fa0d8f0fbccf8f28f2549df4613d8427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 14 Nov 2025 01:53:54 +0100
Subject: [PATCH 1/2] unixtools.more: fix name being more-more-less-679 on
 darwin

---
 pkgs/top-level/unixtools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix
index f0ed6b55dd36..58caab387c5c 100644
--- a/pkgs/top-level/unixtools.nix
+++ b/pkgs/top-level/unixtools.nix
@@ -71,7 +71,7 @@ let
 
   # more is unavailable in darwin
   # so we just use less
-  more_compat = runCommand "more-${pkgs.less.name}" { } ''
+  more_compat = runCommand pkgs.less.name { } ''
     mkdir -p $out/bin
     ln -s ${pkgs.less}/bin/less $out/bin/more
   '';

From 498edffe99571de2bd3f7ecbf5692bdf67868f27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 14 Nov 2025 02:05:27 +0100
Subject: [PATCH 2/2] unixtools.more: fix accessing version on darwin

---
 pkgs/top-level/unixtools.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix
index 58caab387c5c..4aea1b23e347 100644
--- a/pkgs/top-level/unixtools.nix
+++ b/pkgs/top-level/unixtools.nix
@@ -71,10 +71,17 @@ let
 
   # more is unavailable in darwin
   # so we just use less
-  more_compat = runCommand pkgs.less.name { } ''
-    mkdir -p $out/bin
-    ln -s ${pkgs.less}/bin/less $out/bin/more
-  '';
+  more_compat =
+    runCommand pkgs.less.name
+      {
+        passthru = {
+          inherit (pkgs.less) version;
+        };
+      }
+      ''
+        mkdir -p $out/bin
+        ln -s ${pkgs.less}/bin/less $out/bin/more
+      '';
 
   bins = mapAttrs singleBinary {
     # singular binaries