diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md
index b4fb5d067f0d..b3305e259044 100644
--- a/doc/languages-frameworks/texlive.section.md
+++ b/doc/languages-frameworks/texlive.section.md
@@ -235,7 +235,7 @@ runCommand "test.pdf" { nativeBuildInputs = [ latex_with_foiltex ]; } ''
 The font cache for LuaLaTeX is written to `$HOME`.
 Therefore, it is necessary to set `$HOME` to a writable path, e.g. [before using LuaLaTeX in nix derivations](https://github.com/NixOS/nixpkgs/issues/180639):
 ```nix
-runCommandNoCC "lualatex-hello-world" { buildInputs = [ texliveFull ]; } ''
+runCommand "lualatex-hello-world" { buildInputs = [ texliveFull ]; } ''
   mkdir $out
   echo '\documentclass{article} \begin{document} Hello world \end{document}' > main.tex
   env HOME=$(mktemp -d) lualatex  -interaction=nonstopmode -output-format=pdf -output-directory=$out ./main.tex
diff --git a/nixos/tests/acme/http01-builtin.nix b/nixos/tests/acme/http01-builtin.nix
index d92737ed6fb1..a82ef6f5652a 100644
--- a/nixos/tests/acme/http01-builtin.nix
+++ b/nixos/tests/acme/http01-builtin.nix
@@ -126,7 +126,7 @@ in
                 DNS.1 = ${config.networking.fqdn}
               '';
               csrData =
-                pkgs.runCommandNoCC "csr-and-key"
+                pkgs.runCommand "csr-and-key"
                   {
                     buildInputs = [ pkgs.openssl ];
                   }
diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix
index 547de0d1ac8f..1e6b39be7eba 100644
--- a/nixos/tests/kanidm-provisioning.nix
+++ b/nixos/tests/kanidm-provisioning.nix
@@ -4,7 +4,7 @@ let
   serverDomain = certs.domain;
 
   # copy certs to store to work around mount namespacing
-  certsPath = pkgs.runCommandNoCC "snakeoil-certs" { } ''
+  certsPath = pkgs.runCommand "snakeoil-certs" { } ''
     mkdir $out
     cp ${certs."${serverDomain}".cert} $out/snakeoil.crt
     cp ${certs."${serverDomain}".key} $out/snakeoil.key
diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix
index 9d918f156b2c..78f71fce90c6 100644
--- a/nixos/tests/kanidm.nix
+++ b/nixos/tests/kanidm.nix
@@ -8,7 +8,7 @@ let
   };
 
   # copy certs to store to work around mount namespacing
-  certsPath = pkgs.runCommandNoCC "snakeoil-certs" { } ''
+  certsPath = pkgs.runCommand "snakeoil-certs" { } ''
     mkdir $out
     cp ${certs."${serverDomain}".cert} $out/snakeoil.crt
     cp ${certs."${serverDomain}".key} $out/snakeoil.key
diff --git a/nixos/tests/nix-required-mounts/ensure-path-not-present.nix b/nixos/tests/nix-required-mounts/ensure-path-not-present.nix
index 270c268fcbd9..eddc68aa0a54 100644
--- a/nixos/tests/nix-required-mounts/ensure-path-not-present.nix
+++ b/nixos/tests/nix-required-mounts/ensure-path-not-present.nix
@@ -3,7 +3,7 @@
   feature,
 }:
 
-pkgs.runCommandNoCC "${feature}-not-present" { } ''
+pkgs.runCommand "${feature}-not-present" { } ''
   if [[ -e /${feature}-files ]]; then
     echo "No ${feature} in requiredSystemFeatures, but /${feature}-files was mounted anyway"
     exit 1
diff --git a/nixos/tests/nix-required-mounts/test-require-feature.nix b/nixos/tests/nix-required-mounts/test-require-feature.nix
index 447fd49a300a..c5a13f2a749f 100644
--- a/nixos/tests/nix-required-mounts/test-require-feature.nix
+++ b/nixos/tests/nix-required-mounts/test-require-feature.nix
@@ -3,7 +3,7 @@
   feature,
 }:
 
-pkgs.runCommandNoCC "${feature}-present" { requiredSystemFeatures = [ feature ]; } ''
+pkgs.runCommand "${feature}-present" { requiredSystemFeatures = [ feature ]; } ''
   if [[ ! -e /${feature}-files ]]; then
     echo "The host declares ${feature} support, but doesn't expose /${feature}-files" >&2
     exit 1
diff --git a/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix b/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix
index 86f275330936..9bf29de7fd24 100644
--- a/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix
+++ b/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix
@@ -2,7 +2,6 @@
   pkgs ? import <nixpkgs> { },
 }:
 
-pkgs.runCommandNoCC "nix-required-mounts-structured-attrs-no-features" { __structuredAttrs = true; }
-  ''
-    touch $out
-  ''
+pkgs.runCommand "nix-required-mounts-structured-attrs-no-features" { __structuredAttrs = true; } ''
+  touch $out
+''
diff --git a/nixos/tests/nix-required-mounts/test-structured-attrs.nix b/nixos/tests/nix-required-mounts/test-structured-attrs.nix
index 874910eee7bb..c0477258d230 100644
--- a/nixos/tests/nix-required-mounts/test-structured-attrs.nix
+++ b/nixos/tests/nix-required-mounts/test-structured-attrs.nix
@@ -3,7 +3,7 @@
   feature,
 }:
 
-pkgs.runCommandNoCC "${feature}-present-structured"
+pkgs.runCommand "${feature}-present-structured"
   {
     __structuredAttrs = true;
     requiredSystemFeatures = [ feature ];
diff --git a/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix b/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix
index d986566bde4f..00dcc3c02424 100644
--- a/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix
+++ b/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix
@@ -1,5 +1,5 @@
-{ runCommandNoCC, doctoc }:
-runCommandNoCC "doctoc-test-generates-valid-markdown.md" { nativeBuildInputs = [ doctoc ]; } ''
+{ runCommand, doctoc }:
+runCommand "doctoc-test-generates-valid-markdown.md" { nativeBuildInputs = [ doctoc ]; } ''
   cp ${./input.md} ./target.md && chmod +w ./target.md
   doctoc ./target.md
 
diff --git a/pkgs/by-name/ha/hare/cross-compilation-tests.nix b/pkgs/by-name/ha/hare/cross-compilation-tests.nix
index 45245d730e5b..3e313da6a219 100644
--- a/pkgs/by-name/ha/hare/cross-compilation-tests.nix
+++ b/pkgs/by-name/ha/hare/cross-compilation-tests.nix
@@ -2,7 +2,7 @@
   lib,
   file,
   hare,
-  runCommandNoCC,
+  runCommand,
   writeText,
 }:
 let
@@ -13,7 +13,7 @@ let
     export fn main() void = void;
   '';
 in
-runCommandNoCC "${hare.pname}-cross-compilation-test"
+runCommand "${hare.pname}-cross-compilation-test"
   {
     nativeBuildInputs = [
       hare
diff --git a/pkgs/by-name/ha/hare/mime-module-test.nix b/pkgs/by-name/ha/hare/mime-module-test.nix
index 073ae09e3557..ef53bee8c3bc 100644
--- a/pkgs/by-name/ha/hare/mime-module-test.nix
+++ b/pkgs/by-name/ha/hare/mime-module-test.nix
@@ -1,6 +1,6 @@
 {
   hare,
-  runCommandNoCC,
+  runCommand,
   writeText,
 }:
 let
@@ -18,7 +18,7 @@ let
       };
   '';
 in
-runCommandNoCC "mime-module-test" { nativeBuildInputs = [ hare ]; } ''
+runCommand "mime-module-test" { nativeBuildInputs = [ hare ]; } ''
   HARECACHE="$(mktemp -d)"
   export HARECACHE
   readonly binout="test-bin"