mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support building with yesod 1.4.

Browse source 
The new yesod needs the ViewPatterns extension.
Also, a TH splice in Assistant/Threads/WebApp.hs failed to work without
OverLoadedStrings.

This commit was sponsored by Brock Spratlen.
This commit is contained in:
Joey Hess 2014-10-09 16:56:20 -04:00
parent 507e0ca358
commit 164f0d73ff
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Assistant/Threads/WebApp.hs
View file

@ -6,6 +6,7 @@
-} -}
{-# LANGUAGE TemplateHaskell, MultiParamTypeClasses #-} {-# LANGUAGE TemplateHaskell, MultiParamTypeClasses #-}
{-# ViewPatterns, OverloadedStrings #-}
{-# LANGUAGE CPP #-} {-# LANGUAGE CPP #-}
{-# OPTIONS_GHC -fno-warn-orphans #-} {-# OPTIONS_GHC -fno-warn-orphans #-}

2
Assistant/WebApp/Types.hs
View file

@ -7,7 +7,7 @@
{-# LANGUAGE TypeFamilies, QuasiQuotes, MultiParamTypeClasses #-} {-# LANGUAGE TypeFamilies, QuasiQuotes, MultiParamTypeClasses #-}
{-# LANGUAGE TemplateHaskell, OverloadedStrings, RankNTypes #-} {-# LANGUAGE TemplateHaskell, OverloadedStrings, RankNTypes #-}
{-# LANGUAGE FlexibleInstances, FlexibleContexts #-} {-# LANGUAGE FlexibleInstances, FlexibleContexts, ViewPatterns #-}
{-# LANGUAGE CPP #-} {-# LANGUAGE CPP #-}
{-# OPTIONS_GHC -fno-warn-orphans #-} {-# OPTIONS_GHC -fno-warn-orphans #-}

1
debian/changelog vendored
View file

@ -1,6 +1,7 @@
git-annex (5.20140928) UNRELEASED; urgency=medium git-annex (5.20140928) UNRELEASED; urgency=medium
* Adjust cabal file to support building w/o assistant on the hurd. * Adjust cabal file to support building w/o assistant on the hurd.
* Support building with yesod 1.4.
-- Joey Hess <joeyh@debian.org> Mon, 29 Sep 2014 14:07:51 -0400 -- Joey Hess <joeyh@debian.org> Mon, 29 Sep 2014 14:07:51 -0400

3
doc/bugs/Req:_Upgrade_to_Yesod_1.4__63___https:__47____47__github.com__47__NixOS__47__nixpkgs__47__pull__47__4391.mdwn
View file

@ -19,3 +19,6 @@ Latest
# End of transcript or log. # End of transcript or log.
"""]] """]]
> [[fixed|done]], although I have not made a release yet.
> It's a 1 line change anyhow, just adding ViewPatterns. --[[Joey]]