Unverified Commit ecf27c22 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

requireFile: don't perform Bash expansion (#508672)

parents 16ad6ca6 b3981c08
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@

- `nodePackages.wavedrom-cli` has been removed, as it was unmaintained within nixpkgs.

- `requireFile` now treats any `message` or `url` argument as a literal string, rather than subjecting it to Bash here-doc expansion.  This allows including strings like `$PWD` in the message without needing to know about and handle the undocumented Bash expansion.

- `nodePackages.browserify` has been removed, as it was unmaintained within nixpkgs.

- `nodePackages.sass` has been removed, as it was unmaintained within nixpkgs.
+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ let
      cp baseq3/pak*.pk3 /tmp/baseq3
      nix-store --add-fixed sha256 --recursive /tmp/baseq3

      Alternatively you can set services.quake3-server.baseq3 to a path and copy the baseq3 directory into
      $services.quake3-server.baseq3/.q3a/
      Alternatively you can set services.quake3-server.baseq3 to a path and
      copy the baseq3 directory into the .q3a subdirectory of that path.
    '';
  };

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
      Once you have downloaded the file, please use the following command and re-run the
      installation:

      nix-prefetch-url file://\$PWD/${name}
      nix-prefetch-url file://$PWD/${name}
    '';
  };

+1 −8
Original line number Diff line number Diff line
@@ -928,14 +928,7 @@ rec {
        outputHash = hash_;
        preferLocalBuild = true;
        builder = writeScript "restrict-message" ''
          source ${stdenvNoCC}/setup
          cat <<_EOF_

          ***
          ${msg}
          ***

          _EOF_
          printf '%s' ${lib.escapeShellArg msg}
          exit 1
        '';
      }
+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
          message = ''
            We cannot download the commercial version automatically, as you require a license.
            Once you bought a license, you need to add your downloaded version to the nix store.
            You can do this by using "nix-prefetch-url file:///\$PWD/${commercialName}" in the
            You can do this by using "nix-prefetch-url file:///$PWD/${commercialName}" in the
            directory where you saved it.
          '';
          name = commercialName;
Loading