From a7f900d90f84b6cf92d50d28e1fcefe666cdf42b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 22 Aug 2022 17:50:25 -0700
Subject: [PATCH] flake.nix and default.nix

---
 default.nix | 51 +++++++++++++++++++++------------------------------
 flake.nix   |  2 +-
 2 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/default.nix b/default.nix
index ae59c73..31a3442 100644
--- a/default.nix
+++ b/default.nix
@@ -4,38 +4,29 @@
 let
   inherit (pkgs) lib;
   releases = builtins.fromJSON (lib.strings.fileContents ./sources.json);
-  installPhase = ''
-    mkdir -p $out/{doc,bin,lib}
-    [ -d docs ] && cp -r docs/* $out/doc
-    [ -d doc ] && cp -r doc/* $out/doc
-    cp -r lib/* $out/lib
-    cp zig $out/bin/zig
-  '';
+  mkDerivation = { url, version, sha256 }: pkgs.stdenv.mkDerivation {
+    inherit version;
+
+    pname = "zig";
+    src = pkgs.fetchurl { inherit url sha256; };
+    dontConfigure = true;
+    dontBuild = true;
+    dontFixup = true;
+    installPhase = ''
+      mkdir -p $out/{doc,bin,lib}
+      [ -d docs ] && cp -r docs/* $out/doc
+      [ -d doc ] && cp -r doc/* $out/doc
+      cp -r lib/* $out/lib
+      cp zig $out/bin/zig
+    '';
+  };
 in lib.attrsets.mapAttrs (k: v:
   if k == "master" then
-    lib.attrsets.mapAttrs (k: v:
-      (pkgs.stdenv.mkDerivation {
-        pname = "zig";
-        inherit (v.${system}) version;
-        src = pkgs.fetchurl {
-          inherit (v.${system}) url sha256;
-        };
-        dontConfigure = true;
-        dontBuild = true;
-        dontFixup = true;
-        installPhase = installPhase;
-      }))
-      v
+    lib.attrsets.mapAttrs (k: v: (mkDerivation {
+      inherit (v.${system}) version url sha256;
+    })) v
   else
-    pkgs.stdenv.mkDerivation {
-      pname = "zig";
-      inherit (v.${system}) version;
-      src = pkgs.fetchurl {
-        inherit (v.${system}) url sha256;
-      };
-      dontConfigure = true;
-      dontBuild = true;
-      dontFixup = true;
-      installPhase = installPhase;
+    mkDerivation {
+      inherit (v.${system}) version url sha256;
     })
   releases
diff --git a/flake.nix b/flake.nix
index afd1c59..37b6a75 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,7 +14,7 @@
       let pkgs = nixpkgs.legacyPackages.${system};
       in rec {
         packages = import ./default.nix { inherit system pkgs; };
-        defaultPackage = packages."0.7.1";
+        defaultPackage = packages."0.9.1";
         apps.zig = flake-utils.lib.mkApp { drv = defaultPackage; };
         defaultApp = apps.zig;
       });