[arch-commits] Commit in haskell-configurator-ng/repos/community-staging-x86_64 (4 files)
Felix Yan
felixonmars at archlinux.org
Mon May 21 09:34:58 UTC 2018
Date: Monday, May 21, 2018 @ 09:34:57
Author: felixonmars
Revision: 325975
archrelease: copy trunk to community-staging-x86_64
Added:
haskell-configurator-ng/repos/community-staging-x86_64/PKGBUILD
(from rev 325974, haskell-configurator-ng/trunk/PKGBUILD)
haskell-configurator-ng/repos/community-staging-x86_64/ghc-8.4.patch
(from rev 325974, haskell-configurator-ng/trunk/ghc-8.4.patch)
Deleted:
haskell-configurator-ng/repos/community-staging-x86_64/PKGBUILD
haskell-configurator-ng/repos/community-staging-x86_64/ghc-8.4.patch
---------------+
PKGBUILD | 102 ++++++++++++++++++++++++++++----------------------------
ghc-8.4.patch | 52 ++++++++++++++--------------
2 files changed, 77 insertions(+), 77 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-21 09:34:36 UTC (rev 325974)
+++ PKGBUILD 2018-05-21 09:34:57 UTC (rev 325975)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-
-_hkgname=configurator-ng
-pkgname=haskell-configurator-ng
-pkgver=0.0.0.1
-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-unix-compat"
- "haskell-unordered-containers")
-makedepends=('ghc')
-source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
- ghc-8.4.patch)
-sha512sums=('7995be233ab367e807a66c6f0f412826dc6c916a895c5e145d5b21af2f867a0c69c6bd228e7d5425a69ea9b500ed51fb00025ca9090417aaee4ac1a027f2f77a'
- 'c0f0ed7bc5e61794e66950792c8664c84f78b664b15c91e7a8c7d4d547229500e04a2975c4a68908167ab6e636b6db87fd4f6e6af4730bfe3c24a60b22ddc129')
-
-prepare() {
- cd $_hkgname-$pkgver
- patch -p1 -i ../ghc-8.4.patch
-
- sed -i '/fail/d' $_hkgname.cabal
-}
-
-build() {
- cd "${srcdir}/${_hkgname}-${pkgver}"
-
- runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
- --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
- --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
- -f-developer
- runhaskell Setup build
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- cd "${srcdir}/${_hkgname}-${pkgver}"
-
- install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
- install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
- runhaskell Setup copy --destdir="${pkgdir}"
- install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
-}
Copied: haskell-configurator-ng/repos/community-staging-x86_64/PKGBUILD (from rev 325974, haskell-configurator-ng/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-05-21 09:34:57 UTC (rev 325975)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=configurator-ng
+pkgname=haskell-configurator-ng
+pkgver=0.0.0.1
+pkgrel=28
+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-unix-compat"
+ "haskell-unordered-containers")
+makedepends=('ghc')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+ ghc-8.4.patch)
+sha512sums=('7995be233ab367e807a66c6f0f412826dc6c916a895c5e145d5b21af2f867a0c69c6bd228e7d5425a69ea9b500ed51fb00025ca9090417aaee4ac1a027f2f77a'
+ 'c0f0ed7bc5e61794e66950792c8664c84f78b664b15c91e7a8c7d4d547229500e04a2975c4a68908167ab6e636b6db87fd4f6e6af4730bfe3c24a60b22ddc129')
+
+prepare() {
+ cd $_hkgname-$pkgver
+ patch -p1 -i ../ghc-8.4.patch
+
+ sed -i '/fail/d' $_hkgname.cabal
+}
+
+build() {
+ cd "${srcdir}/${_hkgname}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+ --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
+ -f-developer
+ runhaskell Setup build
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+ cd "${srcdir}/${_hkgname}-${pkgver}"
+
+ install -D -m744 register.sh "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+ install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}
Deleted: ghc-8.4.patch
===================================================================
--- ghc-8.4.patch 2018-05-21 09:34:36 UTC (rev 325974)
+++ ghc-8.4.patch 2018-05-21 09:34:57 UTC (rev 325975)
@@ -1,26 +0,0 @@
-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
Copied: haskell-configurator-ng/repos/community-staging-x86_64/ghc-8.4.patch (from rev 325974, haskell-configurator-ng/trunk/ghc-8.4.patch)
===================================================================
--- ghc-8.4.patch (rev 0)
+++ ghc-8.4.patch 2018-05-21 09:34:57 UTC (rev 325975)
@@ -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
More information about the arch-commits
mailing list