Employ new documentation.nixos.extraModuleSources option#108
Merged
johanot merged 2 commits intoDBCDK:masterfrom Apr 30, 2020
Merged
Employ new documentation.nixos.extraModuleSources option#108johanot merged 2 commits intoDBCDK:masterfrom
johanot merged 2 commits intoDBCDK:masterfrom
Conversation
This lets changes to /data/* in the `patches` attribute work.
Contributor
Author
|
Bump upon landing in 20.03. |
johanot
suggested changes
Apr 29, 2020
Deterministic manual builds with documentation.nixos.includeAllModules! The friendly extension to the asset path is so you'll see "morph/options.nix" instead of "options.nix" when the manual mentions where morph's options are from. Note that this depends on the option's presence in NixOS: - nixos-unstable @ 34dd64b0cc145533a935c798d5a3347d07d5d0aa - nixos-20.03 @ 6df8f27c3915ede2101c05e1d4fbfd1828ff37a1
351fc3c to
06b46d0
Compare
Contributor
Author
|
Travis failed on a missing |
johanot
approved these changes
Apr 30, 2020
Contributor
|
Travis is just Travis I guess :) Thanks for the PR! |
This file contains hidden or 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
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.
Deterministic manual builds with
documentation.nixos.includeAllModules! The friendly extension to the asset path is so you'll see "morph/options.nix" instead of "options.nix" when the manual mentions where morph's options are from.Note that this depends on the option's presence in NixOS, and it probably won't be commonly available for a little while after merge (PR NixOS/nixpkgs#81557). I'm hoping for a 20.03 backport so this can be solved for the next stable.
To work around this in the meantime, a per-machine nixpkgs arg can be provided along the lines of:
If you're already using
niv, though, this can be shortened by wrappingnix/sources.nixwith approximately:and then just inheriting
pkgswhere desired generally (network = { inherit pkgs; };in this particular case). This also makes sure you don't miss patching when changing Nixpkgs providers.This change is