Date: Thursday, March 2, 2023 @ 20:08:33
Author: felixonmars
Revision: 1407437
archrelease: copy trunk to community-staging-x86_64
Added:
haskell-ci/repos/community-staging-x86_64/PKGBUILD
(from rev 1407436, haskell-ci/trunk/PKGBUILD)
haskell-ci/repos/community-staging-x86_64/haskell-ci-aeson-2.patch
(from rev 1407436, haskell-ci/trunk/haskell-ci-aeson-2.patch)
Deleted:
haskell-ci/repos/community-staging-x86_64/PKGBUILD
haskell-ci/repos/community-staging-x86_64/haskell-ci-aeson-2.patch
--------------------------+
PKGBUILD | 108 ++++++++++++++++++++--------------------
haskell-ci-aeson-2.patch | 120 ++++++++++++++++++++++-----------------------
2 files changed, 114 insertions(+), 114 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-02 20:08:24 UTC (rev 1407436)
+++ PKGBUILD 2023-03-02 20:08:33 UTC (rev 1407437)
@@ -1,54 +0,0 @@
-# Maintainer: Felix Yan <[email protected]>
-# Maintainer: Caleb Maclennan <[email protected]>
-
-_hkgname=haskell-ci
-pkgname=haskell-ci
-pkgver=0.12.1
-pkgrel=402
-pkgdesc="Cabal package script generator for Travis-CI"
-url="https://haskell-ci.rtfd.org/";
-license=("GPL")
-arch=('x86_64')
-depends=('ghc-libs' 'haskell-aeson' 'haskell-attoparsec' 'haskell-base-compat'
- 'haskell-base16-bytestring' 'haskell-cabal-install-parsers'
'haskell-cryptohash-sha256'
- 'haskell-generic-lens-lite' 'haskell-hsyaml'
'haskell-indexed-traversable'
- 'haskell-indexed-traversable-instances' 'haskell-ini'
'haskell-lattices'
- 'haskell-network-uri' 'haskell-optparse-applicative' 'shellcheck'
'haskell-temporary'
- 'haskell-unordered-containers' 'haskell-zinza')
-makedepends=('ghc' 'uusi' 'haskell-diff' 'haskell-ansi-terminal'
'haskell-tasty' 'haskell-tasty-golden')
-source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz";
- haskell-ci-aeson-2.patch)
-sha512sums=('d93a6b8e880255469b34b568320659802252379f0c5486ed315b366fd07dae935a480047468912bc5a397b9e55b00ea964451790f963d05b8df1d426d871da1c'
-
'6f96010eec7add9740b5c760c76a9dad01e391ebd503c52c93b0126fee7d48e29e3ffd30c387908b0341ebaf20b34caafbd2d291b2f5e0a22b086f0402784497')
-
-prepare(){
- cd $_hkgname-$pkgver
- patch -p1 -i ../haskell-ci-aeson-2.patch
- uusi -u aeson -u attoparsec -u base-compat -u lattices -u
optparse-applicative -u ShellCheck $_hkgname.cabal
-}
-
-build() {
- cd $_hkgname-$pkgver
-
- runhaskell Setup configure -O --enable-shared --enable-executable-dynamic
--disable-library-vanilla \
- --prefix=/usr --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
--enable-tests \
- --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
--ghc-option=-fllvm \
- --ghc-option=-optl-Wl\,-z\,relro\,-z\,now \
- --ghc-option='-pie'
-
- runhaskell Setup build $MAKEFLAGS
- 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 $_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-ci/repos/community-staging-x86_64/PKGBUILD (from rev 1407436,
haskell-ci/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-02 20:08:33 UTC (rev 1407437)
@@ -0,0 +1,54 @@
+# Maintainer: Felix Yan <[email protected]>
+# Maintainer: Caleb Maclennan <[email protected]>
+
+_hkgname=haskell-ci
+pkgname=haskell-ci
+pkgver=0.12.1
+pkgrel=403
+pkgdesc="Cabal package script generator for Travis-CI"
+url="https://haskell-ci.rtfd.org/";
+license=("GPL")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-aeson' 'haskell-attoparsec' 'haskell-base-compat'
+ 'haskell-base16-bytestring' 'haskell-cabal-install-parsers'
'haskell-cryptohash-sha256'
+ 'haskell-generic-lens-lite' 'haskell-hsyaml'
'haskell-indexed-traversable'
+ 'haskell-indexed-traversable-instances' 'haskell-ini'
'haskell-lattices'
+ 'haskell-network-uri' 'haskell-optparse-applicative' 'shellcheck'
'haskell-temporary'
+ 'haskell-unordered-containers' 'haskell-zinza')
+makedepends=('ghc' 'uusi' 'haskell-diff' 'haskell-ansi-terminal'
'haskell-tasty' 'haskell-tasty-golden')
+source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz";
+ haskell-ci-aeson-2.patch)
+sha512sums=('d93a6b8e880255469b34b568320659802252379f0c5486ed315b366fd07dae935a480047468912bc5a397b9e55b00ea964451790f963d05b8df1d426d871da1c'
+
'6f96010eec7add9740b5c760c76a9dad01e391ebd503c52c93b0126fee7d48e29e3ffd30c387908b0341ebaf20b34caafbd2d291b2f5e0a22b086f0402784497')
+
+prepare(){
+ cd $_hkgname-$pkgver
+ patch -p1 -i ../haskell-ci-aeson-2.patch
+ uusi -u aeson -u attoparsec -u base-compat -u lattices -u
optparse-applicative -u ShellCheck $_hkgname.cabal
+}
+
+build() {
+ cd $_hkgname-$pkgver
+
+ runhaskell Setup configure -O --enable-shared --enable-executable-dynamic
--disable-library-vanilla \
+ --prefix=/usr --docdir=/usr/share/doc/$pkgname --datasubdir=$pkgname
--enable-tests \
+ --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
--ghc-option=-fllvm \
+ --ghc-option=-optl-Wl\,-z\,relro\,-z\,now \
+ --ghc-option='-pie'
+
+ runhaskell Setup build $MAKEFLAGS
+ 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 $_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: haskell-ci-aeson-2.patch
===================================================================
--- haskell-ci-aeson-2.patch 2023-03-02 20:08:24 UTC (rev 1407436)
+++ haskell-ci-aeson-2.patch 2023-03-02 20:08:33 UTC (rev 1407437)
@@ -1,60 +0,0 @@
-From c88e67e675bc4a990da53863c7fb42e67bcf9847 Mon Sep 17 00:00:00 2001
-From: Julian Ospald <[email protected]>
-Date: Sun, 10 Oct 2021 00:46:36 +0200
-Subject: [PATCH] cabal-install-parsers: Allow to build with aeson >=2 (#546)
-
-* Allow to build with aeson >=2
-* Allow to build haskell-ci with aeson >=2 as well
----
- cabal-install-parsers/cabal-install-parsers.cabal | 2 +-
- haskell-ci.cabal | 2 +-
- src/HaskellCI/YamlSyntax.hs | 10 ++++++++++
- 3 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/haskell-ci.cabal b/haskell-ci.cabal
-index 670e0da9..3b99150f 100644
---- a/haskell-ci.cabal
-+++ b/haskell-ci.cabal
-@@ -153,7 +153,7 @@ library haskell-ci-internal
-
- -- other dependencies
- build-depends:
-- , aeson ^>=1.5.6.0
-+ , aeson ^>=1.5.6.0 || ^>=2.0.0.0
- , attoparsec ^>=0.13.2.4
- , base-compat ^>=0.11
- , base16-bytestring ^>=1.0.1.0
-diff --git a/src/HaskellCI/YamlSyntax.hs b/src/HaskellCI/YamlSyntax.hs
-index 47634056..1c98f835 100644
---- a/src/HaskellCI/YamlSyntax.hs
-+++ b/src/HaskellCI/YamlSyntax.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- {-# LANGUAGE DeriveFoldable #-}
- {-# LANGUAGE DeriveFunctor #-}
- {-# LANGUAGE DeriveTraversable #-}
-@@ -24,7 +25,12 @@ import Data.Monoid (Endo (..))
-
- import qualified Data.Aeson as Aeson
- import qualified Data.Aeson.Encoding as AE
-+#if MIN_VERSION_aeson(2,0,0)
-+import qualified Data.Aeson.Key as AK
-+import qualified Data.Aeson.KeyMap as AKM
-+#else
- import qualified Data.HashMap.Strict as HM
-+#endif
- import qualified Data.List.NonEmpty as NE
- import qualified Data.Map.Strict as M
- import qualified Data.Text as T
-@@ -340,7 +346,11 @@ encodeValue = TL.unpack . TLE.decodeUtf8 .
AE.encodingToLazyByteString . enc whe
- enc (Aeson.Array v) = AE.list enc (toList v)
- enc (Aeson.Object m) = AE.dict AE.text enc M.foldrWithKey (toMap m)
-
-+#if MIN_VERSION_aeson(2,0,0)
-+ toMap = M.fromList . fmap (\(k, v) -> (AK.toText k, v)) . AKM.toList
-+#else
- toMap = M.fromList . HM.toList
-+#endif
-
- -- a 'Line' is comments before in and actual text after!
- data Line = Line [String] ShowS
Copied: haskell-ci/repos/community-staging-x86_64/haskell-ci-aeson-2.patch
(from rev 1407436, haskell-ci/trunk/haskell-ci-aeson-2.patch)
===================================================================
--- haskell-ci-aeson-2.patch (rev 0)
+++ haskell-ci-aeson-2.patch 2023-03-02 20:08:33 UTC (rev 1407437)
@@ -0,0 +1,60 @@
+From c88e67e675bc4a990da53863c7fb42e67bcf9847 Mon Sep 17 00:00:00 2001
+From: Julian Ospald <[email protected]>
+Date: Sun, 10 Oct 2021 00:46:36 +0200
+Subject: [PATCH] cabal-install-parsers: Allow to build with aeson >=2 (#546)
+
+* Allow to build with aeson >=2
+* Allow to build haskell-ci with aeson >=2 as well
+---
+ cabal-install-parsers/cabal-install-parsers.cabal | 2 +-
+ haskell-ci.cabal | 2 +-
+ src/HaskellCI/YamlSyntax.hs | 10 ++++++++++
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/haskell-ci.cabal b/haskell-ci.cabal
+index 670e0da9..3b99150f 100644
+--- a/haskell-ci.cabal
++++ b/haskell-ci.cabal
+@@ -153,7 +153,7 @@ library haskell-ci-internal
+
+ -- other dependencies
+ build-depends:
+- , aeson ^>=1.5.6.0
++ , aeson ^>=1.5.6.0 || ^>=2.0.0.0
+ , attoparsec ^>=0.13.2.4
+ , base-compat ^>=0.11
+ , base16-bytestring ^>=1.0.1.0
+diff --git a/src/HaskellCI/YamlSyntax.hs b/src/HaskellCI/YamlSyntax.hs
+index 47634056..1c98f835 100644
+--- a/src/HaskellCI/YamlSyntax.hs
++++ b/src/HaskellCI/YamlSyntax.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ {-# LANGUAGE DeriveFoldable #-}
+ {-# LANGUAGE DeriveFunctor #-}
+ {-# LANGUAGE DeriveTraversable #-}
+@@ -24,7 +25,12 @@ import Data.Monoid (Endo (..))
+
+ import qualified Data.Aeson as Aeson
+ import qualified Data.Aeson.Encoding as AE
++#if MIN_VERSION_aeson(2,0,0)
++import qualified Data.Aeson.Key as AK
++import qualified Data.Aeson.KeyMap as AKM
++#else
+ import qualified Data.HashMap.Strict as HM
++#endif
+ import qualified Data.List.NonEmpty as NE
+ import qualified Data.Map.Strict as M
+ import qualified Data.Text as T
+@@ -340,7 +346,11 @@ encodeValue = TL.unpack . TLE.decodeUtf8 .
AE.encodingToLazyByteString . enc whe
+ enc (Aeson.Array v) = AE.list enc (toList v)
+ enc (Aeson.Object m) = AE.dict AE.text enc M.foldrWithKey (toMap m)
+
++#if MIN_VERSION_aeson(2,0,0)
++ toMap = M.fromList . fmap (\(k, v) -> (AK.toText k, v)) . AKM.toList
++#else
+ toMap = M.fromList . HM.toList
++#endif
+
+ -- a 'Line' is comments before in and actual text after!
+ data Line = Line [String] ShowS
