update nixpkgs, pre-commit-hooks
the devshell no longer worked for us due to the recent deprecations :D let's update pre-commit too because while it doesn't fail it does warn Change-Id: Ic2060c82e4e97bb7a96cebd29097abefabdfe733
This commit is contained in:
@@ -69,7 +69,7 @@ let
|
||||
let
|
||||
result = squash ''
|
||||
- ${
|
||||
if inlineHTML then ''<span id="conf-${name}">[`${name}`](#conf-${name})</span>'' else ''`${name}`''
|
||||
if inlineHTML then ''<span id="conf-${name}">[`${name}`](#conf-${name})</span>'' else "`${name}`"
|
||||
}
|
||||
|
||||
${indent " " body}
|
||||
|
||||
Generated
+6
-6
@@ -106,11 +106,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1765984163,
|
||||
"narHash": "sha256-RNFlX1Dj0DuvXkbwtglNKFxYxhwh20m/oUN0Le54UXY=",
|
||||
"lastModified": 1769983561,
|
||||
"narHash": "sha256-Hv7yml1x0gU14H1zxGATCXb+ueeBH7DFBUTIMkLWD4A=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e5c822e4a0e21274ec0b53bdb5c73ac3c470c263",
|
||||
"rev": "8dcf33716a525a7a0b6815cd8d0f4fa9b13abb1b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -123,11 +123,11 @@
|
||||
"pre-commit-hooks": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1733318908,
|
||||
"narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
|
||||
"lastModified": 1769939035,
|
||||
"narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
|
||||
"rev": "a8ca480175326551d6c4121498316261cbb5b260",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -178,7 +178,11 @@
|
||||
|
||||
nixVersions = prev.nixVersions // {
|
||||
# Nix 2.18 has been removed from Nixpkgs ≥ 25.05, so we need to reintroduce it ourselves for our tests.
|
||||
nix_2_18 = nix_2_18.outputs.packages.${currentStdenv.hostPlatform.system}.default;
|
||||
nix_2_18 =
|
||||
nix_2_18.outputs.packages.${currentStdenv.hostPlatform.system}.default.overrideAttrs
|
||||
(_: {
|
||||
pname = "nix";
|
||||
});
|
||||
};
|
||||
|
||||
# Forward from the previous stage as we don’t want it to pick the lowdown override
|
||||
|
||||
+3
-3
@@ -42,7 +42,7 @@ pre-commit-run {
|
||||
"file"
|
||||
];
|
||||
excludes = [
|
||||
''^lix/pch/.*$''
|
||||
"^lix/pch/.*$"
|
||||
''\.gen\.hh$''
|
||||
];
|
||||
pass_filenames = false; # this will automatically format everything in the stage area of Git.
|
||||
@@ -110,7 +110,7 @@ pre-commit-run {
|
||||
"header"
|
||||
];
|
||||
excludes = [
|
||||
''^lix/pch/.*$''
|
||||
"^lix/pch/.*$"
|
||||
# generated files; these will never actually be seen by this
|
||||
# check, and are left here as documentation
|
||||
''(parser|lexer)-tab\.hh$''
|
||||
@@ -130,7 +130,7 @@ pre-commit-run {
|
||||
enable = true;
|
||||
stages = [ "pre-commit" ];
|
||||
excludes = [
|
||||
''^tests/functional/lang/''
|
||||
"^tests/functional/lang/"
|
||||
"^tests/functional2/.+\\.exp"
|
||||
"^tests/functional2/.+\\.nix"
|
||||
''\.patch$''
|
||||
|
||||
Reference in New Issue
Block a user