From 1ad42c2b62752bf998c3102046749edebb6fb358 Mon Sep 17 00:00:00 2001
From: Vladyslav Pekker <agilesteel@gmail.com>
Date: Tue, 11 Aug 2026 19:36:02 -0300
Subject: [PATCH 1/2] scalafmt: add agilesteel as maintainer

---
 pkgs/by-name/sc/scalafmt/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sc/scalafmt/package.nix b/pkgs/by-name/sc/scalafmt/package.nix
index 9ad05037acec..66cdf332ca46 100644
--- a/pkgs/by-name/sc/scalafmt/package.nix
+++ b/pkgs/by-name/sc/scalafmt/package.nix
@@ -53,7 +53,10 @@ stdenv.mkDerivation {
     description = "Opinionated code formatter for Scala";
     homepage = "http://scalameta.org/scalafmt";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.markus1189 ];
+    maintainers = with lib.maintainers; [
+      agilesteel
+      markus1189
+    ];
     mainProgram = "scalafmt";
   };
 }

From e68b0f858d33762fbdab9b42047010742f5c4c1c Mon Sep 17 00:00:00 2001
From: Vladyslav Pekker <agilesteel@gmail.com>
Date: Tue, 11 Aug 2026 22:36:44 -0300
Subject: [PATCH 2/2] scalafmt: ensure installCheckPhase runs

The version check has been dead since e66d3c1d5627 ("scalafmt:
deprecate phases and use pname&version"), which renamed checkPhase to
installCheckPhase and dropped the doCheck = true that had been enabling
it, without adding the corresponding doInstallCheck = true. runPhase
gates each phase on its own flag, so the check has been silently skipped
ever since.

Restore it, so a version/outputHash drift from update.sh fails the build
instead of passing silently.
---
 pkgs/by-name/sc/scalafmt/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/sc/scalafmt/package.nix b/pkgs/by-name/sc/scalafmt/package.nix
index 66cdf332ca46..41f8a7c6601f 100644
--- a/pkgs/by-name/sc/scalafmt/package.nix
+++ b/pkgs/by-name/sc/scalafmt/package.nix
@@ -43,8 +43,14 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  doInstallCheck = true;
+
   installCheckPhase = ''
+    runHook preInstallCheck
+
     $out/bin/${baseName} --version | grep -q "${version}"
+
+    runHook postInstallCheck
   '';
 
   passthru.updateScript = ./update.sh;