Fix evaluation and build of manual with latest nixpkgs master #407
+6
−2
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
First of all, optionAttrSetToDocList now has an additional argument for specifying the internal _module attributes. Unfortunately, toXML silently ignores function calls so we don't get an error at this point. In addition to this, we now have to specify type representations if we create a new option type with mkOptionType, so let's add those to the NixOps specific option types. Both of these issues are caused by NixOS/nixpkgs@cad8957. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
aszlig
added a commit
to openlab-aux/vuizvui
that referenced
this pull request
Mar 1, 2016
Actually, it's the latest upstream master plus one pull request by me (NixOS/nixops#407), which fixes the build of the manual. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
aszlig
added a commit
to openlab-aux/vuizvui
that referenced
this pull request
Mar 2, 2016
The patch was introduced because there was a breaking nixpkgs commit at NixOS/nixpkgs@cad8957, which later got reverted (NixOS/nixpkgs@f3d94cf), so we no longer need this patch. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
Note: this belongs together when NixOS/nixpkgs#13607 is merged. |
|
The fix of manual generation was quite opposite - NixOS/nixpkgs@f3d94cf |
|
Probably this is irrelevant now. Closing. |
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.
First of all,
optionAttrSetToDocListnow has an additional argument for specifying the internal_moduleattributes. Unfortunately,toXMLsilently ignores function calls so we don't get an error at this point.In addition to this, we now have to specify type representations if we create a new option type with
mkOptionType, so let's add those to the NixOps specific option types.Both of these issues are caused by NixOS/nixpkgs@cad8957.
I'm not merging this right now, because it breaks backwards-compatibility with release
15.09and possibly also with16.03.Cc: @edolstra, @rbvermaa