Skip to content

lib/modules: Finally remove deprecated types.optionSet#164651

Merged
infinisil merged 2 commits intoNixOS:masterfrom
infinisil:remove-optionSet
Mar 25, 2022
Merged

lib/modules: Finally remove deprecated types.optionSet#164651
infinisil merged 2 commits intoNixOS:masterfrom
infinisil:remove-optionSet

Conversation

@infinisil
Copy link
Member

Description of changes

types.optionSet has been deprecated for almost 10 years now (0e33368)! A removal was already attempted in 2019 (#54637), but it was promptly reinstantiated since some third-party uses were discovered (#56857).

It's finally time to remove it for good :)

Ping @roberth @danbst @rycee

Things done

@infinisil infinisil requested review from edolstra and nbp as code owners March 17, 2022 23:42
@infinisil infinisil added the 6.topic: module system About "NixOS" module system internals label Mar 17, 2022
@github-actions github-actions bot added the 8.has: documentation This PR adds or changes documentation label Mar 17, 2022
@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 Mar 18, 2022
types.optionSet has been deprecated for almost 10 years now
(0e33368)! A removal
was already attempted in 2019
(27982b4), but it was promptly
reinstantiated since some third-party uses were discovered
(f531ce7).

It's finally time to remove it for good :)
@roberth
Copy link
Member

roberth commented Mar 18, 2022

pkgs/test/mkOption still tries to reference option sets, but it is horribly bitrotten; essentially untouched since '08.
It is safe to remove, but begs the question whether option merging is sufficiently tested in lib/tests/modules.sh? The test case description comments don't seem to reference such requirements.

These are completely non-functional by now
@infinisil
Copy link
Member Author

@roberth Damn, I didn't know about that ancient test case. I don't see any reliance on optionSet, but I removed that in another commit, it's not useful anymore.

Yeah option merging might be undertested, though we can be reasonably sure it won't break due to the NixOS tests making use of a lot of NixOS modules with various merging operations. Wouldn't hurt to have more specific test cases though, but out of scope for this PR.

@infinisil infinisil merged commit 99d9d45 into NixOS:master Mar 25, 2022
@infinisil infinisil deleted the remove-optionSet branch March 25, 2022 16:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: module system About "NixOS" module system internals 8.has: documentation This PR adds or changes documentation 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.

2 participants