From 164f0d73ffbad2d0bb15cc7c6dae6a5e6a8ac288 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 9 Oct 2014 16:56:20 -0400 Subject: [PATCH] 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. --- Assistant/Threads/WebApp.hs | 1 + Assistant/WebApp/Types.hs | 2 +- debian/changelog | 1 + ...github.com__47__NixOS__47__nixpkgs__47__pull__47__4391.mdwn | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs index b22b54a8d8..2247037774 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/Assistant/WebApp/Types.hs b/Assistant/WebApp/Types.hs index 974ec28ac3..1dbc146b0f 100644 --- a/Assistant/WebApp/Types.hs +++ b/Assistant/WebApp/Types.hs @@ -7,7 +7,7 @@ {-# LANGUAGE TypeFamilies, QuasiQuotes, MultiParamTypeClasses #-} {-# LANGUAGE TemplateHaskell, OverloadedStrings, RankNTypes #-} -{-# LANGUAGE FlexibleInstances, FlexibleContexts #-} +{-# LANGUAGE FlexibleInstances, FlexibleContexts, ViewPatterns #-} {-# LANGUAGE CPP #-} {-# OPTIONS_GHC -fno-warn-orphans #-} diff --git a/debian/changelog b/debian/changelog index 79e56d9496..75c8303ee3 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 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 f5f6498653..6e01172027 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]]