From 2dcf354cc02be34a2ab823be68fbf4b809f9a9ff Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sat, 30 May 2026 23:17:45 +0100
Subject: [PATCH 1/3] =?UTF-8?q?nixfmt:=201.2.0=20=E2=86=92=201.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/NixOS/nixfmt/releases/tag/v1.3.0
https://github.com/NixOS/nixfmt/releases/tag/v1.3.1
---
 pkgs/by-name/ni/nixfmt/generated-package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ni/nixfmt/generated-package.nix b/pkgs/by-name/ni/nixfmt/generated-package.nix
index 15d12a654017..e1c3e1c67fd1 100644
--- a/pkgs/by-name/ni/nixfmt/generated-package.nix
+++ b/pkgs/by-name/ni/nixfmt/generated-package.nix
@@ -24,10 +24,10 @@
 }:
 mkDerivation {
   pname = "nixfmt";
-  version = "1.2.0";
+  version = "1.3.1";
   src = fetchzip {
-    url = "https://github.com/nixos/nixfmt/archive/v1.2.0.tar.gz";
-    sha256 = "1qvj1sddh7bgggqnj7cnhvfh4iz1pwzc9a9awc1g7y349yvpwad3";
+    url = "https://github.com/nixos/nixfmt/archive/v1.3.1.tar.gz";
+    sha256 = "1c0iz6hrzafld8vkldcmall7fvby6xgzzqgap8c3bxwhaxhq86hm";
   };
   isLibrary = true;
   isExecutable = true;
@@ -58,6 +58,6 @@ mkDerivation {
   jailbreak = true;
   homepage = "https://github.com/NixOS/nixfmt";
   description = "Official formatter for Nix code";
-  license = lib.licenses.mpl20;
+  license = lib.meta.getLicenseFromSpdxId "MPL-2.0";
   mainProgram = "nixfmt";
 }

From ce5210e9c728c8a89a103d7a6c8c6662cac081c3 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sat, 30 May 2026 23:44:21 +0100
Subject: [PATCH 2/3] nixfmt: add versionCheckHook

Replace the `passthru.tests` --version test by running versionCheckHook
during the package build.

As `haskellPackages.mkDerivation` is very locked-down and doesn't allow
access to things like `nativeInstallCheckInputs` (or any input lists),
we add a separate `.overrideAttrs` call to the pipeline.

    Running phase: installCheckPhase
    Executing versionCheckPhase
    Successfully managed to find version 1.3.0 in the output of the command /nix/store/3fg7y7qww3c3hvyb66n75d9j5y362n4j-nixfmt-1.3.0/bin/nixfmt --version
    nixfmt 1.3.0
    Finished versionCheckPhase
---
 pkgs/by-name/ni/nixfmt/package.nix | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ni/nixfmt/package.nix b/pkgs/by-name/ni/nixfmt/package.nix
index 93a198f73f2a..ebd16230063c 100644
--- a/pkgs/by-name/ni/nixfmt/package.nix
+++ b/pkgs/by-name/ni/nixfmt/package.nix
@@ -2,27 +2,31 @@
   haskell,
   haskellPackages,
   lib,
-  runCommand,
-  nixfmt,
+  stdenv,
+  versionCheckHook,
 }:
 let
   inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
 
-  overrides = {
+  cabalOverrides = {
     passthru.updateScript = ./update.sh;
-
     teams = [ lib.teams.formatter ];
-
-    # These tests can be run with the following command.
-    #
-    # $ nix-build -A nixfmt.tests
-    passthru.tests = runCommand "nixfmt-tests" { nativeBuildInputs = [ nixfmt ]; } ''
-      nixfmt --version > $out
-    '';
   };
+
+  # haskellPackages.mkDerivation and haskell.lib.compose.overrideCabal
+  # do not allow access to `doInstallCheck` or `nativeInstallCheckInputs`,
+  # so we override directly with `.overrideAttrs`.
+  lateOverrides = finalAttrs: prevAttrs: {
+    doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+    nativeInstallCheckInputs = prevAttrs.nativeInstallCheckInputs or [ ] ++ [
+      versionCheckHook
+    ];
+  };
+
   raw-pkg = haskellPackages.callPackage ./generated-package.nix { };
 in
 lib.pipe raw-pkg [
-  (overrideCabal overrides)
+  (overrideCabal cabalOverrides)
   justStaticExecutables
+  (drv: drv.overrideAttrs lateOverrides)
 ]

From dededefefa26bd3ebb20ab5b0c3676d19687b5d5 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sat, 30 May 2026 23:58:22 +0100
Subject: [PATCH 3/3] nixfmt: add `meta.changelog`

---
 pkgs/by-name/ni/nixfmt/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nixfmt/package.nix b/pkgs/by-name/ni/nixfmt/package.nix
index ebd16230063c..c12ec5d2ed4f 100644
--- a/pkgs/by-name/ni/nixfmt/package.nix
+++ b/pkgs/by-name/ni/nixfmt/package.nix
@@ -8,9 +8,10 @@
 let
   inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
 
-  cabalOverrides = {
+  cabalOverrides = drv: {
     passthru.updateScript = ./update.sh;
     teams = [ lib.teams.formatter ];
+    changelog = "https://github.com/NixOS/nixfmt/releases/tag/v${drv.version}";
   };
 
   # haskellPackages.mkDerivation and haskell.lib.compose.overrideCabal