lix-project/flake-compat
16
0
Fork 0
Code Issues 13 Pull requests Packages Projects Releases Wiki Activity

Merge pull request #59 from hercules-ci/port-nix-7796-flake-outPath

Browse source 
nix#7796: Ensure that `self.outPath == ./.`
This commit is contained in:
Eelco Dolstra 2023-10-02 19:10:16 +02:00 committed by GitHub
parent 2bf43d60c7 bc5e257a8d
commit e1262c7073
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
default.nix
View file

@ -149,7 +149,9 @@ let
subdir = if key == lockFile.root then "" else node.locked.dir or ""; subdir = if key == lockFile.root then "" else node.locked.dir or "";
flake = import (sourceInfo + (if subdir != "" then "/" else "") + subdir + "/flake.nix"); outPath = sourceInfo + ((if subdir == "" then "" else "/") + subdir);
flake = import (outPath + "/flake.nix");
inputs = builtins.mapAttrs inputs = builtins.mapAttrs
(inputName: inputSpec: allNodes.${resolveInput inputSpec}) (inputName: inputSpec: allNodes.${resolveInput inputSpec})
@ -176,7 +178,20 @@ let
outputs = flake.outputs (inputs // { self = result; }); outputs = flake.outputs (inputs // { self = result; });
result = outputs // sourceInfo // { inherit inputs; inherit outputs; inherit sourceInfo; _type = "flake"; }; result =
outputs
# We add the sourceInfo attribute for its metadata, as they are
# relevant metadata for the flake. However, the outPath of the
# sourceInfo does not necessarily match the outPath of the flake,
# as the flake may be in a subdirectory of a source.
# This is shadowed in the next //
// sourceInfo
// {
# This shadows the sourceInfo.outPath
inherit outPath;
inherit inputs; inherit outputs; inherit sourceInfo; _type = "flake";
};
in in
if node.flake or true then if node.flake or true then