[arch-commits] Commit in stylish-haskell/trunk (PKGBUILD hse-1.18.patch)
Felix Yan
felixonmars at archlinux.org
Tue Jul 26 14:05:59 UTC 2016
Date: Tuesday, July 26, 2016 @ 14:05:59
Author: felixonmars
Revision: 184355
upgpkg: stylish-haskell 0.6.1.0-2
rebuild with blaze-html-0.8.1.2, blaze-markup-0.7.1.0, haskell-src-exts-1.18.0, hlint-1.9.36, hoogle-5.0.2, http-api-data-0.2.4, path-0.5.9, psqueues-0.2.2.2, tagged-0.8.5, texmath-0.8.6.5, websockets-0.9.7.0
Added:
stylish-haskell/trunk/hse-1.18.patch
Modified:
stylish-haskell/trunk/PKGBUILD
----------------+
PKGBUILD | 13 ++-
hse-1.18.patch | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 209 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-07-26 14:04:41 UTC (rev 184354)
+++ PKGBUILD 2016-07-26 14:05:59 UTC (rev 184355)
@@ -4,7 +4,7 @@
pkgname=stylish-haskell
pkgver=0.6.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="Haskell code prettifier"
url="https://github.com/jaspervdj/stylish-haskell"
license=("custom:BSD3")
@@ -12,9 +12,16 @@
depends=('gmp' 'libffi')
makedepends=("ghc=8.0.1" "haskell-aeson" "haskell-src-exts" "haskell-mtl"
"haskell-optparse-applicative" "haskell-strict" "haskell-syb" "haskell-yaml")
-source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('eef85fe3940779e092c3a3ffa26c17ae6c96625a5fa606f0c816a37fce357b0d')
+source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ hse-1.18.patch)
+sha256sums=('eef85fe3940779e092c3a3ffa26c17ae6c96625a5fa606f0c816a37fce357b0d'
+ '97d15de9eb0d2848bc5f95bb84080c06e46344452ccf259f8157a13d0b21e15a')
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../hse-1.18.patch
+}
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
Added: hse-1.18.patch
===================================================================
--- hse-1.18.patch (rev 0)
+++ hse-1.18.patch 2016-07-26 14:05:59 UTC (rev 184355)
@@ -0,0 +1,199 @@
+From 4ae140e8ad22bd0c51768d82550e625b3d9ef681 Mon Sep 17 00:00:00 2001
+From: Oleg Grenrus <oleg.grenrus at iki.fi>
+Date: Mon, 25 Jul 2016 16:02:56 +0300
+Subject: [PATCH] Port to haskell-src-exts-1.18
+
+---
+ .travis.yml | 4 ++--
+ lib/Language/Haskell/Stylish/Align.hs | 2 +-
+ lib/Language/Haskell/Stylish/Block.hs | 6 +++---
+ lib/Language/Haskell/Stylish/Parse.hs | 4 ++--
+ lib/Language/Haskell/Stylish/Step.hs | 2 +-
+ lib/Language/Haskell/Stylish/Step/Imports.hs | 2 +-
+ lib/Language/Haskell/Stylish/Step/LanguagePragmas.hs | 10 +++++-----
+ lib/Language/Haskell/Stylish/Step/SimpleAlign.hs | 2 +-
+ lib/Language/Haskell/Stylish/Step/UnicodeSyntax.hs | 2 +-
+ lib/Language/Haskell/Stylish/Util.hs | 15 ++++++++-------
+ stack.yaml | 5 +++--
+ stylish-haskell.cabal | 6 +++---
+ 12 files changed, 31 insertions(+), 29 deletions(-)
+
+diff --git a/lib/Language/Haskell/Stylish/Align.hs b/lib/Language/Haskell/Stylish/Align.hs
+index c58b133..3d4a428 100644
+--- a/lib/Language/Haskell/Stylish/Align.hs
++++ b/lib/Language/Haskell/Stylish/Align.hs
+@@ -9,7 +9,7 @@ module Language.Haskell.Stylish.Align
+ --------------------------------------------------------------------------------
+ import Data.Char (isSpace)
+ import Data.List (nub)
+-import qualified Language.Haskell.Exts.Annotated as H
++import qualified Language.Haskell.Exts as H
+
+
+ --------------------------------------------------------------------------------
+diff --git a/lib/Language/Haskell/Stylish/Block.hs b/lib/Language/Haskell/Stylish/Block.hs
+index d4cca7d..46111ee 100644
+--- a/lib/Language/Haskell/Stylish/Block.hs
++++ b/lib/Language/Haskell/Stylish/Block.hs
+@@ -15,9 +15,9 @@ module Language.Haskell.Stylish.Block
+
+
+ --------------------------------------------------------------------------------
+-import Control.Arrow (arr, (&&&), (>>>))
+-import qualified Data.IntSet as IS
+-import qualified Language.Haskell.Exts.Annotated as H
++import Control.Arrow (arr, (&&&), (>>>))
++import qualified Data.IntSet as IS
++import qualified Language.Haskell.Exts as H
+
+
+ --------------------------------------------------------------------------------
+diff --git a/lib/Language/Haskell/Stylish/Parse.hs b/lib/Language/Haskell/Stylish/Parse.hs
+index 2b16b30..48f32a6 100644
+--- a/lib/Language/Haskell/Stylish/Parse.hs
++++ b/lib/Language/Haskell/Stylish/Parse.hs
+@@ -5,9 +5,9 @@ module Language.Haskell.Stylish.Parse
+
+
+ --------------------------------------------------------------------------------
++import Data.List (isPrefixOf, nub)
+ import Data.Maybe (fromMaybe, listToMaybe)
+-import qualified Language.Haskell.Exts.Annotated as H
+-import Data.List (isPrefixOf, nub)
++import qualified Language.Haskell.Exts as H
+
+ --------------------------------------------------------------------------------
+ import Language.Haskell.Stylish.Config
+diff --git a/lib/Language/Haskell/Stylish/Step.hs b/lib/Language/Haskell/Stylish/Step.hs
+index f053f8b..e5f3424 100644
+--- a/lib/Language/Haskell/Stylish/Step.hs
++++ b/lib/Language/Haskell/Stylish/Step.hs
+@@ -8,7 +8,7 @@ module Language.Haskell.Stylish.Step
+
+
+ --------------------------------------------------------------------------------
+-import qualified Language.Haskell.Exts.Annotated as H
++import qualified Language.Haskell.Exts as H
+
+
+ --------------------------------------------------------------------------------
+diff --git a/lib/Language/Haskell/Stylish/Step/Imports.hs b/lib/Language/Haskell/Stylish/Step/Imports.hs
+index 82ba96f..246da6f 100644
+--- a/lib/Language/Haskell/Stylish/Step/Imports.hs
++++ b/lib/Language/Haskell/Stylish/Step/Imports.hs
+@@ -15,7 +15,7 @@ import Data.Char (toLower)
+ import Data.List (intercalate, sortBy)
+ import Data.Maybe (isJust, maybeToList)
+ import Data.Ord (comparing)
+-import qualified Language.Haskell.Exts.Annotated as H
++import qualified Language.Haskell.Exts as H
+
+
+ --------------------------------------------------------------------------------
+diff --git a/lib/Language/Haskell/Stylish/Step/LanguagePragmas.hs b/lib/Language/Haskell/Stylish/Step/LanguagePragmas.hs
+index 0239736..c63d90a 100644
+--- a/lib/Language/Haskell/Stylish/Step/LanguagePragmas.hs
++++ b/lib/Language/Haskell/Stylish/Step/LanguagePragmas.hs
+@@ -10,14 +10,14 @@ module Language.Haskell.Stylish.Step.LanguagePragmas
+
+ --------------------------------------------------------------------------------
+ import qualified Data.Set as S
+-import qualified Language.Haskell.Exts.Annotated as H
++import qualified Language.Haskell.Exts as H
+
+
+ --------------------------------------------------------------------------------
+-import Language.Haskell.Stylish.Block
+-import Language.Haskell.Stylish.Editor
+-import Language.Haskell.Stylish.Step
+-import Language.Haskell.Stylish.Util
++import Language.Haskell.Stylish.Block
++import Language.Haskell.Stylish.Editor
++import Language.Haskell.Stylish.Step
++import Language.Haskell.Stylish.Util
+
+
+ --------------------------------------------------------------------------------
+diff --git a/lib/Language/Haskell/Stylish/Step/SimpleAlign.hs b/lib/Language/Haskell/Stylish/Step/SimpleAlign.hs
+index c89e8a1..c83c482 100644
+--- a/lib/Language/Haskell/Stylish/Step/SimpleAlign.hs
++++ b/lib/Language/Haskell/Stylish/Step/SimpleAlign.hs
+@@ -9,7 +9,7 @@ module Language.Haskell.Stylish.Step.SimpleAlign
+ --------------------------------------------------------------------------------
+ import Data.Data (Data)
+ import Data.Maybe (maybeToList)
+-import qualified Language.Haskell.Exts.Annotated as H
++import qualified Language.Haskell.Exts as H
+
+
+ --------------------------------------------------------------------------------
+diff --git a/lib/Language/Haskell/Stylish/Step/UnicodeSyntax.hs b/lib/Language/Haskell/Stylish/Step/UnicodeSyntax.hs
+index 0a4438a..4297129 100644
+--- a/lib/Language/Haskell/Stylish/Step/UnicodeSyntax.hs
++++ b/lib/Language/Haskell/Stylish/Step/UnicodeSyntax.hs
+@@ -9,7 +9,7 @@ import Data.List (isPrefixOf, sort)
+ import Data.Map (Map)
+ import qualified Data.Map as M
+ import Data.Maybe (maybeToList)
+-import qualified Language.Haskell.Exts.Annotated as H
++import qualified Language.Haskell.Exts as H
+
+
+ --------------------------------------------------------------------------------
+diff --git a/lib/Language/Haskell/Stylish/Util.hs b/lib/Language/Haskell/Stylish/Util.hs
+index ed5de91..0e62212 100644
+--- a/lib/Language/Haskell/Stylish/Util.hs
++++ b/lib/Language/Haskell/Stylish/Util.hs
+@@ -17,13 +17,14 @@ module Language.Haskell.Stylish.Util
+
+
+ --------------------------------------------------------------------------------
+-import Control.Arrow ((&&&), (>>>))
+-import Data.Char (isAlpha)
+-import Data.Data (Data)
+-import qualified Data.Generics as G
+-import Data.Maybe (fromMaybe, listToMaybe, maybeToList)
+-import Data.Typeable (cast)
+-import qualified Language.Haskell.Exts.Annotated as H
++import Control.Arrow ((&&&), (>>>))
++import Data.Char (isAlpha)
++import Data.Data (Data)
++import qualified Data.Generics as G
++import Data.Maybe (fromMaybe, listToMaybe,
++ maybeToList)
++import Data.Typeable (cast)
++import qualified Language.Haskell.Exts as H
+
+
+ --------------------------------------------------------------------------------
+diff --git a/stylish-haskell.cabal b/stylish-haskell.cabal
+index 2c4ee95..419e408 100644
+--- a/stylish-haskell.cabal
++++ b/stylish-haskell.cabal
+@@ -53,7 +53,7 @@ Library
+ containers >= 0.3 && < 0.6,
+ directory >= 1.1 && < 1.3,
+ filepath >= 1.1 && < 1.5,
+- haskell-src-exts >= 1.17 && < 1.18,
++ haskell-src-exts >= 1.18 && < 1.19,
+ mtl >= 2.0 && < 2.3,
+ syb >= 0.3 && < 0.7,
+ yaml >= 0.7 && < 0.9
+@@ -74,7 +74,7 @@ Executable stylish-haskell
+ containers >= 0.3 && < 0.6,
+ directory >= 1.1 && < 1.3,
+ filepath >= 1.1 && < 1.5,
+- haskell-src-exts >= 1.17 && < 1.18,
++ haskell-src-exts >= 1.18 && < 1.19,
+ mtl >= 2.0 && < 2.3,
+ syb >= 0.3 && < 0.7,
+ yaml >= 0.7 && < 0.9
+@@ -120,7 +120,7 @@ Test-suite stylish-haskell-tests
+ containers >= 0.3 && < 0.6,
+ directory >= 1.1 && < 1.3,
+ filepath >= 1.1 && < 1.5,
+- haskell-src-exts >= 1.17 && < 1.18,
++ haskell-src-exts >= 1.18 && < 1.19,
+ mtl >= 2.0 && < 2.3,
+ syb >= 0.3 && < 0.7,
+ yaml >= 0.7 && < 0.9
More information about the arch-commits
mailing list