From 573ffac2e67659dd00904e8bf53a66adfc40f95e Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 19 Feb 2025 10:29:58 +0100
Subject: [PATCH] Remove nixfmt override

Closes https://github.com/NixOS/nix/issues/12418
IFD in nixfmt repo
---
 flake.lock                   | 52 ------------------------------------
 flake.nix                    |  1 -
 maintainers/flake-module.nix |  1 -
 3 files changed, 54 deletions(-)

diff --git a/flake.lock b/flake.lock
index e45f0fb98..ce484a67a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -36,24 +36,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "git-hooks-nix": {
       "inputs": {
         "flake-compat": [],
@@ -79,24 +61,6 @@
         "type": "github"
       }
     },
-    "nixfmt": {
-      "inputs": {
-        "flake-utils": "flake-utils"
-      },
-      "locked": {
-        "lastModified": 1736283758,
-        "narHash": "sha256-hrKhUp2V2fk/dvzTTHFqvtOg000G1e+jyIam+D4XqhA=",
-        "owner": "NixOS",
-        "repo": "nixfmt",
-        "rev": "8d4bd690c247004d90d8554f0b746b1231fe2436",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixfmt",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1734359947,
@@ -150,26 +114,10 @@
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "git-hooks-nix": "git-hooks-nix",
-        "nixfmt": "nixfmt",
         "nixpkgs": "nixpkgs",
         "nixpkgs-23-11": "nixpkgs-23-11",
         "nixpkgs-regression": "nixpkgs-regression"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 9a0a48e55..c2461a2eb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,7 +20,6 @@
   # work around 7730 and https://github.com/NixOS/nix/issues/7807
   inputs.git-hooks-nix.inputs.flake-compat.follows = "";
   inputs.git-hooks-nix.inputs.gitignore.follows = "";
-  inputs.nixfmt.url = "github:NixOS/nixfmt";
 
   outputs =
     inputs@{
diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix
index 208296194..4d504b8ee 100644
--- a/maintainers/flake-module.nix
+++ b/maintainers/flake-module.nix
@@ -39,7 +39,6 @@
           };
           nixfmt-rfc-style = {
             enable = true;
-            package = inputs.nixfmt.packages.${pkgs.hostPlatform.system}.default;
             excludes = [
               # Invalid
               ''^tests/functional/lang/parse-.*\.nix$''