From 4d03aa4c5d9f5b9092774568d5535d131850a2fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sun, 8 Feb 2026 01:27:23 +0700
Subject: [PATCH 1/4] nix-prefetch-fossil: use datetime instead of date like
 other prefetchers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The common name “date” in prefetch returns was a poor choice.
---
 .../build-support/fetchfossil/nix-prefetch-fossil | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/fetchfossil/nix-prefetch-fossil b/pkgs/build-support/fetchfossil/nix-prefetch-fossil
index 1f3c2636355e..b1bf33789914 100755
--- a/pkgs/build-support/fetchfossil/nix-prefetch-fossil
+++ b/pkgs/build-support/fetchfossil/nix-prefetch-fossil
@@ -89,10 +89,15 @@ fossil open "$tmpPath/fossil-clone.fossil" "$rev" >&2
 
 # Get the actual commit hash and date
 checkoutLine=$(fossil info | grep ^checkout:)
-# Remove 'checkout:' prefix and squeeze multiple spaces, then extract fields
-actualRev=$(echo "$checkoutLine" | sed 's/^checkout:[[:space:]]*//' | tr -s ' ' | cut -d' ' -f1)
-# Extract date (format: checkout:     HASH YYYY-MM-DD HH:MM:SS UTC)
-actualDate=$(echo "$checkoutLine" | sed 's/^checkout:[[:space:]]*//' | tr -s ' ' | cut -d' ' -f2)
+# Remove 'checkout:' prefix & remove whitespace
+checkoutData=$(echo "$checkoutLine" | sed 's/^checkout:[[:space:]]*//' | tr -s ' ')
+# Extract fields: HASH YYYY-MM-DD HH:MM:SS UTC
+actualRev=$(echo "$checkoutData" | cut -d' ' -f1)
+# Get datetime parts
+rawDate=$(echo "$checkoutData" | cut -d' ' -f2)
+rawTime=$(echo "$checkoutData" | cut -d' ' -f3)
+# Combine into ISO 8601 RFC 3339 format
+actualDatetime="${rawDate}T${rawTime}Z"
 cd - >/dev/null
 
 # Remove the fossil checkout file
@@ -118,7 +123,7 @@ cat <<EOF
 {
   "url": "$url",
   "rev": "$actualRev",
-  "date": "$actualDate",
+  "date": "$actualDatetime",
   "$hashType": "$hash",
   "hash": "$(nix-hash --to-sri --type $hashType $hash)"
 }

From c97c45cda640124a27442a128520588cf9de7138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sun, 8 Feb 2026 01:31:00 +0700
Subject: [PATCH 2/4] nix-prefetch-fossil: add path to JSON output

---
 pkgs/build-support/fetchfossil/nix-prefetch-fossil | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/fetchfossil/nix-prefetch-fossil b/pkgs/build-support/fetchfossil/nix-prefetch-fossil
index b1bf33789914..0e1ce4d9c060 100755
--- a/pkgs/build-support/fetchfossil/nix-prefetch-fossil
+++ b/pkgs/build-support/fetchfossil/nix-prefetch-fossil
@@ -124,6 +124,7 @@ cat <<EOF
   "url": "$url",
   "rev": "$actualRev",
   "date": "$actualDatetime",
+  "path": "$finalPath",
   "$hashType": "$hash",
   "hash": "$(nix-hash --to-sri --type $hashType $hash)"
 }

From 2d6a59a3e869d7d0b359a869b6d563e4b11a44b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sun, 8 Feb 2026 01:31:15 +0700
Subject: [PATCH 3/4] nix-prefetch-fossil: expose just nix-prefetch-fossil @
 top-level

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e48ec77acdb..53bac7ecb07b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12710,6 +12710,7 @@ with pkgs;
     nix-prefetch-bzr
     nix-prefetch-cvs
     nix-prefetch-darcs
+    nix-prefetch-fossil
     nix-prefetch-git
     nix-prefetch-hg
     nix-prefetch-pijul

From 1a03b108dcf8fdf44ad2b6759a2f5379d1262614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sun, 8 Feb 2026 01:33:54 +0700
Subject: [PATCH 4/4] nix-prefetch-fossil: add missing dependencies

---
 pkgs/tools/package-management/nix-prefetch-scripts/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index 64a94eb494d3..0a4164966b28 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -70,6 +70,8 @@ rec {
     mkPrefetchScript "fossil" ../../../build-support/fetchfossil/nix-prefetch-fossil
       [
         fossil
+        gnugrep
+        gnused
       ];
   nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [
     findutils