Merge branch 'nix-community:master' into master

Author: nevesenin

.github/workflows/update-flake-lock.yml

@@ -0,0 +1,23 @@
+name: update-flake-lock
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  lockfile:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+
+      - name: Install nix
+        uses: DeterminateSystems/nix-installer-action@e50d5f73bfe71c2dd0aa4218de8f4afa59f8f81d # v16
+
+      - name: Update flake.lock
+        uses: DeterminateSystems/update-flake-lock@a2bbe0274e3a0c4194390a1e445f734c597ebc37 # v24

flake.lock

@@ -3,19 +3,15 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
-    u-boot-src = {
-      flake = false;
-      url = "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2";
-    };
     rpi-linux-stable-src = {
       flake = false;
       url = "github:raspberrypi/linux/stable_20241008";
     };
-    rpi-linux-6_6_67-src = {
+    rpi-linux-6_6_78-src = {
       flake = false;
       url = "github:raspberrypi/linux/rpi-6.6.y";
     };
-    rpi-linux-6_12_11-src = {
+    rpi-linux-6_12_17-src = {
       flake = false;
       url = "github:raspberrypi/linux/rpi-6.12.y";
     };

flake.nix

@@ -1,7 +1,6 @@
-{ u-boot-src
-, rpi-linux-stable-src
-, rpi-linux-6_6_67-src
-, rpi-linux-6_12_11-src
+{ rpi-linux-stable-src
+, rpi-linux-6_6_78-src
+, rpi-linux-6_12_17-src
 , rpi-firmware-src
 , rpi-firmware-nonfree-src
 , rpi-bluez-firmware-src
@@ -11,9 +10,9 @@ final: prev:
 let
   versions = {
     v6_6_51.src = rpi-linux-stable-src;
-    v6_6_67.src = rpi-linux-6_6_67-src;
-    v6_12_11 = {
-      src = rpi-linux-6_12_11-src;
+    v6_6_78.src = rpi-linux-6_6_78-src;
+    v6_12_17 = {
+      src = rpi-linux-6_12_17-src;
       patches = [
         {
           name = "remove-readme-target.patch";
@@ -63,6 +62,7 @@ let
         features.efiBootStub = false;
         kernelPatches =
           if kernel ? "patches" then kernel.patches else [ ];
+        ignoreConfigErrors = true;
       }).overrideAttrs
         (oldAttrs: {
           postConfigure = ''
@@ -83,14 +83,10 @@ in
   compressFirmwareZstd = x: x;
 
   # provide generic rpi arm64 u-boot
-  uboot-rpi-arm64 = final.buildUBoot rec {
+  uboot-rpi-arm64 = final.buildUBoot {
     defconfig = "rpi_arm64_defconfig";
     extraMeta.platforms = [ "aarch64-linux" ];
     filesToInstall = [ "u-boot.bin" ];
-    version = "2024.04";
-    patches = [ ];
-    makeFlags = [ ];
-    src = u-boot-src;
     # In raspberry pi sbcs the firmware manipulates the device tree in
     # a variety of ways before handing it off to the linux kernel. [1]
     # Since we have installed u-boot in place of a linux kernel we may
@@ -118,7 +114,7 @@ in
   # rpi kernels and firmware are available at
   # `pkgs.rpi-kernels.<VERSION>.<BOARD>'. 
   #
-  # For example: `pkgs.rpi-kernels.v6_6_67.bcm2712'
+  # For example: `pkgs.rpi-kernels.v6_6_78.bcm2712'
   rpi-kernels = rpi-kernels (
     final.lib.cartesianProduct
       { board = boards; version = (builtins.attrNames versions); }

overlays/default.nix

@@ -77,6 +77,18 @@ in
 
         package = mkPackageOption pkgs "uboot-rpi-arm64" { };
       };
+      serial-console = {
+        enable = mkOption {
+          default = true;
+          type = types.bool;
+          description = ''
+            Whether to enable a console on serial0.
+
+            Corresponds with raspi-config's setting
+            "Would you like a login shell to be accessible over serial?"
+          '';
+        };
+      };
     };
   };
 
@@ -319,11 +331,14 @@ in
     boot = {
       kernelParams =
         if cfg.uboot.enable then [ ]
-        else [
-          "console=tty1"
-          # https://github.com/raspberrypi/firmware/issues/1539#issuecomment-784498108
-          "console=serial0,115200n8"
-          "init=/sbin/init"
+        else builtins.concatLists [
+          [ "console=tty1" ]
+          (if cfg.serial-console.enable then [
+            # https://github.com/raspberrypi/firmware/issues/1539#issuecomment-784498108
+            "console=serial0,115200n8"
+          ] else [ ]
+          )
+          [ "init=/sbin/init" ]
         ];
       initrd = {
         availableKernelModules = [