nixos: fix fallout from #46193 #47298
Merged
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
samueldr
approved these changes
Sep 24, 2018
There was a problem hiding this comment.
~/tmp/nixpkgs/nixpkgs $ git checkout master
~/tmp/nixpkgs/nixpkgs $ nix-build nixos/release.nix -A netboot
error: attribute 'manual' missing, at /Users/samuel/tmp/nixpkgs/nixpkgs/nixos/modules/services/misc/nixos-manual.nix:57:39
~/tmp/nixpkgs/nixpkgs-PR47298 $ git show | head -n1
commit 1a6ce11518af319e6029863a7f220c071ce5b467
~/tmp/nixpkgs/nixpkgs-PR47298 $ nix-build nixos/release.nix -A netboot
these derivations will be built:
[...]
👍 sorry for not catching that in the initial merge.
|
Nah, if we are to blame someone then that clearly is my fault.
I would've liked OfBorg to catch it, though.
|
|
Hm, it looks like just using |
|
That needs to be investigated. But the question of how to prevent this in the future and a fix to broken master are separate issues IMHO.
Can we merge this and then discuss what OfBorg should evaluate to prevent future issues like this?
|
|
Yes, a separate question and the change looks OK. |
|
Thanks! Added investigation to the TODO list.
|
oxij
referenced
this pull request
Sep 25, 2018
Introduced by 0f3b89b. If services.nixosManual.showManual is enabled and documentation.nixos.enable is not, there is no config.system.build.manual available, so evaluation fails. For example this is the case for the installer tests. There is however an assertion which should catch exactly this, but it isn't thrown because the usage of config.system.build.manual is evaluated earlier than the assertions. So I split the assertion off into a separate mkIf to make sure it is shown appropriately and also fixed the installation-device profile to enable documentation.nixos. Signed-off-by: aszlig <aszlig@nix.build> Cc: @oxij
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 for this change
Fixes an issue reported in #46193 (comment).
Enabling
minimalandinstallation-deviceprofiles at the same time (likenetbootprofile does) started failing after #46193.Things done
./nixos/release.nixevaluate.