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..0483f25b 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b", - "sha256": "0aqrxx1w40aqicjhg2057bpyrrbsx6mnii5dp5klpm4labfg2iwi", + "rev": "b1bebd0fe266bbd1820019612ead889e96a8fa2d", + "sha256": "0fl2dji5whjydbxby9b7kqyqx9m4k44p72x1q28kfnx5m67nyqij", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/b2b0718004cc9a5bca610326de0a82e6ea75920b.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/b1bebd0fe266bbd1820019612ead889e96a8fa2d.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }