Use flake-parts instead of flake-utilsHEADmain

See also <https://ayats.org/blog/no-flake-utils>.

1 files changed, 53 insertions, 27 deletions

diff --git a/flake.nix b/flake.nix
index e538607..e9ebb84 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,39 +3,65 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
+    flake-parts.url = "github:hercules-ci/flake-parts";
     naersk = {
       url = "github:nix-community/naersk";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { self, nixpkgs, flake-utils, naersk, ... }@inputs:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-	pkgs = import nixpkgs {
-	  inherit system;
-	  config = { };
-	  overlays = [ ];
-	};
-	naersk' = pkgs.callPackage naersk { };
-    in rec {
-      # nix build
-      # nix run . -- --help
-      packages.default = packages.brck;
+  outputs =
+    inputs@{
+      self,
+      nixpkgs,
+      flake-parts,
+      naersk,
+      ...
+    }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
 
-      # nix build .#brck
-      # nix run .#brck -- --help
-      packages.brck = naersk'.buildPackage {
-	name = "brck";
-	src = builtins.path { path = ./.; name = "brck"; };
-	meta.mainProgram = "brck";
-      };
+      perSystem =
+        { pkgs, system, ... }:
+        let
+          naersk' = pkgs.callPackage naersk { };
+        in
+        rec {
+          # nix build
+          # nix run . -- --help
+          packages.default = packages.brck;
 
-      # nix develop
-      devShells.default = pkgs.mkShell {
-	nativeBuildInputs = with pkgs; [ rustc cargo rustfmt clippy cargo-audit cargo-edit rust-analyzer ];
-      };
-    }
-  );
+          # nix build .#brck
+          # nix run .#brck -- --help
+          packages.brck = naersk'.buildPackage {
+            name = "brck";
+            src = builtins.path {
+              path = ./.;
+              name = "brck";
+            };
+            meta.mainProgram = "brck";
+          };
+
+          # nix develop
+          devShells.default = pkgs.mkShell {
+            nativeBuildInputs = with pkgs; [
+              rustc
+              cargo
+              rustfmt
+              clippy
+              cargo-audit
+              cargo-edit
+              rust-analyzer
+            ];
+          };
+
+          # nix fmt
+          formatter = pkgs.nixfmt-tree;
+        };
+    };
 }