Unverified Commit 21298092 authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

various: fix eval (#456501)

parents ed1808da c319ac65

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/modules/services/misc/docker-registry.nix

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ in 
  options.services.dockerRegistry = {

    enable = lib.mkEnableOption "Docker Registry";



    package = lib.mkPackageOption pkgs "docker-distribution" {

    package = lib.mkPackageOption pkgs "distribution" {

      example = "gitlab-container-registry";

    };

nixos/modules/services/misc/gitlab.nix

+4 −4
Original line number Diff line number Diff line
@@ -588,12 +588,12 @@ in 
            if versionAtLeast config.system.stateVersion "23.11" then

              pkgs.gitlab-container-registry

            else

              pkgs.docker-distribution;

          defaultText = literalExpression "pkgs.docker-distribution";

              pkgs.distribution;

          defaultText = literalExpression "pkgs.distribution";

          description = ''

            Container registry package to use.



            External container registries such as `pkgs.docker-distribution` are not supported

            External container registries such as `pkgs.distribution` are not supported

            anymore since GitLab 16.0.0.

          '';

        };
@@ -1179,7 +1179,7 @@ in 
        (

          cfg.registry.enable

          && versionAtLeast (getVersion cfg.packages.gitlab) "16.0.0"

          && cfg.registry.package == pkgs.docker-distribution

          && cfg.registry.package == pkgs.distribution

        )

        ''

          Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release.

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