From 479055aee8a7e57669cbad608866014fab9fc05d Mon Sep 17 00:00:00 2001
From: Jade Lovelace <lix@jade.fyi>
Date: Sun, 9 Jun 2024 17:10:44 -0700
Subject: [PATCH] Misc workaround removals since 24.05 upgrade

Change-Id: I9491b103333cb0e25c245199e88365ded7800d2e
---
 flake.nix                    |  5 +----
 misc/clangbuildanalyzer.nix  | 33 ---------------------------------
 package.nix                  |  6 +-----
 src/libexpr/eval-settings.hh |  2 +-
 4 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 misc/clangbuildanalyzer.nix

diff --git a/flake.nix b/flake.nix
index 261690716..a02ba06d6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -135,13 +135,11 @@
                   {
                     system = crossSystem;
                   }
-                  // lib.optionalAttrs (crossSystem == "x86_64-freebsd13") { useLLVM = true; };
+                  // lib.optionalAttrs (crossSystem == "x86_64-freebsd") { useLLVM = true; };
               overlays = [
                 (overlayFor (p: p.${stdenv}))
                 (final: prev: { nixfmt = final.callPackage ./nix-support/nixfmt.nix { }; })
               ];
-
-              config.permittedInsecurePackages = [ "nix-2.13.6" ];
             };
           stdenvs = forAllStdenvs (make-pkgs null);
           native = stdenvs.stdenvPackages;
@@ -167,7 +165,6 @@
           nixUnstable = prev.nixUnstable;
 
           check-headers = final.buildPackages.callPackage ./maintainers/check-headers.nix { };
-          clangbuildanalyzer = final.buildPackages.callPackage ./misc/clangbuildanalyzer.nix { };
 
           default-busybox-sandbox-shell = final.busybox.override {
             useMusl = true;
diff --git a/misc/clangbuildanalyzer.nix b/misc/clangbuildanalyzer.nix
deleted file mode 100644
index d73fa8bbb..000000000
--- a/misc/clangbuildanalyzer.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# Upstreaming here, can be deleted once it's upstreamed:
-# https://github.com/NixOS/nixpkgs/pull/297102
-{
-  stdenv,
-  lib,
-  cmake,
-  fetchFromGitHub,
-}:
-stdenv.mkDerivation (finalAttrs: {
-  pname = "clangbuildanalyzer";
-  version = "1.5.0";
-
-  src = fetchFromGitHub {
-    owner = "aras-p";
-    repo = "ClangBuildAnalyzer";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-kmgdk634zM0W0OoRoP/RzepArSipa5bNqdVgdZO9gxo=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "Tool for analyzing Clang's -ftrace-time files";
-    homepage = "https://github.com/aras-p/ClangBuildAnalyzer";
-    maintainers = with lib.maintainers; [ lf- ];
-    license = lib.licenses.unlicense;
-    platforms = lib.platforms.unix;
-    # `long long int` != `size_t`
-    # There's no convenient lib.platforms.32bit or anything, but it's easy enough to do ourselves.
-    badPlatforms = lib.filter (plat: (lib.systems.elaborate plat).is32bit) lib.platforms.all;
-    mainProgram = "ClangBuildAnalyzer";
-  };
-})
diff --git a/package.nix b/package.nix
index d7b1374ed..02bb1d3cd 100644
--- a/package.nix
+++ b/package.nix
@@ -406,10 +406,6 @@ stdenv.mkDerivation (finalAttrs: {
           # Required to make non-NixOS Linux not complain about missing locale files during configure in a dev shell
           LOCALE_ARCHIVE = "${lib.getLib pkgs.glibcLocales}/lib/locale/locale-archive";
         };
-        # for some reason that seems accidental and was changed in
-        # NixOS 24.05-pre, clang-tools is pinned to LLVM 14 when
-        # default LLVM is newer.
-        clang-tools_llvm = clang-tools.override { inherit llvmPackages; };
 
         pythonPackages = (
           p: [
@@ -448,7 +444,7 @@ stdenv.mkDerivation (finalAttrs: {
             ++ [ (lib.mesonBool "enable-pch-std" stdenv.cc.isClang) ];
 
           packages =
-            lib.optional (stdenv.cc.isClang && hostPlatform == buildPlatform) clang-tools_llvm
+            lib.optional (stdenv.cc.isClang && hostPlatform == buildPlatform) clang-tools
             ++ [
               pythonEnv
               # docker image tool
diff --git a/src/libexpr/eval-settings.hh b/src/libexpr/eval-settings.hh
index 64c74c4b9..6282579a9 100644
--- a/src/libexpr/eval-settings.hh
+++ b/src/libexpr/eval-settings.hh
@@ -64,7 +64,7 @@ struct EvalSettings : Config
           Pure evaluation mode ensures that the result of Nix expressions is fully determined by explicitly declared inputs, and not influenced by external state:
 
           - Restrict file system and network access to files specified by cryptographic hash
-          - Disable [`bultins.currentSystem`](@docroot@/language/builtin-constants.md#builtins-currentSystem) and [`builtins.currentTime`](@docroot@/language/builtin-constants.md#builtins-currentTime)
+          - Disable [`builtins.currentSystem`](@docroot@/language/builtin-constants.md#builtins-currentSystem) and [`builtins.currentTime`](@docroot@/language/builtin-constants.md#builtins-currentTime)
         )"
         };