From 3aa0f2af85de30cf9cf92b286434a07a054ec8e7 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Thu, 27 Jun 2019 20:35:41 -0700 Subject: [PATCH 1/2] Revert "Add taffybar and dependencies" This reverts commit c2d862d0cf83c96bb32fce3e00f1ca5793562fbd. --- build-constraints.yaml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index edcca283..f14ed007 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3908,19 +3908,6 @@ packages: "Elben Shira @elben": - pencil - "Ivan Malison @IvanMalison": - - ConfigFile - - dbus-hslogger - - gi-cairo-connector - - gi-cairo-render - - gtk-sni-tray - - gtk-strut - - rate-limit - - status-notifier-item - - taffybar - - time-units - - xml-helpers - "Grandfathered dependencies": - Boolean - ChasingBottoms < 0 # due to QuickCheck, https://github.com/commercialhaskell/stackage/issues/4444 @@ -4445,6 +4432,7 @@ packages: # failed to build - Fin < 0 - HPDF < 0 + - broadcast-chan < 0 - df1 < 0 - di-handle < 0 - exinst < 0 From f6e89a156a5c1e1cedbf0b030cf59788362e01b3 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Thu, 27 Jun 2019 20:35:41 -0700 Subject: [PATCH 2/2] Revert "Add gi-dbusmenu, gi-dbusmenugtk3, gi-gdkx11 and gi-xlib" This reverts commit 9bb8776c2a846c35372dc80761f33b6329397578. --- build-constraints.yaml | 6 +----- debian-bootstrap.sh | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f14ed007..4b146b62 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2917,18 +2917,14 @@ packages: - haskell-gi-base - gi-atk - gi-cairo - - gi-dbusmenu - - gi-dbusmenugtk3 - - gi-gdkx11 - - gi-gio - gi-glib + - gi-gio - gi-gobject - gi-gtk - gi-gtk-hs - gi-gtksource - gi-javascriptcore - gi-vte - - gi-xlib # - gi-webkit2 # GHC 8.4 "Brandon Simmons @jberryman": diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index c886d7ee..bdd8f27d 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -42,7 +42,6 @@ apt-get install -y \ gnupg \ gradle \ hscolour \ - libdbusmenu-gtk3-dev \ libadns1-dev \ libaio1 \ libalut-dev \ @@ -93,8 +92,8 @@ apt-get install -y \ libmysqlclient-dev \ libncurses5-dev \ libnfc-dev \ - libnotify-dev \ liboath-dev \ + libnotify-dev \ libopenal-dev \ libopenmpi-dev \ libpango1.0-dev \