refactor: use flake-parts for better management of per-system flake attributes

2024/flake.lock

@@ -1,20 +1,20 @@
 {
   "nodes": {
-    "flake-utils": {
+    "flake-parts": {
       "inputs": {
-        "systems": "systems"
+        "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1726560853,
+        "lastModified": 1727826117,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
-        "owner": "numtide",
+        "owner": "hercules-ci",
-        "repo": "flake-utils",
+        "repo": "flake-parts",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "hercules-ci",
-        "repo": "flake-utils",
+        "repo": "flake-parts",
         "type": "github"
       }
     },
@@ -34,29 +34,26 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1727825735,
+        "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
+      }
+    },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-parts": "flake-parts",
         "nixpkgs": "nixpkgs",
         "typix": "typix",
         "typst-packages": "typst-packages"
       }
     },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "typix": {
       "inputs": {
         "nixpkgs": [

2024/flake.nix

@@ -9,7 +9,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    flake-utils.url = "github:numtide/flake-utils";
+    flake-parts.url = "github:hercules-ci/flake-parts";
 
     typst-packages = {
       url = "github:typst/packages";
@@ -25,19 +25,32 @@
 
   outputs =
     inputs@{
-      nixpkgs,
+      flake-parts,
-      typix,
-      flake-utils,
       self,
+      typix,
+      typst-packages,
+      ...
+    }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+      flake = {
+        hydraJobs = {
+          legacyPackages."x86_64-linux" = self.legacyPackages."x86_64-linux";
+        };
+      };
+      perSystem =
+        {
+          pkgs,
+          system,
           ...
         }:
-    flake-utils.lib.eachDefaultSystem (
-      system:
         let
-        pkgs = nixpkgs.legacyPackages.${system};
+          typstPackagesSrc = "${typst-packages}/packages";
-      in
-      let
-        typstPackagesSrc = "${inputs.typst-packages}/packages";
 
           typstPackagesCache = pkgs.stdenv.mkDerivation {
             name = "typst-packages-cache";
@@ -72,11 +85,8 @@
           #     pkgs.typstyle
           #   ];
           # };
-      }
+          formatter = pkgs.nixfmt-rfc-style;
-    )
-    // {
-      hydraJobs = {
-        legacyPackages."x86_64-linux" = self.legacyPackages."x86_64-linux";
         };
+      # // {
     };
 }