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
22 changed files with 1004 additions and 176 deletions
Showing only changes of commit b9e89ce537 - Show all commits

View File

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