Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Submodule refactor #177656

Merged
merged 4 commits into from
Jun 14, 2022
Merged

Submodule refactor #177656

merged 4 commits into from
Jun 14, 2022

Conversation

roberth
Copy link
Member

@roberth roberth commented Jun 14, 2022 •
edited
Loading

Description of changes

Rebase of #108833 + suggestion.

TODO

  • check ofborg performance report
  • remove unused extension offset

Resolves #108833
Closes #177157

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

infinisil and others added 3 commits June 14, 2022 17:01
@infinisil @roberth
lib/tests: Add submodule file propagation test
7944160
@infinisil @roberth
lib/types: Simplify submoduleWith shorthandOnlyDefinesConfig handling
907627f 
The module system already uses the parent module's _file as a fallback,
so we don't need to inject the file in a weird way
@roberth
lib/types: Use map instead of imap1 in submoduleWith
d4a84ae
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jun 14, 2022
@roberth roberth added 6.topic: module system About "NixOS" module system internals 0.kind: bug Something is broken labels Jun 14, 2022
@roberth
Copy link
Member Author

roberth commented Jun 14, 2022

  • Solves a bug with disappearing modules in repeated moduleType/extendModules use (hard to reproduce)
  • Simplifies code
  • Improves performance slightly
  • Two authors converging towards the same solution
  • Adds a test case

@roberth roberth merged commit 6616de3 into NixOS:master Jun 14, 2022
@infinisil
Copy link
Member

Haha awesome, looking good!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edolstra edolstra Awaiting requested review from edolstra

@nbp nbp Awaiting requested review from nbp

@infinisil infinisil Awaiting requested review from infinisil

Assignees
No one assigned
Labels
0.kind: bug Something is broken 6.topic: module system About "NixOS" module system internals 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@roberth @infinisil