From cf3978aa448a7bb76b6896f9f42db7e0ff94eaea Mon Sep 17 00:00:00 2001
From: Stacky McStackface <github@stackable.de>
Date: Fri, 16 May 2025 06:08:13 +0000
Subject: [PATCH] chore: Generated commit to update templated files since the
 last template run up to
 stackabletech/operator-templating@3b8de9d25a28cd2e9c38a3a9886bbf0ef521a3ef

Reference-to: stackabletech/operator-templating@3b8de9d (pre-commit fixes)
---
 .github/workflows/pr_pre-commit.yaml | 1 +
 .pre-commit-config.yaml              | 2 +-
 nix/sources.json                     | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pr_pre-commit.yaml b/.github/workflows/pr_pre-commit.yaml
index 34e5766b..4e5b9914 100644
--- a/.github/workflows/pr_pre-commit.yaml
+++ b/.github/workflows/pr_pre-commit.yaml
@@ -3,6 +3,7 @@ name: pre-commit
 
 on:
   pull_request:
+  merge_group:
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fd626489..906defdd 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -68,7 +68,7 @@ repos:
         language: system
         entry: make regenerate-nix
         stages: [pre-commit, pre-merge-commit]
-        pass_filename: false
+        pass_filenames: false
         files: Cargo\.lock
 
       - id: cargo-test
diff --git a/nix/sources.json b/nix/sources.json
index 5aee1c9d..78d7121b 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -29,10 +29,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b",
-        "sha256": "0aqrxx1w40aqicjhg2057bpyrrbsx6mnii5dp5klpm4labfg2iwi",
+        "rev": "b0b4b5f8f621bfe213b8b21694bab52ecfcbf30b",
+        "sha256": "1y8kwbb5b0r1m88nk871ai56qi2drygvibjgc2swp48jfyp5ya99",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/b2b0718004cc9a5bca610326de0a82e6ea75920b.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/b0b4b5f8f621bfe213b8b21694bab52ecfcbf30b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }