[Git][haskell-team/pkg-haskell-tools][master] 2 commits: Blindly forward-port to shake 0.16

[Clint Adams]

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


Commits:
a6521135 by Clint Adams at 2018-06-11T13:29:20-04:00
Blindly forward-port to shake 0.16

- - - - -
ed5bce94 by Clint Adams at 2018-06-11T13:30:07-04:00
changelog for 0.12

- - - - -


5 changed files:

- debian/changelog
- debian/control
- dht.cabal
- src/Development/Shake/Fancy.hs
- src/make-all.hs


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pkg-haskell-tools (0.12) unstable; urgency=medium
+
+  * Port to shake 0.16.  closes: #901323.
+
+ -- Clint Adams <clint at debian.org>  Mon, 11 Jun 2018 13:29:32 -0400
+
 pkg-haskell-tools (0.11.1) unstable; urgency=medium
 
   [ Joachim Breitner ]


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -13,14 +13,13 @@ Build-Depends: debhelper (>= 9),
  libghc-extra-dev (>= 1.1),
  libghc-optparse-applicative-dev (>= 0.12),
  libghc-parsec3-dev,
- libghc-shake-dev (>= 0.15),
- libghc-shake-dev (<< 0.16),
+ libghc-shake-dev (>= 0.16),
  libghc-split-dev (>= 0.2),
  libghc-split-dev (<< 0.3),
  libghc-text-dev,
  libghc-concurrent-output-dev (>= 1.7),
  libfile-slurp-perl
-Standards-Version: 4.1.1
+Standards-Version: 4.1.4
 Homepage: https://wiki.debian.org/Haskell
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/pkg-haskell-tools.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/pkg-haskell-tools.git


=====================================
dht.cabal
=====================================
--- a/dht.cabal
+++ b/dht.cabal
@@ -27,7 +27,7 @@ executable make-all
     unix,
     parsec,
     text,
-    shake == 0.15.*,
+    shake >= 0.16,
     extra >= 1.1,
     debian >= 3.89,
     optparse-applicative >= 0.12,


=====================================
src/Development/Shake/Fancy.hs
=====================================
--- a/src/Development/Shake/Fancy.hs
+++ b/src/Development/Shake/Fancy.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving, ConstraintKinds #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving, ConstraintKinds, TypeFamilies #-}
 module Development.Shake.Fancy
     ( module Development.Shake
 
@@ -210,16 +210,16 @@ cmdWrap :: String -> S.Action a -> Action a
 cmdWrap cmd act =
     describe (quietly act) '!' ("running " ++ cmd)
 
-askOracle :: (S.ShakeValue q, S.ShakeValue a) => q -> Action a
+askOracle :: (S.RuleResult q ~ a, S.ShakeValue q, S.ShakeValue a) => q -> Action a
 askOracle query =
     describe (S.askOracle query) '?' ("querying oracle " ++ show query)
 
-addOracle :: (S.ShakeValue q, S.ShakeValue a) => (q -> Action a) -> S.Rules (q -> Action a)
+addOracle :: (S.RuleResult q ~ a, S.ShakeValue q, S.ShakeValue a) => (q -> Action a) -> S.Rules (q -> Action a)
 addOracle action = do
     query <- S.addOracle (\q -> wrapAction (action q) (show q))
     return $ liftAction . query
 
-addQuietOracle :: (S.ShakeValue q, S.ShakeValue a) => (q -> Action a) -> S.Rules (q -> Action a)
+addQuietOracle :: (S.RuleResult q ~ a, S.ShakeValue q, S.ShakeValue a) => (q -> Action a) -> S.Rules (q -> Action a)
 addQuietOracle action = do
     query <- S.addOracle (\q -> wrapSpuriousAction (action q) (show q))
     return $ liftAction . query


=====================================
src/make-all.hs
=====================================
--- a/src/make-all.hs
+++ b/src/make-all.hs
@@ -1,4 +1,6 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving, DeriveDataTypeable, RecordWildCards #-}
+{-# LANGUAGE TypeFamilies #-}
+
 import qualified Data.Map as M
 import qualified Data.Set as S
 import Control.Applicative hiding (many)
@@ -269,10 +271,12 @@ defaultExcludedPackages = words "ghc ghc-testsuite haskell-devscripts haskell98-
 newtype GetExcludedSources = GetExcludedSources () deriving (Show,Typeable,Eq,Hashable,Binary,NFData)
 
 newtype GetDebBuiltBy = GetDebBuiltBy String  deriving (Show,Typeable,Eq,Hashable,Binary,NFData)
+type instance RuleResult GetDebBuiltBy = Maybe String
 newtype GetBinToDeb = GetBinToDeb String  deriving (Show,Typeable,Eq,Hashable,Binary,NFData)
+type instance RuleResult GetBinToDeb = Maybe String
 
 newtype GetArch = GetArch () deriving (Typeable,Eq,Hashable,Binary,NFData)
-
+type instance RuleResult GetArch = String
 instance Show GetArch where show (GetArch ()) = "querying architecture"
 
 -- Find dependencies on binary packages we build ourselves.



View it on GitLab: https://salsa.debian.org/haskell-team/pkg-haskell-tools/compare/a25ef58a3eb6aa9221ec8b7dcad2a8aece0b6d06...ed5bce947099cee402f4a41d5d88819a7cfeb0cb

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/pkg-haskell-tools/compare/a25ef58a3eb6aa9221ec8b7dcad2a8aece0b6d06...ed5bce947099cee402f4a41d5d88819a7cfeb0cb
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/20180611/dbd3a96c/attachment-0001.html>