-
-
Notifications
You must be signed in to change notification settings - Fork 782
rpi4: Introduce raspberry-pi."4".enable #1515
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
Open
nobodyinperson
wants to merge
1
commit into
NixOS:master
Choose a base branch
from
nobodyinperson:rpi4-enable-flag
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,23 @@ | ||
{ | ||
hardware.deviceTree.overlays = [ | ||
{ | ||
name = "rpi4-cpu-revision"; | ||
dtsText = '' | ||
/dts-v1/; | ||
/plugin/; | ||
{ config, lib, ... }: | ||
lib.mkIf config.hardware.raspberry-pi."4".enable { | ||
hardware.deviceTree.overlays = [{ | ||
name = "rpi4-cpu-revision"; | ||
dtsText = '' | ||
/dts-v1/; | ||
/plugin/; | ||
|
||
/ { | ||
compatible = "raspberrypi,4-model-b"; | ||
/ { | ||
compatible = "raspberrypi,4-model-b"; | ||
|
||
fragment@0 { | ||
target-path = "/"; | ||
__overlay__ { | ||
system { | ||
linux,revision = <0x00d03114>; | ||
}; | ||
fragment@0 { | ||
target-path = "/"; | ||
__overlay__ { | ||
system { | ||
linux,revision = <0x00d03114>; | ||
}; | ||
}; | ||
}; | ||
''; | ||
} | ||
]; | ||
}; | ||
''; | ||
}]; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 know we do this in NixOS but for nixos-hardware users usually expect that an import is enough, so I would like to task why this option is necessary. Are overlays not needed to make the machine boot? An alternative would be also to have an enable option that defaults to true.
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.
Conditional
imports
are not possible with the nixpkgs module system. So for example if you want to make a vm of your RPi 4 NixOS system (e.g.nix build .#nixosConfigurations.thepi.config.system.build.vm
) it will fail because the nixos-hardware module hard-sets a kernel and other stuff. So either anenable
flag is introduced which you can then nicely auto-disable for VMs (e.g. viaoptions.virtualisation ? qemu
, which is only true when building a vm) or you make an entirely separate nixosConfiguration only for the vm, which is uncool.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.
Well all the "sub"modules for the rpi4 for example to have
enable
flags and users are not supposed to include them for activation. There's a reason nixpkgs does all the enable guarding. But yeah, if this is how nixos-hardware does it, then I guess an enable flag that's on by default could work to keep backwards-compatibility. Not very elegant though in my opinion.