From ba8774d6e5c93e490786a35726085b2d4e656e30 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Wed, 20 Dec 2023 09:21:11 +0000
Subject: [PATCH] hare-ev: remove (upstreamed)

---
 pkgs/additional/bonsai/default.nix  |  3 +--
 pkgs/additional/hare-ev/default.nix | 40 -----------------------------
 pkgs/default.nix                    |  9 +------
 3 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/additional/hare-ev/default.nix

diff --git a/pkgs/additional/bonsai/default.nix b/pkgs/additional/bonsai/default.nix
index ed0496c4..b3e40626 100644
--- a/pkgs/additional/bonsai/default.nix
+++ b/pkgs/additional/bonsai/default.nix
@@ -4,11 +4,10 @@
 , gitUpdater
 , hare
 , hareThirdParty
-, hare-ev
 }:
 
 let
-  inherit (hareThirdParty) hare-json;
+  inherit (hareThirdParty) hare-json hare-ev;
 in
 stdenv.mkDerivation rec {
   pname = "bonsai";
diff --git a/pkgs/additional/hare-ev/default.nix b/pkgs/additional/hare-ev/default.nix
deleted file mode 100644
index 82c61505..00000000
--- a/pkgs/additional/hare-ev/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv
-, lib
-, fetchFromSourcehut
-, hare
-, unstableGitUpdater
-}:
-
-stdenv.mkDerivation {
-  pname = "hare-ev";
-  version = "unstable-2023-12-04";
-
-  src = fetchFromSourcehut {
-    owner = "~sircmpwn";
-    repo = "hare-ev";
-    rev = "e3c3f7613c602672ac41a3e47c106a5bd27a2378";
-    hash = "sha256-TQsR2lXJfkPu53WpJy/K+Jruyfw8mCkEIE9DbFQoS+s=";
-  };
-
-  nativeCheckInputs = [
-    hare
-  ];
-
-  preCheck = ''
-    export HARECACHE=$(mktemp -d)
-  '';
-
-  installFlags = [ "PREFIX=$(out)" ];
-
-  doCheck = true;
-
-  passthru.updateScript = unstableGitUpdater { };
-
-  meta = with lib; {
-    description = "Event loop for Hare programs";
-    homepage = "https://sr.ht/~sircmpwn/hare-ev";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ colinsane ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 2917cc8e..6f12c386 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -39,7 +39,6 @@ let
       gpodder = final'.gpodder-adaptive;
     };
     gpodder-configured = callPackage ./additional/gpodder-configured { };
-    hare-ev = callPackage ./additional/hare-ev { };
     jellyfin-media-player-qt6 = callPackage ./additional/jellyfin-media-player-qt6 { };
     koreader-from-src = callPackage ./additional/koreader-from-src { };
     ldd-aarch64 = callPackage ./additional/ldd-aarch64 { };
@@ -147,11 +146,5 @@ let
     // (lib.mapAttrs (pname: _pkg: final'.sane."${pname}") sane-patched)
     # "additional" packages only get added if they've not been upstreamed:
     // (lib.mapAttrs (pname: _pkg: unpatched."${pname}" or final'.sane."${pname}") sane-additional)
-    // {
-    # temporarily hold these back because the upstream version is broken in some way
-    inherit (final'.sane)
-      bonsai
-      hare-ev
-    ;
-  };
+  ;
 in sane-overlay