Date: Friday, May 27, 2022 @ 02:42:47 Author: felixonmars Revision: 1210747
archrelease: copy trunk to community-x86_64 Added: haskell-spdx/repos/community-x86_64/PKGBUILD (from rev 1210746, haskell-spdx/trunk/PKGBUILD) haskell-spdx/repos/community-x86_64/cabal-3.4.patch (from rev 1210746, haskell-spdx/trunk/cabal-3.4.patch) Deleted: haskell-spdx/repos/community-x86_64/PKGBUILD haskell-spdx/repos/community-x86_64/cabal-3.4.patch -----------------+ PKGBUILD | 86 +++++++++++++++++++++++++++--------------------------- cabal-3.4.patch | 76 +++++++++++++++++++++++------------------------ 2 files changed, 81 insertions(+), 81 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-05-27 02:12:43 UTC (rev 1210746) +++ PKGBUILD 2022-05-27 02:42:47 UTC (rev 1210747) @@ -1,43 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Arch Haskell Team <arch-hask...@haskell.org> - -_hkgname=spdx -pkgname=haskell-spdx -pkgver=1.0.0.3 -pkgrel=1 -pkgdesc="SPDX license expression language, Extras" -url="https://github.com/phadej/spdx" -license=("BSD") -arch=('x86_64') -depends=('ghc-libs') -makedepends=('ghc' 'haskell-base-compat' 'haskell-tasty' 'haskell-tasty-quickcheck') -source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -sha512sums=('16c7e3126d77b9284fc3ef27dd94e551cae5496595df32b47e08722ff03288766770a0ef17a69f0a70ebdead08c54cb385471351c8a33b60a3578fe2303c19ac') - -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 - 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 -} - -check() { - cd $_hkgname-$pkgver - runhaskell Setup test --show-details=direct -} - -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-spdx/repos/community-x86_64/PKGBUILD (from rev 1210746, haskell-spdx/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-05-27 02:42:47 UTC (rev 1210747) @@ -0,0 +1,43 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Arch Haskell Team <arch-hask...@haskell.org> + +_hkgname=spdx +pkgname=haskell-spdx +pkgver=1.0.0.3 +pkgrel=1 +pkgdesc="SPDX license expression language, Extras" +url="https://github.com/phadej/spdx" +license=("BSD") +arch=('x86_64') +depends=('ghc-libs') +makedepends=('ghc' 'haskell-base-compat' 'haskell-tasty' 'haskell-tasty-quickcheck') +source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") +sha512sums=('16c7e3126d77b9284fc3ef27dd94e551cae5496595df32b47e08722ff03288766770a0ef17a69f0a70ebdead08c54cb385471351c8a33b60a3578fe2303c19ac') + +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 + 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 +} + +check() { + cd $_hkgname-$pkgver + runhaskell Setup test --show-details=direct +} + +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: cabal-3.4.patch =================================================================== --- cabal-3.4.patch 2022-05-27 02:12:43 UTC (rev 1210746) +++ cabal-3.4.patch 2022-05-27 02:42:47 UTC (rev 1210747) @@ -1,38 +0,0 @@ -From 8afaa090a5f52a9dbde057b79ccf9739bcef8812 Mon Sep 17 00:00:00 2001 -From: Oleg Grenrus <oleg.gren...@iki.fi> -Date: Sat, 6 Feb 2021 11:55:15 +0200 -Subject: [PATCH] Allow Cabal-3.4 - ---- - spdx.cabal | 6 +++--- - tests/Generators.hs | 4 +++- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/spdx.cabal b/spdx.cabal -index a9ad636..4174b21 100644 ---- a/spdx.cabal -+++ b/spdx.cabal -@@ -49,7 +49,7 @@ library - ghc-options: -Wall - build-depends: - , base >=4.3.0.0 && <4.15 -- , Cabal ^>=2.4.0.1 || ^>=3.0.0.0 || ^>=3.2.0.0 -+ , Cabal ^>=2.4.0.1 || ^>=3.0.0.0 || ^>=3.2.0.0 || ^>=3.4.0.0 - , containers >=0.5.0.0 && <0.7 - , transformers >=0.3 && <0.6 - -diff --git a/tests/Generators.hs b/tests/Generators.hs -index 90ef406..1a048d3 100644 ---- a/tests/Generators.hs -+++ b/tests/Generators.hs -@@ -15,7 +15,9 @@ import Distribution.SPDX - import Distribution.SPDX.Extra.Internal (LatticeSyntax(..)) - - latestLicenseListVersion :: LicenseListVersion --#if MIN_VERSION_Cabal(3,0,0) -+#if MIN_VERSION_Cabal(3,4,0) -+latestLicenseListVersion = LicenseListVersion_3_9 -+#elif MIN_VERSION_Cabal(3,0,0) - latestLicenseListVersion = LicenseListVersion_3_6 - #else - latestLicenseListVersion = LicenseListVersion_3_2 Copied: haskell-spdx/repos/community-x86_64/cabal-3.4.patch (from rev 1210746, haskell-spdx/trunk/cabal-3.4.patch) =================================================================== --- cabal-3.4.patch (rev 0) +++ cabal-3.4.patch 2022-05-27 02:42:47 UTC (rev 1210747) @@ -0,0 +1,38 @@ +From 8afaa090a5f52a9dbde057b79ccf9739bcef8812 Mon Sep 17 00:00:00 2001 +From: Oleg Grenrus <oleg.gren...@iki.fi> +Date: Sat, 6 Feb 2021 11:55:15 +0200 +Subject: [PATCH] Allow Cabal-3.4 + +--- + spdx.cabal | 6 +++--- + tests/Generators.hs | 4 +++- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/spdx.cabal b/spdx.cabal +index a9ad636..4174b21 100644 +--- a/spdx.cabal ++++ b/spdx.cabal +@@ -49,7 +49,7 @@ library + ghc-options: -Wall + build-depends: + , base >=4.3.0.0 && <4.15 +- , Cabal ^>=2.4.0.1 || ^>=3.0.0.0 || ^>=3.2.0.0 ++ , Cabal ^>=2.4.0.1 || ^>=3.0.0.0 || ^>=3.2.0.0 || ^>=3.4.0.0 + , containers >=0.5.0.0 && <0.7 + , transformers >=0.3 && <0.6 + +diff --git a/tests/Generators.hs b/tests/Generators.hs +index 90ef406..1a048d3 100644 +--- a/tests/Generators.hs ++++ b/tests/Generators.hs +@@ -15,7 +15,9 @@ import Distribution.SPDX + import Distribution.SPDX.Extra.Internal (LatticeSyntax(..)) + + latestLicenseListVersion :: LicenseListVersion +-#if MIN_VERSION_Cabal(3,0,0) ++#if MIN_VERSION_Cabal(3,4,0) ++latestLicenseListVersion = LicenseListVersion_3_9 ++#elif MIN_VERSION_Cabal(3,0,0) + latestLicenseListVersion = LicenseListVersion_3_6 + #else + latestLicenseListVersion = LicenseListVersion_3_2