commit b3561f17f6df73b079cc81600ee88853fa2ffa13 · pyrox.dev/nixpkgs

+8 -4

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

···

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

     

       32
       32
        
               then

     

       33
       33
        
                 let

     

       34
       34
       -
                   nameHash = builtins.convertHash {

     

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

     

       36
       36
       -
                     toHashFormat = "nix32";

     

       37
       37
       -
                   };

     

       34
       34
       +
                   nameHash =

     

       35
       35
       +
                     if builtins?convertHash

     

       36
       36
       +
                     then builtins.convertHash {

     

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

     

       38
       38
       +
                       toHashFormat = "nix32";

     

       39
       39
       +
                     }

     

       40
       40
       +
                     else

     

       41
       41
       +
                       builtins.hashString "sha256" name;

     

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

     

       39
       43
        
                 in

     

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

+3 -1

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

···

       149
       149
        
       

     

       150
       150
        
                 diff $exampleBarPathString $barPath

     

       151
       151
        
       

     

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

     

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

     

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

     

       154
       154
       +
                 ''}

     

       153
       155
        
               )

     

       154
       156
        
       

     

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