diff --git a/nix/pkgs/authentik/pythonapp/default.nix b/nix/pkgs/authentik/pythonapp/default.nix
index 09ed6532fc..2d0d1b8149 100644
--- a/nix/pkgs/authentik/pythonapp/default.nix
+++ b/nix/pkgs/authentik/pythonapp/default.nix
@@ -23,7 +23,7 @@ let
         nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ self.poetry ];
       });
       xmlsec = super.xmlsec.overridePythonAttrs (old: {
-        nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ self.pkgconfig pkgs.pkg-config ];
+        nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkgs.pkg-config ];
         buildInputs = (old.buildInputs or []) ++ [ pkgs.xmlsec pkgs.libxslt pkgs.libxml2 pkgs.libtool ];
       });
       mistune = super.mistune.overridePythonAttrs (old: rec {
diff --git a/nix/pkgs/baserow/backend/pynixify/packages/celery-redbeat/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/celery-redbeat/default.nix
index e5948dc988..fe9be1a6c4 100644
--- a/nix/pkgs/baserow/backend/pynixify/packages/celery-redbeat/default.nix
+++ b/nix/pkgs/baserow/backend/pynixify/packages/celery-redbeat/default.nix
@@ -2,7 +2,7 @@
 # If you run pynixify again, the file will be either overwritten or
 # deleted, and you will lose the changes you made to it.
 
-{ buildPythonPackage, celery, dateutil, fetchPypi, lib, redis, tenacity }:
+{ buildPythonPackage, celery, python-dateutil, fetchPypi, lib, redis, tenacity }:
 
 buildPythonPackage rec {
   pname = "celery-redbeat";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     sha256 = "030r39cmn2lfm1ysyvnya0ys63sfqwlk130qsdnndwjxpr0nk3fb";
   };
 
-  propagatedBuildInputs = [ redis celery dateutil tenacity ];
+  propagatedBuildInputs = [ redis celery python-dateutil tenacity ];
 
   # TODO FIXME
   doCheck = false;
diff --git a/nix/pkgs/baserow/backend/pynixify/packages/faker/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/faker/default.nix
index 219057b0c6..3d2c38a68c 100644
--- a/nix/pkgs/baserow/backend/pynixify/packages/faker/default.nix
+++ b/nix/pkgs/baserow/backend/pynixify/packages/faker/default.nix
@@ -2,7 +2,7 @@
 # If you run pynixify again, the file will be either overwritten or
 # deleted, and you will lose the changes you made to it.
 
-{ buildPythonPackage, dateutil, fetchPypi, lib, text-unidecode }:
+{ buildPythonPackage, python-dateutil, fetchPypi, lib, text-unidecode }:
 
 buildPythonPackage rec {
   pname = "faker";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "14bqdb7wngxlr9n25syab6i7dr9xjkxlq0wy31aar8yxlffixs5r";
   };
 
-  propagatedBuildInputs = [ dateutil text-unidecode ];
+  propagatedBuildInputs = [ python-dateutil text-unidecode ];
 
   # TODO FIXME
   doCheck = false;
diff --git a/nix/pkgs/hp-rom.nix b/nix/pkgs/hp-rom.nix
index fd014b0c04..f1584fd4c3 100644
--- a/nix/pkgs/hp-rom.nix
+++ b/nix/pkgs/hp-rom.nix
@@ -6,7 +6,7 @@ let
     hash = "sha256:0h3i5jbqc40sxysq20l3ky0vxbn28avhm6fh6bv3bmar4lx1azcm";
   };
 in
-pkgs.runCommandNoCC "hp-rom" {
+pkgs.runCommand "hp-rom" {
   inherit bl465c;
 
   nativeBuildInputs = [
diff --git a/nix/pkgs/prometheus-bird-exporter-lfty.nix b/nix/pkgs/prometheus-bird-exporter-lfty.nix
index 5454e9925f..eb2e29f663 100644
--- a/nix/pkgs/prometheus-bird-exporter-lfty.nix
+++ b/nix/pkgs/prometheus-bird-exporter-lfty.nix
@@ -20,7 +20,5 @@ buildGoPackage rec {
 
   passthru.tests = null;
 
-  meta = prometheus-bird-exporter.meta // {
-    url = "https://scm.linefinity.com/common/prometheus-bird-exporter-lfty";
-  };
+  inherit (prometheus-bird-exporter) meta;
 }
diff --git a/nix/pkgs/sheepshaver.nix b/nix/pkgs/sheepshaver.nix
index cee98df71c..272510a079 100644
--- a/nix/pkgs/sheepshaver.nix
+++ b/nix/pkgs/sheepshaver.nix
@@ -21,7 +21,7 @@ pkgs.stdenv.mkDerivation rec {
   sourceRoot = "writable/SheepShaver/src/Unix";
 
   nativeBuildInputs = with pkgs; [
-    autoconf automake file perl pkgconfig
+    autoconf automake file perl pkg-config
   ];
 
   buildInputs = with pkgs; [
diff --git a/ops/maint/update_nixpkgs/default.nix b/ops/maint/update_nixpkgs/default.nix
index dde81f3938..e09c3cdf98 100644
--- a/ops/maint/update_nixpkgs/default.nix
+++ b/ops/maint/update_nixpkgs/default.nix
@@ -4,7 +4,7 @@ let
   mercurial = (pkgs.mercurial.overridePythonAttrs (origAttrs: {
     propagatedBuildInputs = [pkgs.python3Packages.hg-evolve];
   }));
-  updateNixpkgs = pkgs.runCommandNoCC "update_nixpkgs" {
+  updateNixpkgs = pkgs.runCommand "update_nixpkgs" {
     buildInputs = with pkgs; [ makeWrapper ];
   } ''
     mkdir -p $out/bin
@@ -27,7 +27,7 @@ pkgs.dockerTools.buildImage {
 
   contents = [
     pkgs.cacert updateNixpkgs
-    (pkgs.runCommandNoCC "update_nixpkgs_content" {} ''
+    (pkgs.runCommand "update_nixpkgs_content" {} ''
   mkdir $out $out/root $out/root/.ssh $out/etc $out/tmp
   chmod 700 $out/root $out/root/.ssh
   chmod 1777 $out/tmp
diff --git a/ops/nixos/bvm-heptapod/default.nix b/ops/nixos/bvm-heptapod/default.nix
index d1363b9c06..d9818c0a5b 100644
--- a/ops/nixos/bvm-heptapod/default.nix
+++ b/ops/nixos/bvm-heptapod/default.nix
@@ -179,7 +179,7 @@ in {
         chmod -R u=rwX,go= /srv/gitlab-runner/.ssh
       '';
       environment.systemPackages = with pkgs; [
-        vim rxvt_unicode.terminfo kitty.terminfo rsync jq
+        vim rxvt-unicode-unwrapped.terminfo kitty.terminfo rsync jq
         depot.nix.pkgs.heptapod-runner-mercurial
       ];
     };
diff --git a/ops/nixos/lib/common.nix b/ops/nixos/lib/common.nix
index 3054349bd6..28d05fab09 100644
--- a/ops/nixos/lib/common.nix
+++ b/ops/nixos/lib/common.nix
@@ -137,7 +137,7 @@ in
     };
 
     environment.systemPackages = with pkgs; [
-      vim rxvt_unicode.terminfo tmux rebuilder tailscale rsync libarchive tcpdump restic
+      vim rxvt-unicode-unwrapped.terminfo tmux rebuilder tailscale rsync libarchive tcpdump restic
       alacritty.terminfo kitty.terminfo
       iftop htop jq
       depot.nix.pkgs.mercurial
diff --git a/ops/nixos/lib/home-manager/common.nix b/ops/nixos/lib/home-manager/common.nix
index c1fc4450b4..d2d354ff11 100644
--- a/ops/nixos/lib/home-manager/common.nix
+++ b/ops/nixos/lib/home-manager/common.nix
@@ -133,7 +133,7 @@ in
       #!/bin/sh
       exec "${home-manager}/bin/home-manager" -f "${config.home.homeDirectory}/depot/home-manager-ext.nix" -A "${configName}" "$@"
     '')
-    rxvt_unicode.terminfo tmux rsync libarchive tcpdump restic
+    rxvt-unicode-unwrapped.terminfo tmux rsync libarchive tcpdump restic
     alacritty.terminfo kitty.terminfo
     iftop htop jq
     depot.nix.pkgs.mercurial
diff --git a/ops/nixos/lib/home-manager/graphical-client.nix b/ops/nixos/lib/home-manager/graphical-client.nix
index 1cd3816a3a..8734288bf1 100644
--- a/ops/nixos/lib/home-manager/graphical-client.nix
+++ b/ops/nixos/lib/home-manager/graphical-client.nix
@@ -22,9 +22,9 @@
       depot.nix.pkgs.lutris
       pavucontrol
       pngquant
-      rxvt_unicode
+      rxvt-unicode
       teamspeak_client
-      virtmanager
+      virt-manager
       xclip
       xss-lock
       yubioath-desktop
diff --git a/ops/raritan/ssl-renew/default.nix b/ops/raritan/ssl-renew/default.nix
index 4cccdfbc6e..6aaf3f2268 100644
--- a/ops/raritan/ssl-renew/default.nix
+++ b/ops/raritan/ssl-renew/default.nix
@@ -4,7 +4,7 @@
 
 { depot, pkgs, ... }:
 
-pkgs.runCommandNoCC "raritan-update" {
+pkgs.runCommand "raritan-update" {
   inherit (pkgs) curl jq;
 } ''
   mkdir $out
diff --git a/third_party/default.nix b/third_party/default.nix
index b1885a0e0d..5d598d3504 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -6,6 +6,7 @@
 let
   nixpkgsConfig = {
     allowUnfree = true;
+    checkMeta = false;
     permittedInsecurePackages = [
       "p7zip-16.02"
     ];
@@ -36,7 +37,7 @@ let
     sha256 = "sha256:0qjyfmw5v7s6ynjns4a61vlyj9cghj7vbpgrp9147ngb1f8krz2c";
   };
 
-  tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; };
+  tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; inherit nixpkgsConfig; };
 in
 rec {
   inherit nixpkgsConfig nixpkgs;
diff --git a/third_party/tvl/corp/website/default.nix b/third_party/tvl/corp/website/default.nix
index 2011e2a376..f226c19f74 100644
--- a/third_party/tvl/corp/website/default.nix
+++ b/third_party/tvl/corp/website/default.nix
@@ -31,7 +31,7 @@ let
     '';
   };
 in
-pkgs.runCommandNoCC "corp-website" { } ''
+pkgs.runCommand "corp-website" { } ''
   mkdir $out
   cp ${index} $out/index.html
 ''
diff --git a/third_party/tvl/fun/gemma/default.nix b/third_party/tvl/fun/gemma/default.nix
index 4a26005852..f3fedad17b 100644
--- a/third_party/tvl/fun/gemma/default.nix
+++ b/third_party/tvl/fun/gemma/default.nix
@@ -1,7 +1,7 @@
 { depot, pkgs, ... }:
 
 let
-  inherit (pkgs) cacert iana-etc libredirect stdenv runCommandNoCC writeText;
+  inherit (pkgs) cacert iana-etc libredirect stdenv runCommand writeText;
   elmPackages = depot.third_party.elmPackages_0_18;
 
   frontend = stdenv.mkDerivation {
@@ -28,7 +28,7 @@ let
 
   injectFrontend = writeText "gemma-frontend.lisp" ''
     (in-package :gemma)
-    (setq *static-file-location* "${runCommandNoCC "frontend" {} ''
+    (setq *static-file-location* "${runCommand "frontend" {} ''
       mkdir -p $out
       cp ${frontend} $out/index.html
     ''}/")
diff --git a/third_party/tvl/nix/buildLisp/default.nix b/third_party/tvl/nix/buildLisp/default.nix
index a8168334a7..d61bad4544 100644
--- a/third_party/tvl/nix/buildLisp/default.nix
+++ b/third_party/tvl/nix/buildLisp/default.nix
@@ -8,7 +8,7 @@
 
 let
   inherit (builtins) map elemAt match filter;
-  inherit (pkgs) lib runCommandNoCC makeWrapper writeText writeShellScriptBin sbcl ecl-static ccl;
+  inherit (pkgs) lib runCommand makeWrapper writeText writeShellScriptBin sbcl ecl-static ccl;
   inherit (pkgs.stdenv) targetPlatform;
 
   #
@@ -187,7 +187,7 @@ let
       lispNativeDeps = allNative native lispDeps;
       filteredSrcs = implFilter implementation srcs;
     in
-    runCommandNoCC name
+    runCommand name
       {
         LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps;
         LANG = "C.UTF-8";
@@ -475,7 +475,7 @@ let
           } $@
         '';
 
-      bundled = name: runCommandNoCC "${name}-cllib"
+      bundled = name: runCommand "${name}-cllib"
         {
           passthru = {
             lispName = name;
@@ -640,7 +640,7 @@ let
             }
         else null;
     in
-    lib.fix (self: runCommandNoCC "${name}-cllib"
+    lib.fix (self: runCommand "${name}-cllib"
       {
         LD_LIBRARY_PATH = lib.makeLibraryPath lispNativeDeps;
         LANG = "C.UTF-8";
@@ -707,7 +707,7 @@ let
             }
         else null;
     in
-    lib.fix (self: runCommandNoCC "${name}"
+    lib.fix (self: runCommand "${name}"
       {
         nativeBuildInputs = [ makeWrapper ];
         LD_LIBRARY_PATH = libPath;
diff --git a/third_party/tvl/nix/buildkite/default.nix b/third_party/tvl/nix/buildkite/default.nix
index 6a0e9d246d..b6cef66d9a 100644
--- a/third_party/tvl/nix/buildkite/default.nix
+++ b/third_party/tvl/nix/buildkite/default.nix
@@ -28,7 +28,7 @@ let
     toJSON
     unsafeDiscardStringContext;
 
-  inherit (pkgs) lib runCommandNoCC writeText;
+  inherit (pkgs) lib runCommand writeText;
   inherit (depot.nix.readTree) mkLabel;
 in
 rec {
@@ -206,7 +206,7 @@ rec {
       postBuildChunks = pipelineChunks "post" postSteps;
       chunks = buildChunks ++ postBuildChunks;
     in
-    runCommandNoCC "buildkite-pipeline" { } ''
+    runCommand "buildkite-pipeline" { } ''
       mkdir $out
       echo "Generated ${toString (length chunks)} pipeline chunks"
       ${
diff --git a/third_party/tvl/nix/renderMarkdown/default.nix b/third_party/tvl/nix/renderMarkdown/default.nix
index 8d6b31cfcc..c5e830c834 100644
--- a/third_party/tvl/nix/renderMarkdown/default.nix
+++ b/third_party/tvl/nix/renderMarkdown/default.nix
@@ -3,6 +3,6 @@
 
 with depot.nix.yants;
 
-defun [ path drv ] (file: pkgs.runCommandNoCC "${file}.rendered.html" { } ''
+defun [ path drv ] (file: pkgs.runCommand "${file}.rendered.html" { } ''
   cat ${file} | ${depot.tools.cheddar}/bin/cheddar --about-filter ${file} > $out
 '')
diff --git a/third_party/tvl/nix/sparseTree/default.nix b/third_party/tvl/nix/sparseTree/default.nix
index 16fc9b6103..bf56a5348c 100644
--- a/third_party/tvl/nix/sparseTree/default.nix
+++ b/third_party/tvl/nix/sparseTree/default.nix
@@ -64,7 +64,7 @@ in
 
 # TODO(sterni): teach readTree to also read symlinked directories,
   # so we ln -sT instead of cp -aT.
-pkgs.runCommandNoCC "sparse-${builtins.baseNameOf root}" { } (
+pkgs.runCommand "sparse-${builtins.baseNameOf root}" { } (
   lib.concatMapStrings
     ({ src, dst }: ''
       mkdir -p "$(dirname "$out${dst}")"
diff --git a/third_party/tvl/ops/dns/default.nix b/third_party/tvl/ops/dns/default.nix
index ad6e136f27..33fe6d6fe7 100644
--- a/third_party/tvl/ops/dns/default.nix
+++ b/third_party/tvl/ops/dns/default.nix
@@ -2,7 +2,7 @@
 { depot, pkgs, ... }:
 
 let
-  checkZone = zone: file: pkgs.runCommandNoCC "${zone}-check" { } ''
+  checkZone = zone: file: pkgs.runCommand "${zone}-check" { } ''
     ${pkgs.bind}/bin/named-checkzone -i local ${zone} ${file} | tee $out
   '';
 
diff --git a/third_party/tvl/ops/modules/clbot.nix b/third_party/tvl/ops/modules/clbot.nix
index 958d321f81..28ea5382d3 100644
--- a/third_party/tvl/ops/modules/clbot.nix
+++ b/third_party/tvl/ops/modules/clbot.nix
@@ -3,7 +3,7 @@
 
 let
   inherit (builtins) attrValues concatStringsSep mapAttrs readFile;
-  inherit (pkgs) runCommandNoCC;
+  inherit (pkgs) runCommand;
 
   inherit (lib)
     listToAttrs
@@ -21,7 +21,7 @@ let
       (attrValues (mapAttrs (key: value: "-${key} \"${toString value}\"") flags));
 
   # Escapes a unit name for use in systemd
-  systemdEscape = name: removeSuffix "\n" (readFile (runCommandNoCC "unit-name" { } ''
+  systemdEscape = name: removeSuffix "\n" (readFile (runCommand "unit-name" { } ''
     ${pkgs.systemd}/bin/systemd-escape '${name}' >> $out
   ''));
 
diff --git a/third_party/tvl/ops/modules/monorepo-gerrit.nix b/third_party/tvl/ops/modules/monorepo-gerrit.nix
index 509500c913..17fbf73ee8 100644
--- a/third_party/tvl/ops/modules/monorepo-gerrit.nix
+++ b/third_party/tvl/ops/modules/monorepo-gerrit.nix
@@ -9,7 +9,7 @@ let
     exec -a ${name} ${depot.ops.besadii}/bin/besadii "$@"
   '';
 
-  gerritHooks = pkgs.runCommandNoCC "gerrit-hooks" { } ''
+  gerritHooks = pkgs.runCommand "gerrit-hooks" { } ''
     mkdir -p $out
     ln -s ${besadiiWithConfig "change-merged"} $out/change-merged
     ln -s ${besadiiWithConfig "patchset-created"} $out/patchset-created
diff --git a/third_party/tvl/ops/modules/tvl-buildkite.nix b/third_party/tvl/ops/modules/tvl-buildkite.nix
index a6e7372a25..8f662a0f10 100644
--- a/third_party/tvl/ops/modules/tvl-buildkite.nix
+++ b/third_party/tvl/ops/modules/tvl-buildkite.nix
@@ -13,7 +13,7 @@ let
 
   # All Buildkite hooks are actually besadii, but it's being invoked
   # with different names.
-  buildkiteHooks = pkgs.runCommandNoCC "buildkite-hooks" { } ''
+  buildkiteHooks = pkgs.runCommand "buildkite-hooks" { } ''
     mkdir -p $out/bin
     ln -s ${besadiiWithConfig "post-command"} $out/bin/post-command
   '';
diff --git a/third_party/tvl/ops/pipelines/depot.nix b/third_party/tvl/ops/pipelines/depot.nix
index 6d9e625e04..3a7788baed 100644
--- a/third_party/tvl/ops/pipelines/depot.nix
+++ b/third_party/tvl/ops/pipelines/depot.nix
@@ -42,7 +42,7 @@ let
 
   drvmap = depot.nix.buildkite.mkDrvmap depot.ci.targets;
 in
-pkgs.runCommandNoCC "depot-pipeline" { } ''
+pkgs.runCommand "depot-pipeline" { } ''
   mkdir $out
   cp -r ${pipeline}/* $out
   cp ${drvmap} $out/drvmap.json
diff --git a/third_party/tvl/third_party/bat_syntaxes/default.nix b/third_party/tvl/third_party/bat_syntaxes/default.nix
index a48962dd36..15af130916 100644
--- a/third_party/tvl/third_party/bat_syntaxes/default.nix
+++ b/third_party/tvl/third_party/bat_syntaxes/default.nix
@@ -7,9 +7,9 @@
 { pkgs, ... }:
 
 let
-  inherit (pkgs) bat runCommandNoCC;
+  inherit (pkgs) bat runCommand;
 in
-runCommandNoCC "bat-syntaxes.bin" { } ''
+runCommand "bat-syntaxes.bin" { } ''
   export HOME=$PWD
   mkdir -p .config/bat/syntaxes
   cp ${./Prolog.sublime-syntax} .config/bat/syntaxes
diff --git a/third_party/tvl/tvix/proto/default.nix b/third_party/tvl/tvix/proto/default.nix
index ac0ee66e87..35e2eba7fe 100644
--- a/third_party/tvl/tvix/proto/default.nix
+++ b/third_party/tvl/tvix/proto/default.nix
@@ -3,7 +3,7 @@
 # anywhere, it just functions as a CI check for now.
 { pkgs, ... }:
 
-pkgs.runCommandNoCC "tvix-cc-proto" { } ''
+pkgs.runCommand "tvix-cc-proto" { } ''
   mkdir $out
   ${pkgs.protobuf}/bin/protoc -I ${./.} evaluator.proto --cpp_out=$out
 ''
diff --git a/third_party/tvl/users/grfn/resume/default.nix b/third_party/tvl/users/grfn/resume/default.nix
index 21801ad9e7..4454e74c82 100644
--- a/third_party/tvl/users/grfn/resume/default.nix
+++ b/third_party/tvl/users/grfn/resume/default.nix
@@ -2,7 +2,7 @@
 
 with pkgs.lib;
 
-pkgs.runCommandNoCC "resume.pdf"
+pkgs.runCommand "resume.pdf"
 {
   buildInputs = [
     (pkgs.texlive.combine {
diff --git a/third_party/tvl/users/grfn/terraform/workspace.nix b/third_party/tvl/users/grfn/terraform/workspace.nix
index 92bf6e4ec1..114105642a 100644
--- a/third_party/tvl/users/grfn/terraform/workspace.nix
+++ b/third_party/tvl/users/grfn/terraform/workspace.nix
@@ -3,7 +3,7 @@ name: { plugins }: module_tf:
 
 let
 
-  inherit (pkgs) lib runCommandNoCC writeText writeScript;
+  inherit (pkgs) lib runCommand writeText writeScript;
   inherit (lib) filterAttrsRecursive;
 
   allPlugins = (p: plugins p ++ (with p; [
@@ -38,7 +38,7 @@ let
     plugins = plugins_tf;
   };
 
-  module = runCommandNoCC "module" { } ''
+  module = runCommand "module" { } ''
     mkdir $out
     ${lib.concatStrings (lib.mapAttrsToList (k: config_tf:
       (let
@@ -72,7 +72,7 @@ let
   '';
 
   # TODO: import (-config)
-  tfcmds = runCommandNoCC "${name}-tfcmds" { } ''
+  tfcmds = runCommand "${name}-tfcmds" { } ''
     mkdir -p $out/bin
     ln -s ${init} $out/bin/init
     ln -s ${tfcmd} $out/bin/validate
@@ -95,7 +95,7 @@ in
   #   destroy = depot.nix.nixRunWrapper "destroy" tfcmds;
   # };
 
-  test = runCommandNoCC "${name}-test" { } ''
+  test = runCommand "${name}-test" { } ''
     set -e
     export TF_STATE_ROOT=$(pwd)
     ${tfcmds}/bin/init
diff --git a/third_party/tvl/users/sterni/nix/html/tests/default.nix b/third_party/tvl/users/sterni/nix/html/tests/default.nix
index 0d80f2f1cd..ed520675c5 100644
--- a/third_party/tvl/users/sterni/nix/html/tests/default.nix
+++ b/third_party/tvl/users/sterni/nix/html/tests/default.nix
@@ -75,7 +75,7 @@ let
   ]);
 in
 
-pkgs.runCommandNoCC "html.nix.html"
+pkgs.runCommand "html.nix.html"
 {
   passAsFile = [ "exampleDocument" ];
   inherit exampleDocument;
diff --git a/third_party/tvl/users/sterni/nixpkgs-crate-holes/default.nix b/third_party/tvl/users/sterni/nixpkgs-crate-holes/default.nix
index c24200ff10..1630ecb8f1 100644
--- a/third_party/tvl/users/sterni/nixpkgs-crate-holes/default.nix
+++ b/third_party/tvl/users/sterni/nixpkgs-crate-holes/default.nix
@@ -56,7 +56,7 @@ let
     if !(drv ? cargoDeps.outPath)
     then null
     else
-      pkgs.runCommandNoCC "${drv.name}-Cargo.lock" { } ''
+      pkgs.runCommand "${drv.name}-Cargo.lock" { } ''
         if test -d "${drv.cargoDeps}"; then
           cp "${drv.cargoDeps}/Cargo.lock" "$out"
         fi
diff --git a/third_party/tvl/users/tazjin/dns/default.nix b/third_party/tvl/users/tazjin/dns/default.nix
index 6c51cb5de4..6ff6cc06e2 100644
--- a/third_party/tvl/users/tazjin/dns/default.nix
+++ b/third_party/tvl/users/tazjin/dns/default.nix
@@ -2,7 +2,7 @@
 { depot, pkgs, ... }:
 
 let
-  checkZone = zone: file: pkgs.runCommandNoCC "${zone}-check" { } ''
+  checkZone = zone: file: pkgs.runCommand "${zone}-check" { } ''
     ${pkgs.bind}/bin/named-checkzone -i local ${zone} ${file} | tee $out
   '';
 
diff --git a/third_party/tvl/web/atom-feed/default.nix b/third_party/tvl/web/atom-feed/default.nix
index fca69e20fa..27c90a7b91 100644
--- a/third_party/tvl/web/atom-feed/default.nix
+++ b/third_party/tvl/web/atom-feed/default.nix
@@ -7,7 +7,7 @@ with depot.nix.yants;
 let
   inherit (builtins) foldl' map readFile replaceStrings sort;
   inherit (lib) concatStrings concatStringsSep max removeSuffix;
-  inherit (pkgs) runCommandNoCC;
+  inherit (pkgs) runCommand;
 
   # 'link' describes a related link to a feed, or feed element.
   #
@@ -90,7 +90,7 @@ let
 
   # Feed generation functions:
 
-  renderEpoch = epoch: removeSuffix "\n" (readFile (runCommandNoCC "date-${toString epoch}" { } ''
+  renderEpoch = epoch: removeSuffix "\n" (readFile (runCommand "date-${toString epoch}" { } ''
     date --date='@${toString epoch}' --utc --iso-8601='seconds' > $out
   ''));
 
diff --git a/third_party/tvl/web/blog/fragments.nix b/third_party/tvl/web/blog/fragments.nix
index 19d62fa474..e5e29607bd 100644
--- a/third_party/tvl/web/blog/fragments.nix
+++ b/third_party/tvl/web/blog/fragments.nix
@@ -8,7 +8,7 @@
 
 let
   inherit (builtins) filter map hasAttr replaceStrings;
-  inherit (pkgs) runCommandNoCC writeText;
+  inherit (pkgs) runCommand writeText;
   inherit (depot.nix) renderMarkdown;
 
   staticUrl = "https://static.tvl.fyi/${depot.web.static.drvHash}";
@@ -61,7 +61,7 @@ let
     <hr>
   '';
 
-  renderPost = { name, footer, ... }: post: runCommandNoCC "${post.key}.html" { } ''
+  renderPost = { name, footer, ... }: post: runCommand "${post.key}.html" { } ''
     cat ${writeText "header.html" (header name post.title)} > $out
 
     # Write the post title & date
diff --git a/third_party/tvl/web/todolist/default.nix b/third_party/tvl/web/todolist/default.nix
index c37a655559..4712ad21ba 100644
--- a/third_party/tvl/web/todolist/default.nix
+++ b/third_party/tvl/web/todolist/default.nix
@@ -8,7 +8,7 @@ let
   inherit (pkgs)
     jq
     ripgrep
-    runCommandNoCC
+    runCommand
     writeTextFile
     ;
 
@@ -39,7 +39,7 @@ let
     user = string;
   };
 
-  allTodos = fromJSON (readFile (runCommandNoCC "depot-todos.json" { } ''
+  allTodos = fromJSON (readFile (runCommand "depot-todos.json" { } ''
     ${ripgrep}/bin/rg --json 'TODO\(\w+\):.*$' ${depot.path} | \
       ${jq}/bin/jq -s -f ${./extract-todos.jq} > $out
   ''));
diff --git a/third_party/tvl/web/tvl/default.nix b/third_party/tvl/web/tvl/default.nix
index 262be54c0e..044d2791d6 100644
--- a/third_party/tvl/web/tvl/default.nix
+++ b/third_party/tvl/web/tvl/default.nix
@@ -4,7 +4,7 @@ with depot.nix.yants;
 
 let
   inherit (builtins) filter;
-  inherit (pkgs) graphviz runCommandNoCC writeText;
+  inherit (pkgs) graphviz runCommand writeText;
   inherit (depot.web) atom-feed blog tvl;
 
   listPosts = defun [ (list blog.post) string ] (posts:
@@ -16,7 +16,7 @@ let
       (map (p: "cp ${blog.renderPost tvl.blog.config p} $out/blog/${p.key}.html") posts)
   );
 
-  tvlGraph = runCommandNoCC "tvl.svg"
+  tvlGraph = runCommand "tvl.svg"
     {
       nativeBuildInputs = with pkgs; [ fontconfig freetype cairo jetbrains-mono ];
     } ''
@@ -123,7 +123,7 @@ let
     '';
   };
 in
-runCommandNoCC "website" { } ''
+runCommand "website" { } ''
   mkdir -p $out/blog
   cp ${homepage} $out/index.html
   ${postRenderingCommands tvl.blog.posts}
diff --git a/third_party/tvl/web/tvl/logo/default.nix b/third_party/tvl/web/tvl/logo/default.nix
index d9e023946a..8084135492 100644
--- a/third_party/tvl/web/tvl/logo/default.nix
+++ b/third_party/tvl/web/tvl/logo/default.nix
@@ -78,7 +78,7 @@ depot.nix.readTree.drvTargets (lib.fix (self: {
   logoSvg = style: pkgs.writeText "logo.svg" (logoSvg style);
 
   # Create a PNG of the TVL logo with the specified style and DPI.
-  logoPng = style: dpi: pkgs.runCommandNoCC "logo.png" { } ''
+  logoPng = style: dpi: pkgs.runCommand "logo.png" { } ''
     ${pkgs.inkscape}/bin/inkscape \
       --export-area-drawing \
       --export-background-opacity 0 \
diff --git a/third_party/tvl/web/tvl/template/default.nix b/third_party/tvl/web/tvl/template/default.nix
index 6b6a5b0303..50ddc31e73 100644
--- a/third_party/tvl/web/tvl/template/default.nix
+++ b/third_party/tvl/web/tvl/template/default.nix
@@ -14,11 +14,11 @@
 }@args:
 
 let
-  inherit (pkgs) runCommandNoCC lib;
+  inherit (pkgs) runCommand lib;
   inherit (depot.tools) cheddar;
 in
 
-runCommandNoCC "${lib.strings.sanitizeDerivationName title}-index.html"
+runCommand "${lib.strings.sanitizeDerivationName title}-index.html"
 {
   headerPart = ''
     <!DOCTYPE html>