Merge "make lix dev shells un-bear-able since we un-make them now" into main

This commit is contained in:
jade 2024-05-17 20:44:02 +00:00 committed by Gerrit Code Review
commit 0d2cc81956

View file

@ -375,7 +375,6 @@ stdenv.mkDerivation (finalAttrs: {
just, just,
nixfmt, nixfmt,
glibcLocales, glibcLocales,
bear,
pre-commit-checks, pre-commit-checks,
clang-tools, clang-tools,
llvmPackages, llvmPackages,
@ -418,7 +417,6 @@ stdenv.mkDerivation (finalAttrs: {
llvmPackages.clang-unwrapped.dev llvmPackages.clang-unwrapped.dev
] ]
++ lib.optional (pre-commit-checks ? enabledPackages) pre-commit-checks.enabledPackages ++ lib.optional (pre-commit-checks ? enabledPackages) pre-commit-checks.enabledPackages
++ lib.optional (stdenv.cc.isClang && !stdenv.buildPlatform.isDarwin) bear
++ lib.optional (lib.meta.availableOn stdenv.buildPlatform clangbuildanalyzer) clangbuildanalyzer ++ lib.optional (lib.meta.availableOn stdenv.buildPlatform clangbuildanalyzer) clangbuildanalyzer
++ finalAttrs.checkInputs; ++ finalAttrs.checkInputs;