update kernel outputs

nabam · Jan 31, 2024 · 88c6f26 · 88c6f26
1 parent 8dfc0ae
commit 88c6f26
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 18 deletions.
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -6,7 +6,7 @@ on:
     - main
 
 jobs:
-  lint:
+  fmt:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -19,8 +19,20 @@ jobs:
     - run: |
         nix fmt .
         git diff-files --quiet || (git -P diff; echo -e "\nNOT FORMATTED: run 'nix fmt .'"; false)
+  check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: cachix/install-nix-action@v20
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
+        extra_nix_config: |
+          experimental-features = nix-command flakes
+          extra-platforms = aarch64-linux
+    - run: |
+        nix flake check --override-input rockchip .. --keep-going
   build_example:
-    needs: lint
+    needs: fmt
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -40,13 +52,13 @@ jobs:
       run: |
         nix build -L -j4 --accept-flake-config --override-input rockchip ..
   build_packages:
-    needs: lint
+    needs: fmt
     strategy:
       matrix:
         package:
-        - kernel_linux_6_1_rockchip
-        - kernel_linux_6_6_rockchip
-        - kernel_linux_6_6_pinetab
+        - kernel_linux_6_1_rockchip.kernel
+        - kernel_linux_6_6_rockchip.kernel
+        - kernel_linux_6_6_pinetab.kernel
         - uBootRock64
         - uBootRockPro64
         - uBootPinebookPro

diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
@@ -16,9 +16,9 @@ jobs:
     strategy:
       matrix:
         package:
-        - kernel_linux_6_1_rockchip
-        - kernel_linux_6_6_rockchip
-        - kernel_linux_6_6_pinetab
+        - kernel_linux_6_1_rockchip.kernel
+        - kernel_linux_6_6_rockchip.kernel
+        - kernel_linux_6_6_pinetab.kernel
         - uBootRock64
         - uBootRockPro64
         - uBootPinebookPro

diff --git a/example/flake.nix b/example/flake.nix
@@ -29,12 +29,12 @@
             {
               # Use cross-compilation for uBoot and Kernel.
               rockchip.uBoot =
-                (inputs.rockchip.uBoot buildPlatform).uBootQuartz64A;
+                inputs.rockchip.packages.${buildPlatform}.uBootQuartz64A;
               boot.kernelPackages =
-                (inputs.rockchip.kernel buildPlatform).linux_6_6_rockchip;
+                inputs.rockchip.legacyPackages.${buildPlatform}.kernel_linux_6_6_rockchip;
             }
 
-            inputs.rockchip.noZFS # ZFS is broken on kernel from unstable
+            inputs.rockchip.nixosModules.noZFS # ZFS is broken on kernel from unstable
           ];
         };
     in {
@@ -50,6 +50,6 @@
       # Or use configuration below to cross-compile kernel and uBoot on the current platform.
       # packages.image = (osConfig system).config.system.build.sdImage;
 
-      defaultPackage = self.packages."${system}".image;
+      packages.default = self.packages.${system}.image;
     });
 }
diff --git a/flake.nix b/flake.nix
@@ -111,21 +111,23 @@
         builtins.mapAttrs (name: value: value.config.system.build.sdImage)
         (osConfigs system);
     in {
-      inherit uBoot kernel noZFS;
+      inherit uBoot kernel;
 
       nixosModules = {
+        inherit noZFS;
         sdImageRockchipInstaller =
           import ./modules/sd-card/sd-image-rockchip-installer.nix;
         sdImageRockchip = import ./modules/sd-card/sd-image-rockchip.nix;
         dtOverlayQuartz64ASATA = import ./modules/dt-overlay/quartz64a-sata.nix;
         dtOverlayPCIeFix = import ./modules/dt-overlay/pcie-fix.nix;
       };
     } // inputs.utils.lib.eachDefaultSystem (system: {
+      legacyPackages = {
+        kernel_linux_6_1_rockchip = (kernel system).linux_6_1_rockchip;
+        kernel_linux_6_6_rockchip = (kernel system).linux_6_6_rockchip;
+        kernel_linux_6_6_pinetab = (kernel system).linux_6_6_pinetab;
+      };
       packages = (images system) // {
-        kernel_linux_6_1_rockchip = (kernel system).linux_6_1_rockchip.kernel;
-        kernel_linux_6_6_rockchip = (kernel system).linux_6_6_rockchip.kernel;
-        kernel_linux_6_6_pinetab = (kernel system).linux_6_6_pinetab.kernel;
-
         uBootQuartz64A = (uBoot system).uBootQuartz64A;
         uBootQuartz64B = (uBoot system).uBootQuartz64B;
         uBootPineTab2 = (uBoot system).uBootPineTab2;