Unverified Commit c319ac65 authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

various: fix eval 

runCommandNoCC has been renamed to runCommand and the former has
recently been turned into a throw.
parent 6691c568

doc/languages-frameworks/texlive.section.md

+1 −1
Original line number Diff line number Diff line
@@ -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

nixos/tests/acme/http01-builtin.nix

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ in 
                DNS.1 = ${config.networking.fqdn}

              '';

              csrData =

                pkgs.runCommandNoCC "csr-and-key"

                pkgs.runCommand "csr-and-key"

                  {

                    buildInputs = [ pkgs.openssl ];

                  }

nixos/tests/kanidm-provisioning.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

nixos/tests/kanidm.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

nixos/tests/nix-required-mounts/ensure-path-not-present.nix

+1 −1
Original line number Diff line number Diff line
@@ -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