From 2260fbaec53ac1974532d8494cd5bae459753b82 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 27 Nov 2023 01:47:20 +0000
Subject: [PATCH] bonsai/hare-ev/hare-json: sync with nixpkgs PR

---
 pkgs/additional/bonsai/default.nix    | 12 +++++++-----
 pkgs/additional/hare-ev/default.nix   | 14 ++++++++++----
 pkgs/additional/hare-json/default.nix | 10 ++++++++--
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/pkgs/additional/bonsai/default.nix b/pkgs/additional/bonsai/default.nix
index d224fb06..762be7b5 100644
--- a/pkgs/additional/bonsai/default.nix
+++ b/pkgs/additional/bonsai/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromSourcehut {
     owner = "~stacyharper";
-    repo = pname;
+    repo = "bonsai";
     rev = "v${version}";
     hash = "sha256-Yosf07KUOQv4O5111tLGgI270g0KVGwzdTPtPOsTcP8=";
   };
@@ -35,25 +35,27 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     hare
+  ];
+
+  buildInputs = [
     hare-ev
     hare-json
   ];
 
   preConfigure = ''
     export HARECACHE=$(mktemp -d)
-    # FIX "ar: invalid option -- '/'" bug in older versions of hare.
-    # should be safe to remove once updated past 2023/05/22-ish.
-    # export ARFLAGS="-csr"
   '';
 
   installFlags = [ "PREFIX=$(out)" ];
 
+  doCheck = true;
+
   passthru.updateScript = gitUpdater {
     rev-prefix = "v";
   };
 
   meta = with lib; {
-    description = "Bonsai is a Finite State Machine structured as a tree";
+    description = "Finite State Machine structured as a tree";
     homepage = "https://git.sr.ht/~stacyharper/bonsai";
     license = licenses.agpl3;
     maintainers = with maintainers; [ colinsane ];
diff --git a/pkgs/additional/hare-ev/default.nix b/pkgs/additional/hare-ev/default.nix
index b33abe09..e9f49835 100644
--- a/pkgs/additional/hare-ev/default.nix
+++ b/pkgs/additional/hare-ev/default.nix
@@ -11,21 +11,27 @@ stdenv.mkDerivation rec {
 
   src = fetchFromSourcehut {
     owner = "~sircmpwn";
-    repo = pname;
+    repo = "hare-ev";
     rev = "9bdbd02401334b7d762131a46e64ca2cd24846dc";
     hash = "sha256-VY8nsy5kLDMScA2ig3Rgbkf6VQlCTnGWjzGvsI9OcaQ=";
   };
 
-  nativeBuildInputs = [
+  nativeCheckInputs = [
     hare
   ];
 
-  installFlags = [ "PREFIX=" "DESTDIR=$(out)" ];
+  preCheck = ''
+    export HARECACHE=$(mktemp -d)
+  '';
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  doCheck = true;
 
   passthru.updateScript = unstableGitUpdater { };
 
   meta = with lib; {
-    description = "an event loop for Hare programs";
+    description = "Event loop for Hare programs";
     homepage = "https://sr.ht/~sircmpwn/hare-ev";
     license = licenses.mpl20;
     maintainers = with maintainers; [ colinsane ];
diff --git a/pkgs/additional/hare-json/default.nix b/pkgs/additional/hare-json/default.nix
index d5dd9be5..2d802f2e 100644
--- a/pkgs/additional/hare-json/default.nix
+++ b/pkgs/additional/hare-json/default.nix
@@ -16,11 +16,17 @@ stdenv.mkDerivation rec {
     hash = "sha256-7QRieokqXarKwLfZynS8Rum9JV9hcxod00BWAUwwliM=";
   };
 
-  nativeBuildInputs = [
+  nativeCheckInputs = [
     hare
   ];
 
-  installFlags = [ "PREFIX=" "DESTDIR=$(out)" ];
+  preCheck = ''
+    export HARECACHE=$(mktemp -d)
+  '';
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  doCheck = true;
 
   passthru.updateScript = unstableGitUpdater { };