gortium/infra
1
1
Fork 0
Code Issues 13 Pull Requests 24 Actions Packages Projects 1 Releases Wiki Activity

its time to merge to master... its too big now xD #76

Open
gortium wants to merge 160 commits from uconsole-cm5-incremental into master
pull from: uconsole-cm5-incremental
merge into: gortium:master
Conversation 0 Commits 160 Files Changed 26 +1004 -176
22 changed files with 1004 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b9e89ce537 - Show all commits

4
modules/nixos/hardware/uconsole-cm5-aio-v2.nix
View File

@@ -21,7 +21,7 @@ let
applyRailsScript = pkgs.writeShellScript "apply-aio-v2-rails" ( applyRailsScript = pkgs.writeShellScript "apply-aio-v2-rails" (
'' ''
set -e set -e
PINCTRL=${pkgs.raspberrypi-tools}/bin/pinctrl PINCTRL=${pkgs.libraspberrypi}/bin/pinctrl
'' ''
+ concatStringsSep "" (mapAttrsToList (name: pin: '' + concatStringsSep "" (mapAttrsToList (name: pin: ''
if [ "${if cfg.bootRails.${name} then "1" else "0"}" = "1" ]; then if [ "${if cfg.bootRails.${name} then "1" else "0"}" = "1" ]; then
@@ -123,7 +123,7 @@ in {
# Package the aiov2_ctl tool + pinctrl # Package the aiov2_ctl tool + pinctrl
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
cfg.package cfg.package
raspberrypi-tools # provides pinctrl libraspberrypi # provides pinctrl
]; ];
# Boot rail systemd oneshot service # Boot rail systemd oneshot service