about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2024-01-16T15·44+0100
committerclbot <clbot@tvl.fyi>2024-01-19T21·47+0000
commit9a09505b777cbfadff0a86f69d7a50b33ed1b835 (patch)
treee03f898c1117c026a3f733b6bfaf861c376b805c
parent8e08dd69705d07c3e4782856b49e3732f273703f (diff)
chore: use LLVM default version (16) over pinned version 11 r/7421
This cleans up the clang-tools_11 attribute, affects tazjin's frog and
aspen's home-manager configuration. achilles remains with pinned
llvmPackages, but it doesn't build at the moment, so it's impossible to
test.

Change-Id: I53416bf7c99f363163de29b32678a82b9eb5adbd
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10644
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: aspen <root@gws.fyi>
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
-rw-r--r--third_party/overlays/tvl.nix4
-rw-r--r--users/grfn/system/home/modules/development.nix2
-rw-r--r--users/tazjin/nixos/frog/default.nix4
3 files changed, 3 insertions, 7 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index 9888fc4496..a070320c73 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -31,10 +31,6 @@ depot.nix.readTree.drvTargets {
       + builtins.substring 0 7 depot.third_party.sources.home-manager.rev;
   });
 
-  clang-tools_11 = self.clang-tools.override {
-    llvmPackages = self.llvmPackages_11;
-  };
-
   # Add our Emacs packages to the fixpoint
   emacsPackagesFor = emacs: (
     (super.emacsPackagesFor emacs).overrideScope' (eself: esuper: {
diff --git a/users/grfn/system/home/modules/development.nix b/users/grfn/system/home/modules/development.nix
index f08e9d9492..26817af497 100644
--- a/users/grfn/system/home/modules/development.nix
+++ b/users/grfn/system/home/modules/development.nix
@@ -57,7 +57,7 @@ with lib;
     gdb
     lldb
     hyperfine
-    clang-tools_11
+    clang-tools
 
     clj2nix
     clojure
diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix
index 610bb0656e..8f5a02de34 100644
--- a/users/tazjin/nixos/frog/default.nix
+++ b/users/tazjin/nixos/frog/default.nix
@@ -221,8 +221,8 @@ lib.fix (self: {
       bat
       chromium
       clang-manpages
-      clang-tools_11
-      clang_11
+      clang-tools
+      clang
       curl
       direnv
       dnsutils