Merge pull request #1521 from NixOS/add-git-blame-ignore-revs

Add git blame ignore revs

Author: Mic92

.git-blame-ignore-revs

@@ -0,0 +1,12 @@
+# This file contains commits that should be ignored by git blame
+# See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-file
+# and https://github.com/NixOS/nixpkgs/blob/master/.git-blame-ignore-revs for more info
+
+# To enable this in your local repository, run:
+#   git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# For rebasing PRs, commits marked with !autorebase will be automatically
+# reapplied by the auto-rebase script
+
+# nixfmt-rfc-style formatting
+51e51e601448705c0d2f92ef90ec7b680123077c #!autorebase cd tests && nix fmt ..

.github/workflows/test.yml

@@ -4,10 +4,18 @@ on:
   push:
     branches:
       - master
+  merge_group:
 jobs:
+  nixfmt:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: cachix/install-nix-action@v31
+    - run: cd tests && nix fmt .. -- --fail-on-change
   tests:
+    needs: nixfmt
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - uses: cachix/install-nix-action@v31
-    - run: nix run ./tests#run .
+    - run: nix run ./tests#run .

flake.lock

@@ -1,34 +1,9 @@
 {
   description = "nixos-hardware";
 
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small";
-    treefmt-nix.url = "github:numtide/treefmt-nix";
-  };
-
   outputs =
+    { ... }:
     {
-      nixpkgs,
-      self,
-      treefmt-nix,
-    }:
-    let
-      systems = [
-        "aarch64-darwin"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "x86_64-linux"
-      ];
-      forEachSystem =
-        function: nixpkgs.lib.genAttrs (systems) (system: function nixpkgs.legacyPackages.${system});
-
-      treefmtEval = forEachSystem (pkgs: treefmt-nix.lib.evalModule pkgs ./treefmt.nix);
-    in
-    {
-      checks = forEachSystem (pkgs: {
-        formatting = treefmtEval.${pkgs.system}.config.build.check self;
-      });
-      formatter = forEachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
 
       nixosModules =
         let

flake.nix

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Helper script to update the tests flake hash
+set -euo pipefail
+
+# Go to the root of the repository
+cd "$(dirname "$0")/.."
+
+echo "Updating tests.narHash..." >&2
+
+# Update the flake lock file
+nix --extra-experimental-features 'flakes nix-command' flake lock ./tests
+
+# Generate the hash
+nix --extra-experimental-features 'flakes nix-command' hash path ./tests > ./tests.narHash
+
+echo "Hash updated successfully: $(cat tests.narHash)"

scripts/update-tests-hash

@@ -3,16 +3,21 @@
 
   inputs = {
     nixos-unstable-small.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&ref=nixos-unstable-small";
-    nixos-stable.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&ref=nixos-24.11";
+    nixos-stable.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&ref=nixos-25.05";
     # override in the test
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-parts.inputs.nixpkgs-lib.follows = "nixos-unstable-small";
+    treefmt-nix.url = "github:numtide/treefmt-nix";
+    treefmt-nix.inputs.nixpkgs.follows = "nixos-unstable-small";
   };
 
   outputs =
     inputs@{ flake-parts, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
+      imports = [
+        inputs.treefmt-nix.flakeModule
+      ];
       systems = [
         "aarch64-linux"
         "x86_64-linux"
@@ -85,6 +90,25 @@
         in
         {
           _module.args.pkgs = nixpkgsUnstable;
+
+          treefmt = {
+            flakeCheck = pkgs.hostPlatform.system != "riscv64-linux";
+            projectRootFile = "COPYING";
+            programs = {
+              deadnix = {
+                enable = true;
+                no-lambda-pattern-names = true;
+              };
+              nixfmt = {
+                enable = true;
+                package = pkgs.nixfmt-rfc-style;
+              };
+            };
+            settings = {
+              on-unmatched = "info";
+            };
+          };
+
           checks =
             checksForNixpkgs "nixos-unstable" nixpkgsUnstable
             // checksForNixpkgs "nixos-stable" nixpkgsStable;