Skip to content

nixos/modules/profiles/base.nix: omit zfs if unavailable#194150

Merged
alyssais merged 1 commit intomasterfrom
unknown repository
Oct 10, 2022
Merged

nixos/modules/profiles/base.nix: omit zfs if unavailable#194150
alyssais merged 1 commit intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Oct 3, 2022

Description of changes

The boot.zfs.enabled option is marked readOnly, so this is the only way to successfully build a NixOS installer image for platforms that zfs does not build for.

Things done

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Oct 3, 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 Oct 3, 2022
@ghost ghost requested a review from alyssais October 4, 2022 09:19
@ghost ghost requested a review from alyssais October 5, 2022 10:23
@alyssais
Copy link
Copy Markdown
Member

alyssais commented Oct 9, 2022

@ofborg test installer

@alyssais
Copy link
Copy Markdown
Member

alyssais commented Oct 9, 2022

Please squash, then LGTM.

@ghost ghost marked this pull request as draft October 9, 2022 22:33
@ghost ghost marked this pull request as ready for review October 9, 2022 22:33
The `boot.zfs.enabled` option is marked `readOnly`, so this is the only way to
successfully build a NixOS installer image for platforms that zfs does not build
for.

Co-authored-by: Alyssa Ross <hi@alyssa.is>
@alyssais alyssais merged commit 4cdda32 into NixOS:master Oct 10, 2022
@mweinelt
Copy link
Copy Markdown
Member

mweinelt commented Oct 10, 2022

This change breaks eval on unstable-small.

{UNKNOWN}: aggregate job ‘tested’ failed with the error: nixos.tests.installer.separateBoot.x86_64-linux: error: undefined variable 'config'

       at /nix/store/c1g7nvbqzsfl4biyvmi0jkrbkd1c17xg-source/nixos/modules/profiles/base.nix:56:65:

           55|     [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ] ++
           56|     lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs";
             |                                                                 ^
           57|
nixos.tests.installer.lvm.x86_64-linux: error: undefined variable 'config'

       at /nix/store/c1g7nvbqzsfl4biyvmi0jkrbkd1c17xg-source/nixos/modules/profiles/base.nix:56:65:

           55|     [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ] ++
           56|     lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs";
             |                                                                 ^
           57|
nixos.tests.installer.simple.x86_64-linux: error: undefined variable 'config'

       at /nix/store/c1g7nvbqzsfl4biyvmi0jkrbkd1c17xg-source/nixos/modules/profiles/base.nix:56:65:

           55|     [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ] ++
           56|     lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs";
             |                                                                 ^
           57|
nixos.tests.boot.biosCdrom.x86_64-linux: error: undefined variable 'config'

       at /nix/store/c1g7nvbqzsfl4biyvmi0jkrbkd1c17xg-source/nixos/modules/profiles/base.nix:56:65:

           55|     [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ] ++
           56|     lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs";
             |                                                                 ^
           57|
nixos.iso_minimal.x86_64-linux: error: undefined variable 'config'

       at /nix/store/c1g7nvbqzsfl4biyvmi0jkrbkd1c17xg-source/nixos/modules/profiles/base.nix:56:65:

           55|     [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ] ++
           56|     lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs";
             |                                                                 ^
           57|
 at /nix/store/yi625cadgqpikk21cys15minw5ppz9zq-hydra-perl-deps/lib/perl5/site_perl/5.34.1/Catalyst/Model/DBIC/Schema.pm line 526

https://hydra.nixos.org/jobset/nixos/unstable-small#tabs-errors

@mweinelt mweinelt added the 1.severity: channel blocker Blocks a channel label Oct 10, 2022
@alyssais
Copy link
Copy Markdown
Member

#195437

@mweinelt mweinelt removed the 1.severity: channel blocker Blocks a channel label Oct 11, 2022
@ghost
Copy link
Copy Markdown
Author

ghost commented Oct 12, 2022

Sorry about that :(

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

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 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