Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flake follows: resolve all follows to absolute #6036

Merged

Conversation

balsoft
Copy link
Member

@balsoft balsoft commented Feb 2, 2022

It's not possible in general to know in computeLocks, relative to
which path the follows was intended to be. So, we always resolve
follows to their absolute states when we encounter them (which can
either be in parseFlakeInput or computeLocks' fake input population).

Fixes #6013
Fixes #5609
Fixes #5697 (again)

It's not possible in general to know in computeLocks, relative to
which path the follows was intended to be. So, we always resolve
follows to their absolute states when we encounter them (which can
either be in parseFlakeInput or computeLocks' fake input population).

Fixes NixOS#6013
Fixes NixOS#5609
Fixes NixOS#5697 (again)
@edolstra edolstra merged commit fcb3344 into NixOS:master Feb 2, 2022
@edolstra edolstra deleted the balsoft/and-yet-another-follows-bugfix branch February 2, 2022 21:52
@blaggacao
Copy link
Contributor

blaggacao commented Feb 3, 2022

Fixes #5386, too?

@balsoft
Copy link
Member Author

balsoft commented Feb 3, 2022

Likely

@blaggacao
Copy link
Contributor

Thank you very much for this! Joy and Acknowledgment.

Pre:

❯ nix flake lock
warning: Git tree '/home/blaggacao/src/github.com/input-output-hk/bitte-cells' is dirty
error: input 'std/alejandra/fenix/nixpkgs' follows a non-existent input 'alejandra/nixpkgs'
(use '--show-trace' to show detailed location information)

Post:

❯ nix flake lock
warning: Git tree '/home/blaggacao/src/github.com/input-output-hk/bitte-cells' is dirty
warning: creating lock file '/home/blaggacao/src/github.com/input-output-hk/bitte-cells/flake.lock'

@sheyll
Copy link

sheyll commented Feb 11, 2022

Yeah, thanks so much!

@ztzg
Copy link

ztzg commented Mar 7, 2022

Hi @balsoft, all,

Could we label this PR with backport 2.6-maintenance? The patch applies and works on top of that branch.

(Alternatively, I could open another PR with the backport, if that's better.)

Thanks, -D

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants