diff options
author | Joey Hess <joey@kitenet.net> | 2014-10-09 16:56:20 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-10-09 17:01:54 -0400 |
commit | 7d67f9968df398bb04c6587174ce0cfcefc82f0e (patch) | |
tree | d9b5ce8bb4dcc3cd05c69c9e65553abae9e92e55 | |
parent | 0a43118c883889f1a79389fe50cc7a2d1113653e (diff) |
Support building with yesod 1.4.
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.
-rw-r--r-- | Assistant/Threads/WebApp.hs | 1 | ||||
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | doc/bugs/Req:_Upgrade_to_Yesod_1.4__63___https:__47____47__github.com__47__NixOS__47__nixpkgs__47__pull__47__4391.mdwn | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs index b22b54a8d..224703777 100644 --- a/Assistant/Threads/WebApp.hs +++ b/Assistant/Threads/WebApp.hs @@ -6,6 +6,7 @@ -} {-# LANGUAGE TemplateHaskell, MultiParamTypeClasses #-} +{-# ViewPatterns, OverloadedStrings #-} {-# LANGUAGE CPP #-} {-# OPTIONS_GHC -fno-warn-orphans #-} diff --git a/debian/changelog b/debian/changelog index 79e56d949..75c8303ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ git-annex (5.20140928) UNRELEASED; urgency=medium * 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 diff --git a/doc/bugs/Req:_Upgrade_to_Yesod_1.4__63___https:__47____47__github.com__47__NixOS__47__nixpkgs__47__pull__47__4391.mdwn b/doc/bugs/Req:_Upgrade_to_Yesod_1.4__63___https:__47____47__github.com__47__NixOS__47__nixpkgs__47__pull__47__4391.mdwn index f5f649865..6e0117202 100644 --- a/doc/bugs/Req:_Upgrade_to_Yesod_1.4__63___https:__47____47__github.com__47__NixOS__47__nixpkgs__47__pull__47__4391.mdwn +++ b/doc/bugs/Req:_Upgrade_to_Yesod_1.4__63___https:__47____47__github.com__47__NixOS__47__nixpkgs__47__pull__47__4391.mdwn @@ -19,3 +19,6 @@ Latest # 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]] |