From 9a09505b777cbfadff0a86f69d7a50b33ed1b835 Mon Sep 17 00:00:00 2001 From: sterni Date: Tue, 16 Jan 2024 16:44:38 +0100 Subject: [PATCH] chore: use LLVM default version (16) over pinned version 11 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 Reviewed-by: aspen Reviewed-by: flokli Tested-by: BuildkiteCI Reviewed-by: tazjin --- third_party/overlays/tvl.nix | 4 ---- users/grfn/system/home/modules/development.nix | 2 +- users/tazjin/nixos/frog/default.nix | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 9888fc449..a070320c7 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 f08e9d949..26817af49 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 610bb0656..8f5a02de3 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