Skip to content

Commit 9145e1f

Browse files
committed
nix: Upgrade compilers
1 parent 8f76b2e commit 9145e1f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
in eachSystem (system:
1010
let
1111
pkgs = nixpkgs.legacyPackages.${system};
12-
stdenvs = [ { name = "gcc"; pkg = pkgs.gcc13Stdenv; } { name = "clang"; pkg = pkgs.llvmPackages_17.stdenv; } ];
12+
stdenvs = [ { name = "gcc"; pkg = pkgs.gcc14Stdenv; } { name = "clang"; pkg = pkgs.llvmPackages_18.stdenv; } ];
1313
defaultStdenv = (builtins.head stdenvs).name;
1414
quartz = pkgs.fetchFromGitHub {
1515
owner = "vimpostor";
@@ -44,7 +44,7 @@
4444
} // builtins.listToAttrs (map (x: { name = x.name; value = makeStdenvPkg x.pkg; }) stdenvs);
4545
checks = {
4646
format = pkgs.runCommand "format" { src = ./.; nativeBuildInputs = [ pkgs.clang-tools pkgs.git ]; } "mkdir $out && cd $src && find . -type f -path './*\\.[hc]pp' -exec clang-format -style=file --dry-run --Werror {} \\;";
47-
tests = (makeStdenvPkg pkgs.gcc13Stdenv).overrideAttrs (finalAttrs: previousAttrs: {
47+
tests = (makeStdenvPkg pkgs.gcc14Stdenv).overrideAttrs (finalAttrs: previousAttrs: {
4848
doCheck = true;
4949
cmakeFlags = previousAttrs.cmakeFlags ++ ["-DBUILD_TESTING=ON"];
5050
QT_QPA_PLATFORM = "offscreen";

0 commit comments

Comments
 (0)