Skip to content

Commit

Permalink
closure-info: another half-blind attempt to fix on Hydra
Browse files Browse the repository at this point in the history 
The previous one was very bad and worsened the situation.
But even running with some nix-1.12 I'm unable to reproduce
the original failure.  Let's unblock channels for now.
  • Loading branch information
@vcunat
vcunat committed Nov 1, 2017
1 parent 7320572 commit c4be15a
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions pkgs/build-support/closure-info.nix
View file
Expand Up @@ -8,7 +8,10 @@

{ rootPaths }:

if builtins.langVersion >= 5 then
#if builtins.langVersion >= 5 then
# FIXME: it doesn't work on Hydra, failing to find mkdir;
# perhaps .attrs.sh clobbers PATH with new nix?
if false then

# Nix >= 1.12: Include NAR hash / size info.

Expand All @@ -19,7 +22,7 @@ if builtins.langVersion >= 5 then

exportReferencesGraph.closure = rootPaths;

nativeBuildInputs = [ jq ];
PATH = "${coreutils}/bin:${jq}/bin";

builder = builtins.toFile "builder"
''
Expand Down

3 comments on commit c4be15a

@vcunat
Copy link
Member Author

@vcunat vcunat commented on c4be15a Nov 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/cc @edolstra.

@globin
Copy link
Member

@globin globin commented on c4be15a Nov 1, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also cc @Ericson2314 (probably has to do with __structuredAttrs = true;)

@Ericson2314
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm I kind of forgot now (:o) but there were some unbisectable failures due to structureAttrs appearing behind the scenes.

In this case, nativeBuildInputs to PATH logic is probably broken by it.

Please sign in to comment.