From 8a0f62decb3f5af67140cf0d4c3baaa89e65aa48 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 2 May 2026 20:09:05 +0200
Subject: [PATCH 1/3] nixfmt-rs: init at 0.1.4

---
 pkgs/by-name/ni/nixfmt-rs/package.nix | 44 +++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/ni/nixfmt-rs/package.nix

diff --git a/pkgs/by-name/ni/nixfmt-rs/package.nix b/pkgs/by-name/ni/nixfmt-rs/package.nix
new file mode 100644
index 000000000000..3e94cda929db
--- /dev/null
+++ b/pkgs/by-name/ni/nixfmt-rs/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+  nixfmt,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "nixfmt-rs";
+  version = "0.1.4";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "Mic92";
+    repo = "nixfmt-rs";
+    tag = finalAttrs.version;
+    hash = "sha256-lfT+cFys0iJGkOgLO8LR7lnKMG7ZKJTVvOCm6dSBf8w=";
+  };
+
+  cargoHash = "sha256-TmZi99xxTlSTpqr6k29CsnTK8qfj5gjs1AGkx1hcXCg=";
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  nativeCheckInputs = [ nixfmt ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/Mic92/nixfmt-rs/releases/tag/${finalAttrs.version}";
+    description = "Rust reimplementation of nixfmt that produces byte-identical output to the Haskell original";
+    homepage = "https://github.com/Mic92/nixfmt-rs";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
+      drupol
+      mic92
+    ];
+    mainProgram = "nixfmt";
+  };
+})

From 786a0a8b2f6c5b313e8583be14f6d929ff33653d Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 3 May 2026 10:32:17 +0200
Subject: [PATCH 2/3] nixfmt-rs: 0.1.4 -> 0.2.0

Diff: https://github.com/Mic92/nixfmt-rs/compare/0.1.4...0.2.0

Changelog: https://github.com/Mic92/nixfmt-rs/releases/tag/0.2.0
---
 pkgs/by-name/ni/nixfmt-rs/package.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ni/nixfmt-rs/package.nix b/pkgs/by-name/ni/nixfmt-rs/package.nix
index 3e94cda929db..d76078afe2ec 100644
--- a/pkgs/by-name/ni/nixfmt-rs/package.nix
+++ b/pkgs/by-name/ni/nixfmt-rs/package.nix
@@ -2,14 +2,16 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  installShellFiles,
   versionCheckHook,
   nix-update-script,
   nixfmt,
+  gitMinimal,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nixfmt-rs";
-  version = "0.1.4";
+  version = "0.2.0";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -18,15 +20,24 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Mic92";
     repo = "nixfmt-rs";
     tag = finalAttrs.version;
-    hash = "sha256-lfT+cFys0iJGkOgLO8LR7lnKMG7ZKJTVvOCm6dSBf8w=";
+    hash = "sha256-eBVi22+EGMYWv2t/seoPqou8PuABxVcsWTFcrNYP6So=";
   };
 
-  cargoHash = "sha256-TmZi99xxTlSTpqr6k29CsnTK8qfj5gjs1AGkx1hcXCg=";
+  cargoHash = "sha256-fadjOtfB8bFuhTN9mAmi2A526boW7Aje39IBjdxszok=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installManPage docs/*
+  '';
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  nativeCheckInputs = [ nixfmt ];
+  nativeCheckInputs = [
+    gitMinimal
+    nixfmt
+  ];
 
   passthru.updateScript = nix-update-script { };
 

From baf250e5c61673b4872a09e8ad7b72e7d33eaf6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 3 May 2026 11:53:43 +0200
Subject: [PATCH 3/3] nixfmt-rs: fix manpage installation

we need to actual build the manpage
---
 pkgs/by-name/ni/nixfmt-rs/package.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nixfmt-rs/package.nix b/pkgs/by-name/ni/nixfmt-rs/package.nix
index d76078afe2ec..abd00f80a874 100644
--- a/pkgs/by-name/ni/nixfmt-rs/package.nix
+++ b/pkgs/by-name/ni/nixfmt-rs/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
+  scdoc,
   versionCheckHook,
   nix-update-script,
   nixfmt,
@@ -25,10 +26,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-fadjOtfB8bFuhTN9mAmi2A526boW7Aje39IBjdxszok=";
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    scdoc
+  ];
+
+  postBuild = ''
+    scdoc < docs/nixfmt.1.scd > nixfmt.1
+  '';
 
   postInstall = ''
-    installManPage docs/*
+    installManPage nixfmt.1
   '';
 
   doInstallCheck = true;