lib/modules: Make unifyModuleSyntax key optional, remove extensionOffset#177157
Closed
roberth wants to merge 3 commits intoNixOS:masterfrom
Closed
lib/modules: Make unifyModuleSyntax key optional, remove extensionOffset#177157roberth wants to merge 3 commits intoNixOS:masterfrom
roberth wants to merge 3 commits intoNixOS:masterfrom
Conversation
13 tasks
ofborg
bot
added
the
2.status: merge conflict
roberth
force-pushed
the
lib-modules-remove-extensionOffset
branch
from
c189d6b to
642ea23
Compare
ofborg
bot
added
10.rebuild-darwin: 0
Tried to make it work in NixOS#177080 but that still didn't solve all cases in practice (wip NixOS#176557). Found a simpler solution: don't number anonymous modules at all. Keys are assigned at a later stage anyway. We don't have to reinvent that solution in submoduleWith.
…eLocation This should be equivalent and perhaps perform better.
…ultModuleLocation" The performance did not improve, judging by the memory statistics. Baseline: https://github.com/NixOS/nixpkgs/pull/177157/checks?check_run_id=6828895472 Without optionalAttrs: https://github.com/NixOS/nixpkgs/pull/177157/checks?check_run_id=6829274815 So the memory cost of the reverted commit was about 0.05%. This reverts commit bb8461b4cb05bd468e34f2191cdea28dcd01e70a.
roberth
force-pushed
the
lib-modules-remove-extensionOffset
branch
from
68737cc to
5bb1e0c
Compare
This was referenced Jun 13, 2022
Closed
Merged
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
1 participant
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.
Description of changes
Tried to make it work in #177080 but that still didn't solve all cases in practice (wip #176557). Found a simpler solution: don't number anonymous modules at all. Keys are assigned at a later stage anyway. We don't have to reinvent that solution in
submoduleWith.Numbering was introduced in 5002e6a as part of a solution for improving file locations in error messages. This goal is preserved.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes