mirror of
https://github.com/R2Northstar/NorthstarLauncher
synced 2026-08-23 20:26:04 -04:00
Pin clang version to 16 for formatting in the flake (#911)
* Add older nixpkgs for clang-format-16
This commit is contained in:
parent
0d746273a7
commit
8d19272b65
2 changed files with 29 additions and 3 deletions
17
flake.lock
generated
17
flake.lock
generated
|
|
@ -34,6 +34,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-24-11": {
|
||||
"locked": {
|
||||
"lastModified": 1731603435,
|
||||
"narHash": "sha256-CqCX4JG7UiHvkrBTpYC3wcEurvbtTADLbo3Ns2CEoL8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8b27c1239e5c421a2bbc2c65d52e4a6fbf2ff296",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1770107345,
|
||||
|
|
@ -54,6 +70,7 @@
|
|||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-24-11": "nixpkgs-24-11",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
}
|
||||
},
|
||||
|
|
|
|||
15
flake.nix
15
flake.nix
|
|
@ -4,6 +4,8 @@
|
|||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
||||
nixpkgs-24-11.url = "github:NixOS/nixpkgs/24.11"; # needed for clang-format-16
|
||||
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
|
||||
treefmt-nix.url = "github:numtide/treefmt-nix";
|
||||
|
|
@ -15,6 +17,7 @@
|
|||
{
|
||||
self,
|
||||
nixpkgs,
|
||||
nixpkgs-24-11,
|
||||
flake-utils,
|
||||
treefmt-nix,
|
||||
}:
|
||||
|
|
@ -135,14 +138,20 @@
|
|||
|
||||
# settings
|
||||
settings.formatter.clang-format = {
|
||||
args = [
|
||||
package = nixpkgs-24-11.legacyPackages.${system}.llvmPackages_16.clang-tools;
|
||||
command = "${nixpkgs-24-11.legacyPackages.${system}.llvmPackages_16.clang-tools}/bin/clang-format";
|
||||
options = [
|
||||
"-i"
|
||||
"--style=file"
|
||||
];
|
||||
excludes = [
|
||||
"primedev/include/**"
|
||||
"primedev/*.cpp"
|
||||
"primedev/*.h"
|
||||
"primedev/thirdparty/**"
|
||||
"primedev/wsockproxy/**"
|
||||
"primedev/dllmain.cpp"
|
||||
"primedev/ns_version.h"
|
||||
"primedev/pch.h"
|
||||
"primedev/resource1.h"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue