[nix-outputs] Fix flake installable with custom outouts #1864
+15
−9
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
gcurtis
approved these changes
Feb 28, 2024
savil
reviewed
Feb 28, 2024
| @@ -121,7 +121,7 @@ func PackageFromStringWithOptions(raw string, locker lock.Locker, opts devopt.Ad | |||
| pkg := PackageFromStringWithDefaults(raw, locker) | |||
| pkg.DisablePlugin = opts.DisablePlugin | |||
| pkg.PatchGlibc = opts.PatchGlibc | |||
| pkg.outputs = initOutputs(opts.Outputs) | |||
| pkg.initOutputs(opts.Outputs) | |||
There was a problem hiding this comment.
I think line 117 above needs pkg.initOutputs, for when the raw is a flake-ref-with-flake-outputs
mikeland73
added a commit
that referenced
this pull request
Feb 29, 2024
## Summary Ensure flake packages always parse outputs. (re-do of #1864) This approach is more general. It also supports (with some small changes) the use of devbox output flags with flakes (e.g. `devbox add github:nixos/nixpkgs#curl --outputs out,dev`) ## How was it tested?
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.
Summary
Fixes #1852
Ensure we initialize outputs using flake if package is a flake.
Made outputs non-pointer so we don't have to worry about initialization.
How was it tested?
Installed
github:nixos/nixpkgs#curl^out,devand verified that flake and profile contain both outputs.