[Git][haskell-team/pkg-haskell-tools][master] 2 commits: Fix FTBFS with newer GHC. closes: #965064.

[Clint Adams]

Clint Adams pushed to branch master at Debian Haskell Group / pkg-haskell-tools


Commits:
5dd148b7 by Clint Adams at 2020-09-06T11:53:54-04:00
Fix FTBFS with newer GHC.  closes: #965064.

- - - - -
f260047b by Clint Adams at 2020-09-06T11:58:23-04:00
what-to-upgrade: improve error for failure to open the package-plan.  closes: #868762.

- - - - -


3 changed files:

- debian/changelog
- scripts/what-to-upgrade
- src/Development/Shake/Fancy.hs


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+pkg-haskell-tools (0.12.2) unstable; urgency=medium
+
+  * Fix FTBFS with newer GHC.  closes: #965064.
+  * what-to-upgrade: improve error for failure to open the
+    package-plan.  closes: #868762.
+
+ -- Clint Adams <clint at debian.org>  Sun, 06 Sep 2020 11:52:45 -0400
+
 pkg-haskell-tools (0.12.1) unstable; urgency=medium
 
   * Upgrade to debhelper compat 10.


=====================================
scripts/what-to-upgrade
=====================================
@@ -31,7 +31,7 @@ unless (@dirs) {
 }
 
 my %plan;
-open PLAN, '<', '../package-plan/packages.txt' or die @!;
+open PLAN, '<', '../package-plan/packages.txt' or die "Failure to open ../package-plan/packages.txt: ".@!;
 while (<PLAN>) {
         chomp;
         next if /^#/;


=====================================
src/Development/Shake/Fancy.hs
=====================================
@@ -82,7 +82,7 @@ data FancyEnv = FancyEnv
 
 -- | Wrapper around 'S.Action'
 newtype Action a = Action (ReaderT FancyEnv S.Action a)
-    deriving (Monad, Applicative, Functor, MonadIO)
+    deriving (Monad, Applicative, Functor, MonadIO, MonadFail)
 
 runAction :: Action a -> FancyEnv -> S.Action a
 runAction (Action fa) = runReaderT fa



View it on GitLab: https://salsa.debian.org/haskell-team/pkg-haskell-tools/-/compare/7895a8aa0555b321954d5c5d9077d13abbcb5039...f260047bed9f4f4a91965c947dca8e7c5be4c91e

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/pkg-haskell-tools/-/compare/7895a8aa0555b321954d5c5d9077d13abbcb5039...f260047bed9f4f4a91965c947dca8e7c5be4c91e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20200906/4bee9031/attachment-0001.html>