-
-
Notifications
You must be signed in to change notification settings - Fork 14.2k
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.
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
Deprecate types.loaOf #63103
Deprecate types.loaOf #63103
Conversation
If we want to deprecate this, there needs to be some deprecation warning for users. We can't just flip the switch and possibly break every second person's config. A good way to do that is to change the
|
4c0cfbd
to
2412d3b
Compare
Ok, I removed the attempts to replace loaOf with attrsOf and added a deprecation warning. |
lib/types.nix
Outdated
@@ -318,7 +318,7 @@ rec { | |||
def; | |||
attrOnly = attrsOf elemType; | |||
in mkOptionType rec { | |||
name = "loaOf"; | |||
name = builtins.trace "types.loaOf is deprecated; use types.attrsOf instead" "loaOf"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah this isn't what we need. The warning needs to go in the merge
function. There one has access to all definitions, which can then be filtered to lists only, and for each of them one can print a warning as I showed in my comment. would be even neater to include the file and line where the user needs to do this change.
I generally think our error messages suck too much. It's not too difficult to make them better, especially with all the info the module system gives access to.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I'm working on it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I took me a while but I think this should do it:
trace: warning: In file <nixpkgs/nixos/modules/services/misc/nix-daemon.nix>
a list is being assigned to the option config.users.users.
This will soon be an error as type loaOf is deprecated.
See https://git.io/fj2zm for more information.
Do
users.users =
{ nixbld1 = {...}; nixbld2 = {...}; nixbld3 = {...}; ...}
instead of
users.users =
[ { name = "nixbld1"; ...} { name = "nixbld2"; ...} { name = "nixbld3"; ...} ...]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Uhm, no it doesn't work when the set is missing the name
attribute.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I mean, it does but it's not pretty.
This will break the programs.ssh.matchBlocks option in Home Manager. That option allows use of list when the order matters and an attribute set as a convenience for users whose setup does not require a certain order. I believe I originally had it as a I don't particularly mind switching back to |
@rycee I don't know how home-manager works: are you somehow bound to nixos option types? Couldn't you simply define an equivalent loaOf for home-manager? |
ef6ce8b
to
fdab0a3
Compare
5d7cfe4
to
57440d5
Compare
silence warning from #63103 in encrypted-devices.nix
As a comment to 1d61efb Note that collect returns a list from a set
related to NixOS#63103.
related to NixOS#63103. (cherry picked from commit bbc2cd8)
The current usage triggers the warning from NixOS/nixpkgs@03309899: trace: warning: In file /home/uj/nix/musnix/modules/rtirq.nix a list is being assigned to the option config.environment.etc. This will soon be an error as type loaOf is deprecated. See NixOS/nixpkgs#63103 for more information. Do environment.etc = { rtirq.conf = {...}; } instead of environment.etc = [ { target = "rtirq.conf"; ...} ]
The current usage triggers the warning from NixOS/nixpkgs@03309899: trace: warning: In file /home/uj/nix/musnix/modules/rtirq.nix a list is being assigned to the option config.environment.etc. This will soon be an error as type loaOf is deprecated. See NixOS/nixpkgs#63103 for more information. Do environment.etc = { rtirq.conf = {...}; } instead of environment.etc = [ { target = "rtirq.conf"; ...} ]
The current usage triggers the warning from NixOS/nixpkgs@03309899: trace: warning: In file /home/uj/nix/musnix/modules/rtirq.nix a list is being assigned to the option config.environment.etc. This will soon be an error as type loaOf is deprecated. See NixOS/nixpkgs#63103 for more information. Do environment.etc = { rtirq.conf = {...}; } instead of environment.etc = [ { target = "rtirq.conf"; ...} ]
warning: In file [...] a list is being assigned to the option config.users.users. This will soon be an error as type loaOf is deprecated. See NixOS/nixpkgs#63103 for more information.
trace: warning: In file hw-laptop.nix a list is being assigned to the option config.boot.initrd.luks.devices. This will soon be an error as type loaOf is deprecated. See NixOS/nixpkgs#63103 for more information. Do boot.initrd.luks.devices = { main = {...}; } instead of boot.initrd.luks.devices = [ { name = "main"; ...} ] trace: warning: The option `i18n.consoleKeyMap' defined in `configuration.nix' has been renamed to `console.keyMap'. trace: warning: The following options are deprecated: - services.xserver.desktopManager.default - services.xserver.windowManager.default Please use services.xserver.displayManager.defaultSession = "none+xmonad"; instead.
(cherry picked from commit 0f5acc5)
[20.03] nixos/i2pd: address #63103
…warning [20.03] silence warning from #63103 in encrypted-devices.nix
## Motivation Dependencies should be up to date. ## Changelog for stable: Commits: [NixOS/nixpkgs@a84b797b...2b417708](NixOS/nixpkgs@a84b797...2b41770) * [`4a41762c`](NixOS/nixpkgs@4a41762) silence warning from NixOS/nixpkgs#63103 in encrypted-devices.nix * [`fc9ca529`](NixOS/nixpkgs@fc9ca52) ssm-session-manager-plugin: init at 1.1.61.0 * [`88306909`](NixOS/nixpkgs@8830690) samba: 4.11.5 -> 4.11.9 * [`5cd1d383`](NixOS/nixpkgs@5cd1d38) firmwareLinuxNonfree: 2020-01-22 -> 2020-05-19 * [`cd6ea1df`](NixOS/nixpkgs@cd6ea1d) xpra: fix NixOS/nixpkgs#85694 * [`79ac3258`](NixOS/nixpkgs@79ac325) xpra: fix NixOS/nixpkgs#41106 * [`82ef74d0`](NixOS/nixpkgs@82ef74d) xpra: adjust patches * [`90057c5b`](NixOS/nixpkgs@90057c5) jool: 4.0.5 -> 4.0.9 * [`392b8bc9`](NixOS/nixpkgs@392b8bc) nixos-artwork: add file path attributes * [`20bfce50`](NixOS/nixpkgs@20bfce5) nixos/lightdm: change background type to path * [`489ebe45`](NixOS/nixpkgs@489ebe4) nixos/gnome3: install nixos wallpapers * [`b2bd9376`](NixOS/nixpkgs@b2bd937) nixos/pantheon: install nixos wallpaper * [`4a644cc7`](NixOS/nixpkgs@4a644cc) sympa: 6.2.54 -> 6.2.56 * [`2678e4fc`](NixOS/nixpkgs@2678e4f) pantheon.appcenter: 3.2.4 -> 3.3.0 * [`9fdefdc9`](NixOS/nixpkgs@9fdefdc) pantheon.switchboard: 2.3.9 -> 2.4.0 * [`016f42b3`](NixOS/nixpkgs@016f42b) pantheon.elementary-icon-theme: 5.2.0 -> 5.3.0 * [`3b4dbf34`](NixOS/nixpkgs@3b4dbf3) pantheon.granite: 5.3.1 -> 5.4.0 * [`c064cd05`](NixOS/nixpkgs@c064cd0) pantheon.wingpanel-applications-menu: 2.6.0 -> 2.7.0 * [`c0c768b6`](NixOS/nixpkgs@c0c768b) pantheon.gala: 3.3.1 -> 3.3.2 * [`044c9a43`](NixOS/nixpkgs@044c9a4) pantheon.appcenter: 3.3.0 -> 3.4.0 * [`3c96a131`](NixOS/nixpkgs@3c96a13) pantheon.elementary-icon-theme: 5.3.0 -> 5.3.1 * [`adacfd02`](NixOS/nixpkgs@adacfd0) pantheon.elementary-calendar: 5.0.4 -> 5.0.5 * [`d71bdb2e`](NixOS/nixpkgs@d71bdb2) pantheon.elementary-files: 4.4.2 -> 4.4.3 * [`adca4a37`](NixOS/nixpkgs@adca4a3) pantheon.sideload: 1.1.0 -> 1.1.1 * [`85146f0f`](NixOS/nixpkgs@85146f0) pantheon.elementary-greeter: 5.0.3 -> 5.0.4 * [`8f24062f`](NixOS/nixpkgs@8f24062) pantheon.pantheon-agent-polkit: 1.0.1 -> 1.0.2 * [`0d8445d0`](NixOS/nixpkgs@0d8445d) pantheon.wingpanel-indicator-network: 2.2.3 -> 2.2.4 * [`4a25ae59`](NixOS/nixpkgs@4a25ae5) pantheon.wingpanel-applications-menu: 2.7.0 -> 2.7.1 * [`ae8c62cb`](NixOS/nixpkgs@ae8c62c) pantheon.elementary-shortcut-overlay: 1.1.1 -> 1.1.2 * [`ac21fd75`](NixOS/nixpkgs@ac21fd7) pantheon.elementary-onboarding: 1.2.0 -> 1.2.1 * [`df72656b`](NixOS/nixpkgs@df72656) pantheon.switchboard-plug-about: 2.6.2 -> 2.6.3 * [`77804794`](NixOS/nixpkgs@7780479) pantheon.switchboard-plug-bluetooth: 2.3.1 -> 2.3.2 * [`34ce3952`](NixOS/nixpkgs@34ce395) pantheon.switchboard-plug-datetime: 2.1.7 -> 2.1.9 * [`d3805ad5`](NixOS/nixpkgs@d3805ad) pantheon.switchboard-plug-display: 2.2.1 -> 2.2.2 * [`489245ed`](NixOS/nixpkgs@489245e) pantheon.switchboard-plug-mouse-touchpad: 2.4.1 -> 2.4.2 * [`68d7569d`](NixOS/nixpkgs@68d7569) pantheon.switchboard-plug-network: 2.3.0 -> 2.3.1 * [`e40d5b5f`](NixOS/nixpkgs@e40d5b5) pantheon.switchboard-plug-notifications: 2.1.6 -> 2.1.7 * [`d8cac264`](NixOS/nixpkgs@d8cac26) pantheon.switchboard-plug-power: 2.4.1 -> 2.4.2 * [`5421f401`](NixOS/nixpkgs@5421f40) pantheon.switchboard-plug-printers: 2.1.8 -> 2.1.9 * [`003af9ca`](NixOS/nixpkgs@003af9c) pantheon.switchboard-plug-security-privacy: 2.2.3 -> 2.2.4 * [`b3a58026`](NixOS/nixpkgs@b3a5802) pantheon.switchboard-plug-sound: 2.2.3 -> 2.2.4 * [`1763fe3f`](NixOS/nixpkgs@1763fe3) microcodeIntel: 20200508 → 20200520 * [`57f7f175`](NixOS/nixpkgs@57f7f17) microcodeIntel: 20200520 -> 20200609 * [`3f31c0d2`](NixOS/nixpkgs@3f31c0d) nixos/sympa: fix PATH_INFO splitting for sympa-6.2.56 * [`807d383c`](NixOS/nixpkgs@807d383) palemoon: 28.9.3 -> 28.10.0 * [`098fdc6b`](NixOS/nixpkgs@098fdc6) treewide: central.maven.org -> repo1.maven.org * [`b0bfe9b5`](NixOS/nixpkgs@b0bfe9b) chromium: Build with VA-API but disable it by default * [`0d8250ae`](NixOS/nixpkgs@0d8250a) chromium: 83.0.4103.97 -> 83.0.4103.106 * [`70ecf772`](NixOS/nixpkgs@70ecf77) graylog: 3.3.0 -> 3.3.1 * [`60da5edb`](NixOS/nixpkgs@60da5ed) graylogPlugins: Update plugins * [`02b95cf5`](NixOS/nixpkgs@02b95cf) strace-graph: fix strace-graph shebang which points to perl * [`dce9ef51`](NixOS/nixpkgs@dce9ef5) youtube-dl: 2020.06.06 -> 2020.06.16.1 * [`c27866c8`](NixOS/nixpkgs@c27866c) microcodeIntel: 20200609 -> 20200616 * [`724d123a`](NixOS/nixpkgs@724d123) riot-web: 1.6.4 -> 1.6.5 * [`8ab112eb`](NixOS/nixpkgs@8ab112e) riot-desktop: 1.6.4 -> 1.6.5 * [`b2a6d2fa`](NixOS/nixpkgs@b2a6d2f) linuxPackages.wireguard: 1.0.20200520 -> 1.0.20200611 * [`243f698a`](NixOS/nixpkgs@243f698) vagrant: 2.2.8 -> 2.2.9 * [`c5fd298d`](NixOS/nixpkgs@c5fd298) vlc: 3.0.8 -> 3.0.11 (security) * [`bb4fd7eb`](NixOS/nixpkgs@bb4fd7e) haskellPackages.geojson: Unmark as broken * [`583ccf8c`](NixOS/nixpkgs@583ccf8) Don't enable nix-bash-completions when using Nix 2.4 * [`80b50f32`](NixOS/nixpkgs@80b50f3) fwupd: add patch for CVE-2020-10759 * [`725c4fdb`](NixOS/nixpkgs@725c4fd) google-chrome: add coreutils to PATH * [`9e379117`](NixOS/nixpkgs@9e37911) xdg_utils: xdg-open: add $out to PATH * [`73d7516c`](NixOS/nixpkgs@73d7516) matrix-synapse: 1.14.0 -> 1.15.1 * [`f70a5992`](NixOS/nixpkgs@f70a599) nixos/gnome3: nixos-artwork -> pkgs.nixos-artwork * [`87cde1cf`](NixOS/nixpkgs@87cde1c) pantheon.elementary-code: 3.4.0 -> 3.4.1 * [`30c703cb`](NixOS/nixpkgs@30c703c) nixos/sudo: default rule should be first * [`788764b1`](NixOS/nixpkgs@788764b) transmission: patch CVE-2018-10756 * [`2b417708`](NixOS/nixpkgs@2b41770) Remove Google Talk Plugin
Motivation for this change
Fix issue #1800.
It turns out this is a lot of work: there are many instances of lists being used instead of sets.
The main culprits are
users.users
andenvironment.etc
.I think I have identified most of them but there are still some, moreover all this changes should be properly tested so I definitely need some help.