diff --git a/pkgs/build-support/dev-shell-tools/default.nix b/pkgs/build-support/dev-shell-tools/default.nix index 264b6a31f07a..9a0520229c35 100644 --- a/pkgs/build-support/dev-shell-tools/default.nix +++ b/pkgs/build-support/dev-shell-tools/default.nix @@ -1,6 +1,6 @@ { 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 ) diff --git a/pkgs/build-support/dev-shell-tools/tests/default.nix b/pkgs/build-support/dev-shell-tools/tests/default.nix index 074aa8462a7c..d1be8699b751 100644 --- a/pkgs/build-support/dev-shell-tools/tests/default.nix +++ b/pkgs/build-support/dev-shell-tools/tests/default.nix @@ -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."}