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

Revert "devShellTools.unstructuredDerivationInputEnv: Match passAsFile basename" 

This reverts commit 1cf3103b.

The commit implemented a "nice to have" TODO, which ultimately causes
hash differences between Lix and Nix. We can't conditionally use the
`convertHash` builtin, because we don't have an alternative to produce
the same results.
parent 939affa9

pkgs/build-support/dev-shell-tools/default.nix

+2 −19
Original line number Diff line number Diff line 
{

  lib,

  writeTextFile,

  writeText,

}:

let

  inherit (builtins) typeOf;
@@ -36,24 +36,7 @@ rec { 
          str = valueToString value;

        in

        if lib.elem name (drvAttrs.passAsFile or [ ]) then

          let

            nameHash =

              if builtins ? convertHash then

                builtins.convertHash {

                  hash = "sha256:" + builtins.hashString "sha256" name;

                  toHashFormat = "nix32";

                }

              else

                builtins.hashString "sha256" name;

            basename = ".attr-${nameHash}";

          in

          lib.nameValuePair "${name}Path" "${

            writeTextFile {

              name = "shell-passAsFile-${name}";

              text = str;

              destination = "/${basename}";

            }

          }/${basename}"

          lib.nameValuePair "${name}Path" "${writeText "shell-passAsFile-${name}" str}"

        else

          lib.nameValuePair name str

      )

pkgs/build-support/dev-shell-tools/tests/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -170,10 +170,6 @@ lib.recurseIntoAttrs { 
            set -x



            diff $exampleBarPathString $barPath



            ${lib.optionalString (builtins ? convertHash) ''

              [[ "$(basename $exampleBarPathString)" = "$(basename $barPath)" ]]

            ''}

          )



          ''${args:+fail "args should not be set by Nix. We don't expect it to and unstructuredDerivationInputEnv removes it."}