hare-ev: remove (upstreamed)
This commit is contained in:
parent
7597853cda
commit
ba8774d6e5
|
@ -4,11 +4,10 @@
|
||||||
, gitUpdater
|
, gitUpdater
|
||||||
, hare
|
, hare
|
||||||
, hareThirdParty
|
, hareThirdParty
|
||||||
, hare-ev
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (hareThirdParty) hare-json;
|
inherit (hareThirdParty) hare-json hare-ev;
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bonsai";
|
pname = "bonsai";
|
||||||
|
|
|
@ -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;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -39,7 +39,6 @@ let
|
||||||
gpodder = final'.gpodder-adaptive;
|
gpodder = final'.gpodder-adaptive;
|
||||||
};
|
};
|
||||||
gpodder-configured = callPackage ./additional/gpodder-configured { };
|
gpodder-configured = callPackage ./additional/gpodder-configured { };
|
||||||
hare-ev = callPackage ./additional/hare-ev { };
|
|
||||||
jellyfin-media-player-qt6 = callPackage ./additional/jellyfin-media-player-qt6 { };
|
jellyfin-media-player-qt6 = callPackage ./additional/jellyfin-media-player-qt6 { };
|
||||||
koreader-from-src = callPackage ./additional/koreader-from-src { };
|
koreader-from-src = callPackage ./additional/koreader-from-src { };
|
||||||
ldd-aarch64 = callPackage ./additional/ldd-aarch64 { };
|
ldd-aarch64 = callPackage ./additional/ldd-aarch64 { };
|
||||||
|
@ -147,11 +146,5 @@ let
|
||||||
// (lib.mapAttrs (pname: _pkg: final'.sane."${pname}") sane-patched)
|
// (lib.mapAttrs (pname: _pkg: final'.sane."${pname}") sane-patched)
|
||||||
# "additional" packages only get added if they've not been upstreamed:
|
# "additional" packages only get added if they've not been upstreamed:
|
||||||
// (lib.mapAttrs (pname: _pkg: unpatched."${pname}" or final'.sane."${pname}") sane-additional)
|
// (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
|
in sane-overlay
|
||||||
|
|
Loading…
Reference in New Issue
Block a user