update flake.nix, update lock

Author: jcollie

build.zig.zon.nix

@@ -47,10 +47,7 @@ let
       url_without_query = builtins.elemAt (lib.splitString "?" url_base) 0;
       rev_base = builtins.elemAt parts 1;
       rev =
-        if builtins.match "^[a-fA-F0-9]{40}$" rev_base != null then
-          rev_base
-        else
-          "refs/heads/${rev_base}";
+        if builtins.match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}";
     in
     fetchgit {
       inherit name rev hash;

flake.lock

@@ -5,64 +5,72 @@
     nixpkgs = {
       url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz";
     };
-    flake-utils = {
-      url = "github:numtide/flake-utils";
-    };
     zon2nix = {
-      url = "github:jcollie/zon2nix?ref=e626a6f501069e55ce3874a63527ddf867728ac8";
+      url = "github:jcollie/zon2nix?ref=728e15a05e8f48765a64f74d5720ec0a2567fe95";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
     };
   };
 
-  outputs = {
-    nixpkgs,
-    flake-utils,
-    zon2nix,
-    ...
-  }: let
-  in
-    flake-utils.lib.eachDefaultSystem (
-      system: let
-        pkgs = import nixpkgs {
+  outputs =
+    {
+      nixpkgs,
+      zon2nix,
+      ...
+    }:
+    let
+      makePackages =
+        system:
+        import nixpkgs {
           inherit system;
         };
-        gir_path = [
-          pkgs.gdk-pixbuf
-          pkgs.gexiv2
-          pkgs.glib
-          pkgs.gobject-introspection
-          pkgs.graphene
-          pkgs.gtk4
-          pkgs.harfbuzz
-          pkgs.libadwaita
-          pkgs.libpanel
-          pkgs.libportal
-          pkgs.libportal-gtk4
-          pkgs.pango
-          pkgs.librsvg
-        ];
-      in {
-        devShells.default = pkgs.mkShell {
-          name = "ghostty-gobject";
-          packages =
-            [
-              pkgs.alejandra
+      forAllSystems = (
+        function:
+        nixpkgs.lib.genAttrs [
+          "aarch64-linux"
+          "aarch64-darwin"
+          "x86_64-linux"
+          "x86_64-darwin"
+        ] (system: function (makePackages system))
+      );
+    in
+    {
+      devShells = forAllSystems (pkgs: {
+        default =
+          let
+            gir_path = [
+              pkgs.gdk-pixbuf
+              pkgs.gexiv2
+              pkgs.glib
+              pkgs.gobject-introspection
+              pkgs.graphene
+              pkgs.gtk4
+              pkgs.harfbuzz
+              pkgs.libadwaita
+              pkgs.libpanel
+              pkgs.libportal
+              pkgs.libportal-gtk4
+              pkgs.pango
+              pkgs.librsvg
+            ];
+          in
+          pkgs.mkShell {
+            name = "ghostty-gobject";
+            packages = [
               pkgs.gh
               pkgs.gnutar
               pkgs.libxml2
               pkgs.libxslt
               pkgs.minisign
-              pkgs.nodePackages.prettier
+              pkgs.nixfmt-rfc-style
               pkgs.pinact
               pkgs.pkg-config
               pkgs.zig_0_15
-              zon2nix.packages.${system}.zon2nix
+              zon2nix.packages.${pkgs.system}.zon2nix
             ]
             ++ gir_path;
-          LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath gir_path;
-          GIR_PATH = pkgs.lib.strings.makeSearchPathOutput "dev" "share/gir-1.0" gir_path;
-        };
-      }
-    );
+            LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath gir_path;
+            GIR_PATH = pkgs.lib.strings.makeSearchPathOutput "dev" "share/gir-1.0" gir_path;
+          };
+      });
+    };
 }