[arch-commits] Commit in haskell-configurator-ng/trunk (PKGBUILD ghc-8.4.patch)

[Felix Yan]

    Date: Friday, May 18, 2018 @ 05:55:11
  Author: felixonmars
Revision: 324176

upgpkg: haskell-configurator-ng 0.0.0.1-27

rebuild with ghc 8.4.2

Added:
  haskell-configurator-ng/trunk/ghc-8.4.patch
Modified:
  haskell-configurator-ng/trunk/PKGBUILD

---------------+
 PKGBUILD      |   15 ++++++++++-----
 ghc-8.4.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-18 05:53:56 UTC (rev 324175)
+++ PKGBUILD	2018-05-18 05:55:11 UTC (rev 324176)
@@ -5,20 +5,25 @@
 _hkgname=configurator-ng
 pkgname=haskell-configurator-ng
 pkgver=0.0.0.1
-pkgrel=26
+pkgrel=27
 pkgdesc="The next generation of configuration management"
 url="https://github.com/lpsmith/configurator-ng"
 license=("custom:BSD3")
 arch=('x86_64')
 depends=('ghc-libs' "haskell-attoparsec" "haskell-critbit" "haskell-dlist" "haskell-data-ordlist"
-         "haskell-hashable" "haskell-scientific" "haskell-text" "haskell-unix-compat"
+         "haskell-hashable" "haskell-scientific" "haskell-unix-compat"
          "haskell-unordered-containers")
 makedepends=('ghc')
-source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-sha512sums=('7995be233ab367e807a66c6f0f412826dc6c916a895c5e145d5b21af2f867a0c69c6bd228e7d5425a69ea9b500ed51fb00025ca9090417aaee4ac1a027f2f77a')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+        ghc-8.4.patch)
+sha512sums=('7995be233ab367e807a66c6f0f412826dc6c916a895c5e145d5b21af2f867a0c69c6bd228e7d5425a69ea9b500ed51fb00025ca9090417aaee4ac1a027f2f77a'
+            'c0f0ed7bc5e61794e66950792c8664c84f78b664b15c91e7a8c7d4d547229500e04a2975c4a68908167ab6e636b6db87fd4f6e6af4730bfe3c24a60b22ddc129')
 
 prepare() {
-    sed -i '/fail/d' ${_hkgname}-$pkgver/$_hkgname.cabal
+    cd $_hkgname-$pkgver
+    patch -p1 -i ../ghc-8.4.patch
+
+    sed -i '/fail/d' $_hkgname.cabal
 }
 
 build() {

Added: ghc-8.4.patch
===================================================================
--- ghc-8.4.patch	                        (rev 0)
+++ ghc-8.4.patch	2018-05-18 05:55:11 UTC (rev 324176)
@@ -0,0 +1,26 @@
+diff --git a/Data/Configurator/Parser/Implementation.hs.orig b/Data/Configurator/Parser/Implementation.hs
+index 3b3c82a..be9080f 100644
+--- a/Data/Configurator/Parser/Implementation.hs.orig
++++ b/Data/Configurator/Parser/Implementation.hs
+@@ -152,9 +152,8 @@ newtype ConfigTransform = ConfigTransform (ConfigPlan ())
+ 
+ -- | 'mempty' is the identity 'ConfigTransform',  'mappend' is the composition
+ --   of two 'ConfigTransform's.
+-instance Monoid ConfigTransform where
+-   mempty = ConfigTransform (ConfigPlan ())
+-   (ConfigTransform x) `mappend` (ConfigTransform y) = (ConfigTransform (go x))
++instance Semigroup ConfigTransform where
++  ConfigTransform x <> ConfigTransform y = ConfigTransform (go x)
+      where
+        go (ConfigPlan _)      = y
+        go (Union a b)         = Union (go a) (go b)
+@@ -162,6 +161,9 @@ instance Monoid ConfigTransform where
+        go (Subconfig pre a)   = Subconfig pre (go a)
+        go Empty               = Empty
+ 
++instance Monoid ConfigTransform where
++   mempty = ConfigTransform (ConfigPlan ())
++
+ -- | Conceptually,  @'union' f g = \\config -> union\' (f config) (g config)@,
+ -- where @union\'@ is the left-biased union of two 'Config's.
+ union :: ConfigTransform -> ConfigTransform -> ConfigTransform