builtins.getFlake: Allow inputs to be overridden #11952
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This uses the same syntax as flake inputs in flake.nix, e.g.
builtins.getFlake {
url = "github:NixOS/nix/55bc52401966fbffa525c574c14f67b00bc4fb3a";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/c69a9bffbecde46b4b939465422ddc59493d3e4d";
}
Note that currently it's not supported to set `flake = false` or to
use `follows` (because lockFlake() doesn't support that for CLI
overrides), but it could be implemented in the future.
Fixes NixOS#9154.
github-actions
bot
added
the
with-tests
roberth
reviewed
Nov 25, 2024
xokdvium
reviewed
Nov 25, 2024
Comment on lines
+853
to
+857
| std::function<void(const InputPath & inputPath, const FlakeInput & input)> recurse; | ||
|
|
||
| recurse = [&](const InputPath & inputPath, const FlakeInput & input) | ||
| { | ||
| if (!input.ref) |
There was a problem hiding this comment.
It's not strictly necessary to use std::function and its inherent indirection for recursive lambdas. Though in this case this shouldn't matter much. With C++23 it's possible to use "deducing this" https://en.cppreference.com/w/cpp/language/member_functions#Explicit_object_member_functions. For pre C++23 one can use the following hack:
auto recurse_impl = [&](auto& self, const InputPath & inputPath, const FlakeInput & input) {
....
recurse_impl(self, ....);
};
auto recurse = [&](const InputPath & inputPath, const FlakeInput & input) {
recurse_impl(recurse_impl, inputPath, input);
};This avoids the virtual call via std::function
There was a problem hiding this comment.
Wow nice, didn't know about "deducing this". Apparently it will be available in gcc 14.
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/2024-11-27-nix-team-meeting-minutes-198/56691/1 |
edolstra
changed the title
|
Added a release note. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Fixes #9154.
This uses the same syntax as flake inputs in flake.nix, e.g.
Note that currently it's not supported to set
flake = falseor touse
follows(because lockFlake() doesn't support that for CLIoverrides), but it could be implemented in the future.
Context
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.