Merge commit 'b3c692172e5b5241b028a98e1977f9fb12eeaf42'

2 files changed, 8 insertions, 9 deletions

diff --git a/nixpkgs/pkgs/test/cuda/cuda-library-samples/generic.nix b/nixpkgs/pkgs/test/cuda/cuda-library-samples/generic.nix
index f1ce243bfa6a..350decef22dc 100644
--- a/nixpkgs/pkgs/test/cuda/cuda-library-samples/generic.nix
+++ b/nixpkgs/pkgs/test/cuda/cuda-library-samples/generic.nix
@@ -16,7 +16,6 @@ let
     version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version;
     nativeBuildInputs = [ cmake addOpenGLRunpath ];
     buildInputs = [ cudatoolkit ];
-    enableParallelBuilding = true;
     postFixup = ''
       for exe in $out/bin/*; do
         addOpenGLRunpath $exe
diff --git a/nixpkgs/pkgs/test/texlive/default.nix b/nixpkgs/pkgs/test/texlive/default.nix
index 2444334f5268..217a862e1c56 100644
--- a/nixpkgs/pkgs/test/texlive/default.nix
+++ b/nixpkgs/pkgs/test/texlive/default.nix
@@ -1,7 +1,7 @@
-{ lib, runCommandNoCC, fetchurl, file, texlive, writeShellScript }:
+{ lib, runCommand, fetchurl, file, texlive, writeShellScript }:
 
 {
-  chktex = runCommandNoCC "texlive-test-chktex" {
+  chktex = runCommand "texlive-test-chktex" {
     nativeBuildInputs = [
       (with texlive; combine { inherit scheme-infraonly chktex; })
     ];
@@ -18,7 +18,7 @@
 
   dvipng = lib.recurseIntoAttrs {
     # https://github.com/NixOS/nixpkgs/issues/75605
-    basic = runCommandNoCC "texlive-test-dvipng-basic" {
+    basic = runCommand "texlive-test-dvipng-basic" {
       nativeBuildInputs = [ file texlive.combined.scheme-medium ];
       input = fetchurl {
         name = "test_dvipng.tex";
@@ -40,7 +40,7 @@
     '';
 
     # test dvipng's limited capability to render postscript specials via GS
-    ghostscript = runCommandNoCC "texlive-test-ghostscript" {
+    ghostscript = runCommand "texlive-test-ghostscript" {
       nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ];
       input = builtins.toFile "postscript-sample.tex" ''
         \documentclass{minimal}
@@ -81,7 +81,7 @@
   };
 
   # https://github.com/NixOS/nixpkgs/issues/75070
-  dvisvgm = runCommandNoCC "texlive-test-dvisvgm" {
+  dvisvgm = runCommand "texlive-test-dvisvgm" {
     nativeBuildInputs = [ file texlive.combined.scheme-medium ];
     input = builtins.toFile "dvisvgm-sample.tex" ''
       \documentclass{article}
@@ -106,7 +106,7 @@
     mv document*.svg "$out"/
   '';
 
-  texdoc = runCommandNoCC "texlive-test-texdoc" {
+  texdoc = runCommand "texlive-test-texdoc" {
     nativeBuildInputs = [
       (with texlive; combine {
         inherit scheme-infraonly luatex texdoc;
@@ -121,7 +121,7 @@
   '';
 
   # test that language files are generated as expected
-  hyphen-base = runCommandNoCC "texlive-test-hyphen-base" {
+  hyphen-base = runCommand "texlive-test-hyphen-base" {
     hyphenBase = lib.head texlive.hyphen-base.pkgs;
     schemeFull = texlive.combined.scheme-full;
     schemeInfraOnly = texlive.combined.scheme-infraonly;
@@ -154,7 +154,7 @@
   '';
 
   # test that fmtutil.cnf is fully regenerated on scheme-full
-  fmtutilCnf = runCommandNoCC "texlive-test-fmtutil.cnf" {
+  fmtutilCnf = runCommand "texlive-test-fmtutil.cnf" {
     kpathsea = lib.head texlive.kpathsea.pkgs;
     schemeFull = texlive.combined.scheme-full;
   } ''