Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Nest
Overlay
Commits
85d0ac98
Commit
85d0ac98
authored
Feb 21, 2021
by
James T. Lee
Browse files
haskell: Patch taffybar for GHC 9
parent
318487ff
Pipeline
#557
passed with stage
in 27 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
117 additions
and
0 deletions
+117
-0
x11-misc/taffybar/Manifest
x11-misc/taffybar/Manifest
+3
-0
x11-misc/taffybar/files/taffybar-3.2.3-ghc-9-compatibility.patch
...c/taffybar/files/taffybar-3.2.3-ghc-9-compatibility.patch
+29
-0
x11-misc/taffybar/taffybar-3.2.3-r1.ebuild
x11-misc/taffybar/taffybar-3.2.3-r1.ebuild
+85
-0
No files found.
x11-misc/taffybar/Manifest
0 → 100644
View file @
85d0ac98
AUX taffybar-3.2.3-ghc-9-compatibility.patch 1285 BLAKE2B dc2747299c51a93ea8af9b28a8a66902a2feb7a6eeeca8178233c920ca0541adf7712a8f88e677a7dcc71a338c62b67d716f1ac61d3f1e467b1de5a54adf7b5a SHA512 9846500632717d32aaffce5afb4fb2e6feafd606afb6fb5b2d08b567913e8cf2306866536d911bd2f4d616bcb7c2f7c7ec80ff394f3ff5ff1634be4a3d0780db
DIST taffybar-3.2.3.tar.gz 91070 BLAKE2B 93835123a890ca0bc3fbc955b574feeb4de0e18df8f4f9854509fd701d91a50ca1152fa45b452d8c6d6e9eb3f696d828b38dabafda523269f981f139cd627d61 SHA512 d57e3a113a4c71ed74df193176d2dd6341bf886916834f5281cd71bdc8de4c89ccd86746d717a1221bf3883a72195a9390c228037800a5d645f45bb87fdcd636
EBUILD taffybar-3.2.3-r1.ebuild 3038 BLAKE2B 075333f7dbceb3139de0128b43f4b8bea306d00e4417c9ad106ac377517f5faedb8585865f11b1f54d7d836e80875e87801637d468302a23f4bcfd91ad8994e5 SHA512 ca939f458d72630fb9b62c302e8fa1f0e256455a57b3dd8d44b3ccbec87e959aa1226002ef4a7589efb7570f948f7f001ff06eb5afe133eda7d08703cc0cae58
x11-misc/taffybar/files/taffybar-3.2.3-ghc-9-compatibility.patch
0 → 100644
View file @
85d0ac98
diff -ur taffybar-3.2.3.orig/src/System/Taffybar/Context.hs taffybar-3.2.3/src/System/Taffybar/Context.hs
--- taffybar-3.2.3.orig/src/System/Taffybar/Context.hs 2021-02-21 20:28:29.131349867 -0500
+++ taffybar-3.2.3/src/System/Taffybar/Context.hs 2021-02-21 21:42:47.842460554 -0500
@@ -58,7 +58,7 @@
type Taffy m v = MonadIO m => ReaderT Context m v
type TaffyIO v = ReaderT Context IO v
-type Listener = Event -> Taffy IO ()
+type Listener = Event -> TaffyIO ()
type SubscriptionList = [(Unique, Listener)]
data Value = forall t. Typeable t => Value t
@@ -343,7 +343,7 @@
-- | Remove the listener associated with the provided "Unique" from the
-- collection of listeners.
-unsubscribe :: Unique -> Taffy IO ()
+unsubscribe :: Unique -> TaffyIO ()
unsubscribe identifier = do
listenersVar <- asks listeners
lift $ MV.modifyMVar_ listenersVar $ return . filter ((== identifier) . fst)
@@ -376,5 +376,5 @@
handleX11Event :: Event -> Taffy IO ()
handleX11Event event =
asksContextVar listeners >>= mapM_ applyListener
- where applyListener :: (Unique, Listener) -> Taffy IO ()
+ where applyListener :: (Unique, Listener) -> TaffyIO ()
applyListener (_, listener) = taffyFork $ listener event
Only in taffybar-3.2.3/src/System/Taffybar: .Context.hs.swp
x11-misc/taffybar/taffybar-3.2.3-r1.ebuild
0 → 100644
View file @
85d0ac98
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI
=
7
# ebuild generated by hackport 0.6.6.9999
CABAL_FEATURES
=
"lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION
=
"A desktop bar similar to xmobar, but with more GUI"
HOMEPAGE
=
"https://github.com/taffybar/taffybar"
SRC_URI
=
"https://hackage.haskell.org/package/
${
P
}
/
${
P
}
.tar.gz"
LICENSE
=
"BSD"
SLOT
=
"0/
${
PV
}
"
KEYWORDS
=
"~amd64 ~x86"
IUSE
=
""
RDEPEND
=
"dev-haskell/ansi-terminal:=[profile?]
>=dev-haskell/broadcast-chan-0.2.0.2:=[profile?]
dev-haskell/configfile:=[profile?]
>=dev-haskell/dbus-1.2.11:=[profile?] <dev-haskell/dbus-2.0.0:=[profile?]
>=dev-haskell/dbus-hslogger-0.1.0.1:=[profile?] <dev-haskell/dbus-hslogger-0.2.0.0:=[profile?]
>=dev-haskell/dyre-0.8.6:=[profile?] <dev-haskell/dyre-0.9:=[profile?]
>=dev-haskell/either-4.0.0.0:=[profile?]
>=dev-haskell/enclosed-exceptions-1.0.0.1:=[profile?]
dev-haskell/gi-cairo:=[profile?]
dev-haskell/gi-cairo-connector:=[profile?]
dev-haskell/gi-cairo-render:=[profile?]
dev-haskell/gi-gdk:=[profile?]
dev-haskell/gi-gdkpixbuf:=[profile?]
dev-haskell/gi-gdkx11:=[profile?]
dev-haskell/gi-glib:=[profile?]
dev-haskell/gi-gtk:=[profile?]
dev-haskell/gi-gtk-hs:=[profile?]
dev-haskell/gi-pango:=[profile?]
>=dev-haskell/gtk-sni-tray-0.1.5.0:=[profile?]
>=dev-haskell/gtk-strut-0.1.2.1:=[profile?]
>=dev-haskell/haskell-gi-0.24:=[profile?]
>=dev-haskell/haskell-gi-base-0.24:=[profile?]
dev-haskell/hslogger:=[profile?]
>=dev-haskell/hstringtemplate-0.8:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
>=dev-haskell/http-client-0.5:=[profile?]
dev-haskell/http-client-tls:=[profile?]
dev-haskell/http-types:=[profile?]
>=dev-haskell/multimap-1.2.1:=[profile?]
dev-haskell/old-locale:=[profile?]
dev-haskell/optparse-applicative:=[profile?]
>=dev-haskell/parsec-3.1:=[profile?]
>=dev-haskell/rate-limit-1.1.1:=[profile?]
dev-haskell/regex-compat:=[profile?]
>=dev-haskell/safe-0.3:=[profile?] <dev-haskell/safe-1:=[profile?]
>=dev-haskell/scotty-0.11.0:=[profile?]
>=dev-haskell/split-0.1.4.2:=[profile?]
>=dev-haskell/status-notifier-item-0.3.0.5:=[profile?]
dev-haskell/stm:=[profile?]
dev-haskell/text:=[profile?]
>=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?]
>=dev-haskell/time-units-1.0.0:=[profile?]
>=dev-haskell/transformers-base-0.4:=[profile?]
>=dev-haskell/tuple-0.3.0.2:=[profile?]
dev-haskell/utf8-string:=[profile?]
>=dev-haskell/x11-1.5.0.1:=[profile?]
>=dev-haskell/xdg-basedir-0.2:=[profile?] <dev-haskell/xdg-basedir-0.3:=[profile?]
dev-haskell/xdg-desktop-entry:=[profile?]
dev-haskell/xml:=[profile?]
dev-haskell/xml-helpers:=[profile?]
>=dev-lang/ghc-8.8.1:=
x11-libs/gtk+:3
x11-wm/xmonad:=[profile?]
"
DEPEND
=
"
${
RDEPEND
}
>=dev-haskell/cabal-3.0.0.0
virtual/pkgconfig
"
src_prepare
()
{
default
cabal_chdeps
\
'scotty >= 0.11.0 && < 0.12.0'
'scotty >= 0.11.0'
eapply
"
${
FILESDIR
}
/
${
PN
}
-3.2.3-ghc-9-compatibility.patch"
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment