From 81723ae558eb9873ef138daa0a2268b0e8376365 Mon Sep 17 00:00:00 2001
From: blissful <blissful@sunsetglow.net>
Date: Sat, 18 May 2024 16:57:57 -0400
Subject: [PATCH] Revert "rm zon2nix from master"

This reverts commit d1485a964de78d58ac8365f2519465066e3f20ca.
---
 flake.lock | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 flake.nix  |  6 ++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/flake.lock b/flake.lock
index 488bea8..d3848f9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,26 @@
 {
   "nodes": {
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "zon2nix-src",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1698882062,
+        "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -37,7 +58,8 @@
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "zon2nix-src": "zon2nix-src"
       }
     },
     "systems": {
@@ -54,6 +76,27 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "zon2nix-src": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1715536407,
+        "narHash": "sha256-ow/4w6dV2fpi/dY2SHksDg2pZZwam3dH29bCyR92pmI=",
+        "owner": "azuline",
+        "repo": "zon2nix",
+        "rev": "88a009e478480c313ed9c013d3efac411557c9ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "azuline",
+        "repo": "zon2nix",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 0c2a7a7..44004e7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,12 +4,16 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
+    # Bug in upstream: https://github.com/nix-community/zon2nix/pull/8.
+    zon2nix-src.url = "github:azuline/zon2nix";
+    zon2nix-src.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
     { self
     , nixpkgs
     , flake-utils
+    , zon2nix-src
     }:
     flake-utils.lib.eachDefaultSystem (system:
     let
@@ -52,6 +56,7 @@
       python-with-deps = python-pin.withPackages (_:
         pkgs.lib.attrsets.mapAttrsToList (a: b: b) py-deps
       );
+      zon2nix = zon2nix-src.packages.${system}.default;
     in
     {
       devShells.default = pkgs.mkShell {
@@ -80,6 +85,7 @@
               pkgs.zig
               pkgs.zls
               python-with-deps
+              zon2nix
             ];
           })
         ];