flake: move attributes over to flake-parts

flake.nix

@@ -31,10 +31,32 @@
   };
 
   outputs = inputs@{ self, nixpkgs, nixpkgs-test, crane, rust-overlay, flake-parts, ... }:
-    flake-parts.lib.mkFlake { inherit inputs; } {
+    flake-parts.lib.mkFlake { inherit inputs; } ({ moduleWithSystem, ... }: {
-      flake = let
+      imports = [
+        # Derive the output overlay automatically from all packages that we define.
+        inputs.flake-parts.flakeModules.easyOverlay
+      ];
+
+      flake.nixosModules.lanzaboote = moduleWithSystem (
+        perSystem@{ config }:
+        { ... }: {
+          imports = [
+            ./nix/modules/lanzaboote.nix
+          ];
+
+          boot.lanzaboote.package = perSystem.config.packages.lanzatool;
+        });
+
+      systems = [
+        "x86_64-linux"
+
+        # Not actively tested, but may work:
+        # "aarch64-linux"
+      ];
+
+      perSystem = { config, system, pkgs, ... }: let
         pkgs = import nixpkgs {
-          system = "x86_64-linux";
+          system = system;
           overlays = [
             rust-overlay.overlays.default
           ];
@@ -47,10 +69,6 @@
         rust-nightly = pkgs.rust-bin.fromRustupToolchainFile ./rust/lanzaboote/rust-toolchain.toml;
         craneLib = crane.lib.x86_64-linux.overrideToolchain rust-nightly;
 
-        uefi-run = pkgs.callPackage ./nix/packages/uefi-run.nix {
-          inherit craneLib;
-        };
-
         # Build attributes for a Rust application.
         buildRustApp =
           { src
@@ -98,9 +116,11 @@
         };
 
         lanzatool-unwrapped = lanzatoolCrane.package;
+      in {
+        packages = {
+          inherit lanzaboote;
 
-        lanzatool = pkgs.runCommand "lanzatool"
+          lanzatool = pkgs.runCommand "lanzatool" {
-          {
             nativeBuildInputs = [ pkgs.makeWrapper ];
           } ''
             mkdir -p $out/bin
@@ -112,24 +132,26 @@
               --set RUST_BACKTRACE full \
               --set LANZABOOTE_STUB ${lanzaboote}/bin/lanzaboote.efi
           '';
-      in
-        {
-          overlays.default = final: prev: {
-            inherit lanzatool;
         };
 
-          nixosModules.lanzaboote = { pkgs, lib, ... }: {
+        overlayAttrs = {
-            imports = [ ./nix/modules/lanzaboote.nix ];
+          inherit (config.packages) lanzatool;
-            boot.lanzaboote.package = lib.mkDefault self.packages.${pkgs.system}.lanzatool;
         };
 
-          packages.x86_64-linux = {
+        checks = {
-            inherit lanzaboote lanzatool;
+          lanzatool-clippy = lanzatoolCrane.clippy;
-            default = lanzatool;
+          lanzaboote-clippy = lanzabooteCrane.clippy;
-          };
+        } // (import ./nix/tests/lanzaboote.nix {
+          inherit pkgs testPkgs;
+          lanzabooteModule = self.nixosModules.lanzaboote;
+        });
 
-          devShells.x86_64-linux.default = pkgs.mkShell {
+        devShells.default = pkgs.mkShell {
-            packages = [
+          packages = let
+            uefi-run = pkgs.callPackage ./nix/packages/uefi-run.nix {
+              inherit craneLib;
+            };
+          in [
             uefi-run
             pkgs.openssl
             (pkgs.sbctl.override {
@@ -144,28 +166,12 @@
           ];
 
           inputsFrom = [
-              lanzaboote
+            config.packages.lanzaboote
-              lanzatool
+            config.packages.lanzatool
           ];
 
           TEST_SYSTEMD = pkgs.systemd;
         };
-
+      };
-          checks.x86_64-linux = {
-            lanzatool-clippy = lanzatoolCrane.clippy;
-            lanzaboote-clippy = lanzabooteCrane.clippy;
-          } // (import ./nix/tests/lanzaboote.nix {
-            inherit pkgs testPkgs;
-            lanzabooteModule = self.nixosModules.lanzaboote;
     });
-        };
-
-      systems = [
-        "x86_64-linux"
-      ];
-
-      perSystem = { config, ... }: {
-        # Nothing here yet.
-      };
-    };
 }