public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/hardware.deviceTree: Move things around

Browse Source 
In response to comments, create a sub-folder for deviceTree packages
(starting with rpi), and a top-level package for helpers.
This commit is contained in:
Kai Wohlfahrt
2019-08-07 13:51:22 +01:00
committed by Kai Wohlfahrt
parent dd0a951279
commit 28cf80acf8
4 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/hardware/device-tree.nix
+5 -5
View File
@@ -19,8 +19,8 @@ in {
base = mkOption {
default = "${config.boot.kernelPackages.kernel}/dtbs";
defaultText = "\${config.boot.kernelPackages.kernel}/dtbs";
example = literalExample "pkgs.deviceTree.raspberryPiDtbs";
type = types.nullOr types.path;
example = literalExample "pkgs.deviceTree_rpi";
type = types.path;
description = ''
The package containing the base device-tree (.dtb) to boot. Contains
device trees bundled with the Linux kernel by default.
@@ -30,7 +30,7 @@ in {
overlays = mkOption {
default = [];
example = literalExample
"[\"\${pkgs.deviceTree.raspberryPiOverlays}/w1-gpio.dtbo\"]";
"[\"\${pkgs.deviceTree_rpi.overlays}/w1-gpio.dtbo\"]";
type = types.listOf types.path;
description = ''
A path containing device tree overlays (.dtbo) to be applied to all
@@ -41,9 +41,9 @@ in {
package = mkOption {
default = null;
type = types.nullOr types.path;
internal = true;
description = ''
A path containing device tree overlays (.dtbo) to be applied to all
base device-trees. Overrides `base` and `overlays`.
A path containing the result of applying `overlays` to `base`.
'';
};
};