Skip to content

Commit 3af8790

Browse files
authored
Merge pull request #2477 from hzeller/feature-20251209-update-shell
Maintain versions in shell.nix
2 parents c1271a0 + 29b39c4 commit 3af8790

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

shell.nix

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
{ pkgs ? import <nixpkgs> {} }:
66
let
77
verible_used_stdenv = pkgs.stdenv;
8-
#verible_used_stdenv = pkgs.gcc13Stdenv;
9-
#verible_used_stdenv = pkgs.clang17Stdenv;
8+
#verible_used_stdenv = pkgs.gcc15Stdenv;
9+
#verible_used_stdenv = pkgs.clang19Stdenv;
1010
in
1111
verible_used_stdenv.mkDerivation {
1212
name = "verible-build-environment";
@@ -38,14 +38,13 @@ verible_used_stdenv.mkDerivation {
3838
bazel-buildtools # buildifier
3939

4040
llvmPackages_19.clang-tools # for clang-tidy
41-
llvmPackages_17.clang-tools # for clang-format
41+
llvmPackages_18.clang-tools # for clang-format
4242
];
4343
shellHook = ''
4444
# clang tidy: use latest.
4545
export CLANG_TIDY=${pkgs.llvmPackages_19.clang-tools}/bin/clang-tidy
4646
47-
# There is too much volatility between even micro-versions of
48-
# later clang-format. Let's use stable 17 for now.
49-
export CLANG_FORMAT=${pkgs.llvmPackages_17.clang-tools}/bin/clang-format
47+
# Last version that current github CI supports.
48+
export CLANG_FORMAT=${pkgs.llvmPackages_18.clang-tools}/bin/clang-format
5049
'';
5150
}

0 commit comments

Comments
 (0)