Skip to content

lib/modules: Test optionless module errors from #131205#272709

Merged
Ma27 merged 2 commits intoNixOS:masterfrom
hercules-ci:module-system-test-pr-131205
Dec 10, 2023
Merged

lib/modules: Test optionless module errors from #131205#272709
Ma27 merged 2 commits intoNixOS:masterfrom
hercules-ci:module-system-test-pr-131205

Conversation

@roberth
Copy link
Copy Markdown
Member

@roberth roberth commented Dec 7, 2023

Description of changes

Add tests for #131205.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@roberth roberth requested review from Ma27 and infinisil December 7, 2023 15:57
@github-actions github-actions bot added 6.topic: module system About "NixOS" module system internals 6.topic: lib The Nixpkgs function library labels Dec 7, 2023
@infinisil
Copy link
Copy Markdown
Member

error: path '/[...]/error-mkOption-in-submodule-config.nix' does not exist

😄 #272764 (review)

@roberth roberth force-pushed the module-system-test-pr-131205 branch from 23d79db to 835026f Compare December 8, 2023 19:05
@roberth
Copy link
Copy Markdown
Member Author

roberth commented Dec 8, 2023

That's hilarious.

I've added the test files.

EDIT: and fixed the trailing newlines after configuring vscode

@roberth roberth force-pushed the module-system-test-pr-131205 branch from 835026f to 325545a Compare December 8, 2023 20:58
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 9, 2023
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm so happy that past me introduced this error message because when I first looked at the code here I wondered what was wrong with this expression ;-)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it doesn't look bad!

Copy link
Copy Markdown
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor suggestion, but other than that LGTM and thanks a lot! :)

@roberth roberth force-pushed the module-system-test-pr-131205 branch 2 times, most recently from a063a15 to 56208ec Compare December 9, 2023 13:10
@roberth roberth force-pushed the module-system-test-pr-131205 branch from 56208ec to afb1a2e Compare December 9, 2023 13:15
@Ma27 Ma27 merged commit d56f942 into NixOS:master Dec 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: lib The Nixpkgs function library 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 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants