From f5b04c829b1de841b27ae84ce2b76b4c9f9057bf Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Thu, 27 Jul 2017 20:14:11 -0700 Subject: [PATCH 1/5] Block packages to unconstrain Cabal, closes #2683 --- build-constraints.yaml | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 74cfe0bc..fe46fb20 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -304,7 +304,7 @@ packages: - executable-path - foreign-store - formatting - - gtk2hs-buildtools + # - gtk2hs-buildtools # Cabal 2.0.0.2 - happy - hybrid-vectors - indents @@ -385,7 +385,7 @@ packages: "Jasper Van der Jeugt @jaspervdj": - blaze-html - blaze-markup - - cabal-dependency-licenses + # - cabal-dependency-licenses # Cabal 2.0.0.2 # - hakyll # bounds: skylighting - stylish-haskell # - patat # bounds: skylighting @@ -472,7 +472,7 @@ packages: - hostname-validate - ini - lucid - - osdkeys # via libnotify + # - osdkeys # via libnotify # Cabal 2.0.0.2 - pdfinfo # - present # compilation failure against haskell-src-exts - pure-io @@ -1011,7 +1011,7 @@ packages: - multimap - parallel-io - text-binary - - Chart-cairo + # - Chart-cairo # Cabal 2.0.0.2 - ghc-events - monad-extras # - stack < 9.9.9 # bounds: ghc, template-haskell @@ -1159,15 +1159,15 @@ packages: - xmonad-contrib # - shelly # GHC 8.2.1 - - cairo - - gio - - glib - - gtk - - gtk3 - - gtksourceview3 - - pango - - webkitgtk3 - - webkitgtk3-javascriptcore + # - cairo # Cabal 2.0.0.2 + # - gio # Cabal 2.0.0.2 + # - glib # Cabal 2.0.0.2 + # - gtk # Cabal 2.0.0.2 + # - gtk3 # Cabal 2.0.0.2 + # - gtksourceview3 # Cabal 2.0.0.2 + # - pango # Cabal 2.0.0.2 + # - webkitgtk3 # Cabal 2.0.0.2 + # - webkitgtk3-javascriptcore # Cabal 2.0.0.2 - ghcjs-codemirror # - ghcjs-dom # via: ghcjs-dom-jsaddle # https://github.com/fpco/stackage/issues/1569 @@ -1559,9 +1559,9 @@ packages: - hmatrix-gsl-stats - hsignal - hstatistics - - plot - - plot-gtk - - plot-gtk3 + # - plot # Cabal 2.0.0.2 + # - plot-gtk # Cabal 2.0.0.2 + # - plot-gtk3 # Cabal 2.0.0.2 - vector-buffer # - hmatrix-repa # via repa: bounds: vector @@ -2265,7 +2265,8 @@ packages: # - multiplate # bounds: transformers "Sumit Sahrawat @sumitsahrawat": - - plot-gtk-ui + [] + # - plot-gtk-ui # Cabal 2.0.0.2 # - calculator # bounds: ghc, base "Emmanuel Touzery @emmanueltouzery": @@ -2716,8 +2717,8 @@ packages: - wikicfp-scraper - wild-bind - wild-bind-x11 - - wild-bind-indicator - - wild-bind-task-x11 + # - wild-bind-indicator # Cabal 2.0.0.2 + # - wild-bind-task-x11 # Cabal 2.0.0.2 "Cies Breijs @cies": - htoml @@ -2832,7 +2833,7 @@ packages: # - mixed-types-num # GHC 8.2.1 "Bartosz Nitka @niteria": - - haskell-packages + # - haskell-packages # Cabal 2.0.0.2 - oeis "Gergely Patai @cobbpg": From f159ba114bfb058913c2d632d21ab401156c71bf Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Fri, 28 Jul 2017 16:15:27 -0700 Subject: [PATCH 2/5] Add constraint "cue-sheet < 1" per #2666 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fe46fb20..c35ac50c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3269,6 +3269,7 @@ packages: # https://github.com/fpco/stackage/issues/2666 - megaparsec < 6 - hspec-megaparsec < 1 + - cue-sheet < 1 # https://github.com/fpco/stackage/issues/2682 - turtle < 1.4 From 673ad03fdc8518044df60c40ff090744fb983c8b Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Fri, 28 Jul 2017 16:17:29 -0700 Subject: [PATCH 3/5] Add constraint "semigroupoids < 5.2.1" per #2686 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c35ac50c..93dccdbd 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3274,6 +3274,9 @@ packages: # https://github.com/fpco/stackage/issues/2682 - turtle < 1.4 + # https://github.com/fpco/stackage/issues/2686 + - semigroupoids < 5.2.1 + # end of packages # Package flags are applied to individual packages, and override the values of From 707aa64bc2813cb10789543bf4a8fc11ea3d1b3b Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Fri, 28 Jul 2017 16:20:58 -0700 Subject: [PATCH 4/5] Disable packages requiring cabal-version >= 2 --- build-constraints.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 93dccdbd..f8361c6c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2373,7 +2373,8 @@ packages: # - ttrie # GHC 8.2.1 via atomic-primops "Greg Weber @gregwebs": - - base-noprelude + [] + # - base-noprelude # cabal-version >= 2 "Andrew Lelechenko @Bodigrim": - exp-pairs @@ -3208,9 +3209,10 @@ packages: - safeio "Alex Biehl @alexbiehl": - - haddock-library - - haddock-api - - haddock + [] + # - haddock-library # cabal-version >= 2 + # - haddock-api # cabal-version >= 2 + # - haddock # cabal-version >= 2 "Mark Hopkins @mjhopkins": [] From 3501991a8f64cbf82db8137bfb2366ed168d54b6 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Fri, 28 Jul 2017 16:21:39 -0700 Subject: [PATCH 5/5] Remove constraint "semigroupoids < 5.2.1", closes #2686 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f8361c6c..393b21a5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3276,9 +3276,6 @@ packages: # https://github.com/fpco/stackage/issues/2682 - turtle < 1.4 - # https://github.com/fpco/stackage/issues/2686 - - semigroupoids < 5.2.1 - # end of packages # Package flags are applied to individual packages, and override the values of