From 1522eccfb3e073c34b2565c83a2f46772c59b25d Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 15 Dec 2023 17:40:44 +0000
Subject: [PATCH] nixpkgs: 2023-12-14 -> 2023-12-15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
• Updated input 'nixpkgs-next-unpatched':
    'github:nixos/nixpkgs/248d12a902bfc36134176f31beba87b1fe30a3c1' (2023-12-14)
  → 'github:nixos/nixpkgs/9ad53b7aaf2b9e9e0d7e36ff4f8a779bf9b0195f' (2023-12-15)
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/fd7914c96f7c006047e0154dd239aa2396478094' (2023-12-14)
  → 'github:nixos/nixpkgs/8a205497ba6f6938b7b516c184b7cf326ab15548' (2023-12-15)
```
---
 flake.lock                         | 12 ++++++------
 nixpatches/list.nix                | 12 ++++++------
 pkgs/additional/bonsai/default.nix |  5 ++++-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8fca1bc14..eeac59e13 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,11 +37,11 @@
     },
     "nixpkgs-next-unpatched": {
       "locked": {
-        "lastModified": 1702576862,
-        "narHash": "sha256-liPhhJX9mCn92QpInvAoVKn6Wmrs2Ph34Zda4XZGOAI=",
+        "lastModified": 1702641673,
+        "narHash": "sha256-yRFH2tMS2HO4OkuBzvt0e2ZycG0epdzeXaVh0VFtw1k=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "248d12a902bfc36134176f31beba87b1fe30a3c1",
+        "rev": "9ad53b7aaf2b9e9e0d7e36ff4f8a779bf9b0195f",
         "type": "github"
       },
       "original": {
@@ -69,11 +69,11 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1702578284,
-        "narHash": "sha256-gGNEJDUtKWvGUA9RsQwfbL3z9e4wMOHhslvbUG3qClE=",
+        "lastModified": 1702656322,
+        "narHash": "sha256-KNa7Y87K9OQ+NanjhBXvSI6rC0+LWmOls+4nZYhW8Kw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fd7914c96f7c006047e0154dd239aa2396478094",
+        "rev": "8a205497ba6f6938b7b516c184b7cf326ab15548",
         "type": "github"
       },
       "original": {
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index 960e340f8..eeafd0b90 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -296,12 +296,12 @@ in [
   #   saneCommit = "507252828934c73c7cffe255dae237c041676c27";
   #   hash = "sha256-HwycOd3v4IifdQqQmMP6w14g0E/T9RAjAw41AsUZQoc=";
   # })
-  (fetchpatch' {
-    # includes hare-json and hare-ev as pre-reqs
-    title = "bonsai: init at 1.0.0";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/233892";
-    hash = "sha256-EIv0hx0pXQUDz4V3PRj1SpdgNuL068Yh3zBYS9Ioh+w=";
-  })
+  # (fetchpatch' {
+  #   # includes hare-json and hare-ev as pre-reqs
+  #   title = "bonsai: init at 1.0.0";
+  #   prUrl = "https://github.com/NixOS/nixpkgs/pull/233892";
+  #   hash = "sha256-EIv0hx0pXQUDz4V3PRj1SpdgNuL068Yh3zBYS9Ioh+w=";
+  # })
 
   # pin to a pre-0.17.3 release
   # removing this and using stock 0.17.3 (also 0.17.4) causes:
diff --git a/pkgs/additional/bonsai/default.nix b/pkgs/additional/bonsai/default.nix
index 4b49f31bf..ed0496c4e 100644
--- a/pkgs/additional/bonsai/default.nix
+++ b/pkgs/additional/bonsai/default.nix
@@ -3,10 +3,13 @@
 , fetchFromSourcehut
 , gitUpdater
 , hare
+, hareThirdParty
 , hare-ev
-, hare-json
 }:
 
+let
+  inherit (hareThirdParty) hare-json;
+in
 stdenv.mkDerivation rec {
   pname = "bonsai";
   version = "1.0.2";