[arch-commits] Commit in haskell-brittany/repos (3 files)
Date: Monday, December 14, 2020 @ 03:25:35 Author: felixonmars Revision: 774782 archrelease: copy trunk to community-staging-x86_64 Added: haskell-brittany/repos/community-staging-x86_64/ haskell-brittany/repos/community-staging-x86_64/PKGBUILD (from rev 774781, haskell-brittany/trunk/PKGBUILD) haskell-brittany/repos/community-staging-x86_64/ghc-8.10.patch (from rev 774781, haskell-brittany/trunk/ghc-8.10.patch) + PKGBUILD | 59 ghc-8.10.patch | 3558 +++ 2 files changed, 3617 insertions(+) Copied: haskell-brittany/repos/community-staging-x86_64/PKGBUILD (from rev 774781, haskell-brittany/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2020-12-14 03:25:35 UTC (rev 774782) @@ -0,0 +1,59 @@ +# Maintainer: Felix Yan + +_hkgname=brittany +pkgname=haskell-brittany +pkgver=0.12.2.0 +pkgrel=6 +pkgdesc="Haskell source code formatter" +url="https://github.com/lspitzner/brittany/; +license=("AGPL") +arch=('x86_64') +depends=('ghc-libs' 'haskell-aeson' 'haskell-butcher' 'haskell-cmdargs' 'haskell-czipwith' + 'haskell-data-tree-print' 'haskell-extra' 'haskell-ghc-exactprint' 'haskell-ghc-paths' + 'haskell-monad-memo' 'haskell-multistate' 'haskell-random' 'haskell-safe' + 'haskell-strict' 'haskell-syb' 'haskell-uniplate' 'haskell-unsafe' 'haskell-yaml') +makedepends=('ghc' 'uusi' 'haskell-hspec') +source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz; +ghc-8.10.patch) +sha256sums=('f437edc73106185213abdbfdc3d34a2f449c341cebd738b51ed39d683ca4670f' +'e0b4617fe2cb67f4ab035fe0ac333d506c4acfd7451b134ec76ee1eca6ee2b64') + +prepare() { + cd $_hkgname-$pkgver + patch -p1 -i ../ghc-8.10.patch + uusi -r semigroups:Cabal -u random $_hkgname.cabal + + # Hack to use Cabal's compatibility layer of semigroups + sed -i 's/import Data.Semigroup.Generic/import Distribution.Compat.Semigroup/' src/Language/Haskell/Brittany/Internal/Config/Types.hs +} + +build() { + cd $_hkgname-$pkgver + + runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ +--prefix=/usr --docdir=/usr/share/doc/$pkgname --enable-tests \ +--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \ +--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 +} + +check() { + cd $_hkgname-$pkgver + runhaskell Setup test +} + +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 -t "$pkgdir"/usr/share/licenses/$pkgname/ + rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE +} Copied: haskell-brittany/repos/community-staging-x86_64/ghc-8.10.patch (from rev 774781, haskell-brittany/trunk/ghc-8.10.patch) === --- community-staging-x86_64/ghc-8.10.patch (rev 0) +++ community-staging-x86_64/ghc-8.10.patch 2020-12-14 03:25:35 UTC (rev 774782) @@ -0,0 +1,3558 @@ +From 17d07edb0a687053fbeb39e0bdf07415ee35a278 Mon Sep 17 00:00:00 2001 +From: jneira +Date: Wed, 13 May 2020 10:44:37 +0200 +Subject: [PATCH 02/17] Relax upper bounds to include updated packages + +--- + brittany.cabal | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/brittany.cabal b/brittany.cabal +index 818e818..590373f 100644 +--- a/brittany.cabal b/brittany.cabal +@@ -91,10 +91,10 @@ library { + -fno-warn-redundant-constraints + } + build-depends: +-{ base >=4.9 && <4.14 +-, ghc >=8.0.1 && <8.9 ++{ base >=4.9 && <4.15 ++, ghc >=8.0.1 && <8.11 + , ghc-paths >=0.1.0.9 && <0.2 +-, ghc-exactprint >=0.5.8 && <0.6.3 ++, ghc-exactprint >=0.5.8 && <0.6.4 + , transformers >=0.5.2.0 && <0.6 + , containers >=0.5.7.1 && <0.7 + , mtl >=2.2.1 && <2.3 +@@ -118,7 +118,7 @@ library { + , semigroups >=0.18.2 && <0.20 + , cmdargs >=0.10.14 && <0.11 + , czipwith >=1.0.1.0 && <1.1 +-, ghc-boot-th >=8.0.1 && <8.9 ++, ghc-boot-th >=8.0.1 && <8.11 + , filepath >=1.4.1.0 && <1.5 + , random >= 1.1 && <1.2 + } + +From b69a8f983c070564b41b6fdec160af6d8aff730b Mon Sep 17 00:00:00 2001 +From: jneira +Date: Wed, 13 May 2020 10:45:14 +0200 +Subject: [PATCH 03/17] Adapt to new GHC modules organization + +--- +
[arch-commits] Commit in haskell-brittany/repos (3 files)
Date: Wednesday, December 9, 2020 @ 09:31:42 Author: felixonmars Revision: 772368 archrelease: copy trunk to community-staging-x86_64 Added: haskell-brittany/repos/community-staging-x86_64/ haskell-brittany/repos/community-staging-x86_64/PKGBUILD (from rev 772367, haskell-brittany/trunk/PKGBUILD) haskell-brittany/repos/community-staging-x86_64/ghc-8.10.patch (from rev 772367, haskell-brittany/trunk/ghc-8.10.patch) + PKGBUILD | 59 ghc-8.10.patch | 3558 +++ 2 files changed, 3617 insertions(+) Copied: haskell-brittany/repos/community-staging-x86_64/PKGBUILD (from rev 772367, haskell-brittany/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2020-12-09 09:31:42 UTC (rev 772368) @@ -0,0 +1,59 @@ +# Maintainer: Felix Yan + +_hkgname=brittany +pkgname=haskell-brittany +pkgver=0.12.2.0 +pkgrel=5 +pkgdesc="Haskell source code formatter" +url="https://github.com/lspitzner/brittany/; +license=("AGPL") +arch=('x86_64') +depends=('ghc-libs' 'haskell-aeson' 'haskell-butcher' 'haskell-cmdargs' 'haskell-czipwith' + 'haskell-data-tree-print' 'haskell-extra' 'haskell-ghc-exactprint' 'haskell-ghc-paths' + 'haskell-monad-memo' 'haskell-multistate' 'haskell-random' 'haskell-safe' + 'haskell-strict' 'haskell-syb' 'haskell-uniplate' 'haskell-unsafe' 'haskell-yaml') +makedepends=('ghc' 'uusi' 'haskell-hspec') +source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz; +ghc-8.10.patch) +sha256sums=('f437edc73106185213abdbfdc3d34a2f449c341cebd738b51ed39d683ca4670f' +'e0b4617fe2cb67f4ab035fe0ac333d506c4acfd7451b134ec76ee1eca6ee2b64') + +prepare() { + cd $_hkgname-$pkgver + patch -p1 -i ../ghc-8.10.patch + uusi -r semigroups:Cabal -u random $_hkgname.cabal + + # Hack to use Cabal's compatibility layer of semigroups + sed -i 's/import Data.Semigroup.Generic/import Distribution.Compat.Semigroup/' src/Language/Haskell/Brittany/Internal/Config/Types.hs +} + +build() { + cd $_hkgname-$pkgver + + runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ +--prefix=/usr --docdir=/usr/share/doc/$pkgname --enable-tests \ +--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \ +--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 +} + +check() { + cd $_hkgname-$pkgver + runhaskell Setup test +} + +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 -t "$pkgdir"/usr/share/licenses/$pkgname/ + rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE +} Copied: haskell-brittany/repos/community-staging-x86_64/ghc-8.10.patch (from rev 772367, haskell-brittany/trunk/ghc-8.10.patch) === --- community-staging-x86_64/ghc-8.10.patch (rev 0) +++ community-staging-x86_64/ghc-8.10.patch 2020-12-09 09:31:42 UTC (rev 772368) @@ -0,0 +1,3558 @@ +From 17d07edb0a687053fbeb39e0bdf07415ee35a278 Mon Sep 17 00:00:00 2001 +From: jneira +Date: Wed, 13 May 2020 10:44:37 +0200 +Subject: [PATCH 02/17] Relax upper bounds to include updated packages + +--- + brittany.cabal | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/brittany.cabal b/brittany.cabal +index 818e818..590373f 100644 +--- a/brittany.cabal b/brittany.cabal +@@ -91,10 +91,10 @@ library { + -fno-warn-redundant-constraints + } + build-depends: +-{ base >=4.9 && <4.14 +-, ghc >=8.0.1 && <8.9 ++{ base >=4.9 && <4.15 ++, ghc >=8.0.1 && <8.11 + , ghc-paths >=0.1.0.9 && <0.2 +-, ghc-exactprint >=0.5.8 && <0.6.3 ++, ghc-exactprint >=0.5.8 && <0.6.4 + , transformers >=0.5.2.0 && <0.6 + , containers >=0.5.7.1 && <0.7 + , mtl >=2.2.1 && <2.3 +@@ -118,7 +118,7 @@ library { + , semigroups >=0.18.2 && <0.20 + , cmdargs >=0.10.14 && <0.11 + , czipwith >=1.0.1.0 && <1.1 +-, ghc-boot-th >=8.0.1 && <8.9 ++, ghc-boot-th >=8.0.1 && <8.11 + , filepath >=1.4.1.0 && <1.5 + , random >= 1.1 && <1.2 + } + +From b69a8f983c070564b41b6fdec160af6d8aff730b Mon Sep 17 00:00:00 2001 +From: jneira +Date: Wed, 13 May 2020 10:45:14 +0200 +Subject: [PATCH 03/17] Adapt to new GHC modules organization + +--- +
[arch-commits] Commit in haskell-brittany/repos (3 files)
Date: Tuesday, December 8, 2020 @ 18:25:23 Author: felixonmars Revision: 771973 archrelease: copy trunk to community-staging-x86_64 Added: haskell-brittany/repos/community-staging-x86_64/ haskell-brittany/repos/community-staging-x86_64/PKGBUILD (from rev 771972, haskell-brittany/trunk/PKGBUILD) haskell-brittany/repos/community-staging-x86_64/ghc-8.10.patch (from rev 771972, haskell-brittany/trunk/ghc-8.10.patch) + PKGBUILD | 59 ghc-8.10.patch | 3558 +++ 2 files changed, 3617 insertions(+) Copied: haskell-brittany/repos/community-staging-x86_64/PKGBUILD (from rev 771972, haskell-brittany/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2020-12-08 18:25:23 UTC (rev 771973) @@ -0,0 +1,59 @@ +# Maintainer: Felix Yan + +_hkgname=brittany +pkgname=haskell-brittany +pkgver=0.12.2.0 +pkgrel=4 +pkgdesc="Haskell source code formatter" +url="https://github.com/lspitzner/brittany/; +license=("AGPL") +arch=('x86_64') +depends=('ghc-libs' 'haskell-aeson' 'haskell-butcher' 'haskell-cmdargs' 'haskell-czipwith' + 'haskell-data-tree-print' 'haskell-extra' 'haskell-ghc-exactprint' 'haskell-ghc-paths' + 'haskell-monad-memo' 'haskell-multistate' 'haskell-random' 'haskell-safe' + 'haskell-strict' 'haskell-syb' 'haskell-uniplate' 'haskell-unsafe' 'haskell-yaml') +makedepends=('ghc' 'uusi' 'haskell-hspec') +source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz; +ghc-8.10.patch) +sha256sums=('f437edc73106185213abdbfdc3d34a2f449c341cebd738b51ed39d683ca4670f' +'e0b4617fe2cb67f4ab035fe0ac333d506c4acfd7451b134ec76ee1eca6ee2b64') + +prepare() { + cd $_hkgname-$pkgver + patch -p1 -i ../ghc-8.10.patch + uusi -r semigroups:Cabal -u random $_hkgname.cabal + + # Hack to use Cabal's compatibility layer of semigroups + sed -i 's/import Data.Semigroup.Generic/import Distribution.Compat.Semigroup/' src/Language/Haskell/Brittany/Internal/Config/Types.hs +} + +build() { + cd $_hkgname-$pkgver + + runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ +--prefix=/usr --docdir=/usr/share/doc/$pkgname --enable-tests \ +--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \ +--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 +} + +check() { + cd $_hkgname-$pkgver + runhaskell Setup test +} + +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 -t "$pkgdir"/usr/share/licenses/$pkgname/ + rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE +} Copied: haskell-brittany/repos/community-staging-x86_64/ghc-8.10.patch (from rev 771972, haskell-brittany/trunk/ghc-8.10.patch) === --- community-staging-x86_64/ghc-8.10.patch (rev 0) +++ community-staging-x86_64/ghc-8.10.patch 2020-12-08 18:25:23 UTC (rev 771973) @@ -0,0 +1,3558 @@ +From 17d07edb0a687053fbeb39e0bdf07415ee35a278 Mon Sep 17 00:00:00 2001 +From: jneira +Date: Wed, 13 May 2020 10:44:37 +0200 +Subject: [PATCH 02/17] Relax upper bounds to include updated packages + +--- + brittany.cabal | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/brittany.cabal b/brittany.cabal +index 818e818..590373f 100644 +--- a/brittany.cabal b/brittany.cabal +@@ -91,10 +91,10 @@ library { + -fno-warn-redundant-constraints + } + build-depends: +-{ base >=4.9 && <4.14 +-, ghc >=8.0.1 && <8.9 ++{ base >=4.9 && <4.15 ++, ghc >=8.0.1 && <8.11 + , ghc-paths >=0.1.0.9 && <0.2 +-, ghc-exactprint >=0.5.8 && <0.6.3 ++, ghc-exactprint >=0.5.8 && <0.6.4 + , transformers >=0.5.2.0 && <0.6 + , containers >=0.5.7.1 && <0.7 + , mtl >=2.2.1 && <2.3 +@@ -118,7 +118,7 @@ library { + , semigroups >=0.18.2 && <0.20 + , cmdargs >=0.10.14 && <0.11 + , czipwith >=1.0.1.0 && <1.1 +-, ghc-boot-th >=8.0.1 && <8.9 ++, ghc-boot-th >=8.0.1 && <8.11 + , filepath >=1.4.1.0 && <1.5 + , random >= 1.1 && <1.2 + } + +From b69a8f983c070564b41b6fdec160af6d8aff730b Mon Sep 17 00:00:00 2001 +From: jneira +Date: Wed, 13 May 2020 10:45:14 +0200 +Subject: [PATCH 03/17] Adapt to new GHC modules organization + +--- +
[arch-commits] Commit in haskell-brittany/repos (3 files)
Date: Saturday, December 5, 2020 @ 13:56:49 Author: felixonmars Revision: 770606 archrelease: copy trunk to community-staging-x86_64 Added: haskell-brittany/repos/community-staging-x86_64/ haskell-brittany/repos/community-staging-x86_64/PKGBUILD (from rev 770605, haskell-brittany/trunk/PKGBUILD) haskell-brittany/repos/community-staging-x86_64/ghc-8.10.patch (from rev 770605, haskell-brittany/trunk/ghc-8.10.patch) + PKGBUILD | 59 ghc-8.10.patch | 3558 +++ 2 files changed, 3617 insertions(+) Copied: haskell-brittany/repos/community-staging-x86_64/PKGBUILD (from rev 770605, haskell-brittany/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2020-12-05 13:56:49 UTC (rev 770606) @@ -0,0 +1,59 @@ +# Maintainer: Felix Yan + +_hkgname=brittany +pkgname=haskell-brittany +pkgver=0.12.2.0 +pkgrel=3 +pkgdesc="Haskell source code formatter" +url="https://github.com/lspitzner/brittany/; +license=("AGPL") +arch=('x86_64') +depends=('ghc-libs' 'haskell-aeson' 'haskell-butcher' 'haskell-cmdargs' 'haskell-czipwith' + 'haskell-data-tree-print' 'haskell-extra' 'haskell-ghc-exactprint' 'haskell-ghc-paths' + 'haskell-monad-memo' 'haskell-multistate' 'haskell-random' 'haskell-safe' + 'haskell-strict' 'haskell-syb' 'haskell-uniplate' 'haskell-unsafe' 'haskell-yaml') +makedepends=('ghc' 'uusi' 'haskell-hspec') +source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz; +ghc-8.10.patch) +sha256sums=('f437edc73106185213abdbfdc3d34a2f449c341cebd738b51ed39d683ca4670f' +'e0b4617fe2cb67f4ab035fe0ac333d506c4acfd7451b134ec76ee1eca6ee2b64') + +prepare() { + cd $_hkgname-$pkgver + patch -p1 -i ../ghc-8.10.patch + uusi -r semigroups:Cabal -u random $_hkgname.cabal + + # Hack to use Cabal's compatibility layer of semigroups + sed -i 's/import Data.Semigroup.Generic/import Distribution.Compat.Semigroup/' src/Language/Haskell/Brittany/Internal/Config/Types.hs +} + +build() { + cd $_hkgname-$pkgver + + runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ +--prefix=/usr --docdir=/usr/share/doc/$pkgname --enable-tests \ +--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \ +--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 +} + +check() { + cd $_hkgname-$pkgver + runhaskell Setup test +} + +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 -t "$pkgdir"/usr/share/licenses/$pkgname/ + rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE +} Copied: haskell-brittany/repos/community-staging-x86_64/ghc-8.10.patch (from rev 770605, haskell-brittany/trunk/ghc-8.10.patch) === --- community-staging-x86_64/ghc-8.10.patch (rev 0) +++ community-staging-x86_64/ghc-8.10.patch 2020-12-05 13:56:49 UTC (rev 770606) @@ -0,0 +1,3558 @@ +From 17d07edb0a687053fbeb39e0bdf07415ee35a278 Mon Sep 17 00:00:00 2001 +From: jneira +Date: Wed, 13 May 2020 10:44:37 +0200 +Subject: [PATCH 02/17] Relax upper bounds to include updated packages + +--- + brittany.cabal | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/brittany.cabal b/brittany.cabal +index 818e818..590373f 100644 +--- a/brittany.cabal b/brittany.cabal +@@ -91,10 +91,10 @@ library { + -fno-warn-redundant-constraints + } + build-depends: +-{ base >=4.9 && <4.14 +-, ghc >=8.0.1 && <8.9 ++{ base >=4.9 && <4.15 ++, ghc >=8.0.1 && <8.11 + , ghc-paths >=0.1.0.9 && <0.2 +-, ghc-exactprint >=0.5.8 && <0.6.3 ++, ghc-exactprint >=0.5.8 && <0.6.4 + , transformers >=0.5.2.0 && <0.6 + , containers >=0.5.7.1 && <0.7 + , mtl >=2.2.1 && <2.3 +@@ -118,7 +118,7 @@ library { + , semigroups >=0.18.2 && <0.20 + , cmdargs >=0.10.14 && <0.11 + , czipwith >=1.0.1.0 && <1.1 +-, ghc-boot-th >=8.0.1 && <8.9 ++, ghc-boot-th >=8.0.1 && <8.11 + , filepath >=1.4.1.0 && <1.5 + , random >= 1.1 && <1.2 + } + +From b69a8f983c070564b41b6fdec160af6d8aff730b Mon Sep 17 00:00:00 2001 +From: jneira +Date: Wed, 13 May 2020 10:45:14 +0200 +Subject: [PATCH 03/17] Adapt to new GHC modules organization + +--- +
[arch-commits] Commit in haskell-brittany/repos (3 files)
Date: Monday, November 30, 2020 @ 16:36:45 Author: felixonmars Revision: 766603 archrelease: copy trunk to community-staging-x86_64 Added: haskell-brittany/repos/community-staging-x86_64/ haskell-brittany/repos/community-staging-x86_64/PKGBUILD (from rev 766602, haskell-brittany/trunk/PKGBUILD) haskell-brittany/repos/community-staging-x86_64/ghc-8.10.patch (from rev 766602, haskell-brittany/trunk/ghc-8.10.patch) + PKGBUILD | 59 ghc-8.10.patch | 3558 +++ 2 files changed, 3617 insertions(+) Copied: haskell-brittany/repos/community-staging-x86_64/PKGBUILD (from rev 766602, haskell-brittany/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2020-11-30 16:36:45 UTC (rev 766603) @@ -0,0 +1,59 @@ +# Maintainer: Felix Yan + +_hkgname=brittany +pkgname=haskell-brittany +pkgver=0.12.2.0 +pkgrel=2 +pkgdesc="Haskell source code formatter" +url="https://github.com/lspitzner/brittany/; +license=("AGPL") +arch=('x86_64') +depends=('ghc-libs' 'haskell-aeson' 'haskell-butcher' 'haskell-cmdargs' 'haskell-czipwith' + 'haskell-data-tree-print' 'haskell-extra' 'haskell-ghc-exactprint' 'haskell-ghc-paths' + 'haskell-monad-memo' 'haskell-multistate' 'haskell-random' 'haskell-safe' + 'haskell-strict' 'haskell-syb' 'haskell-uniplate' 'haskell-unsafe' 'haskell-yaml') +makedepends=('ghc' 'uusi' 'haskell-hspec') +source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz; +ghc-8.10.patch) +sha256sums=('f437edc73106185213abdbfdc3d34a2f449c341cebd738b51ed39d683ca4670f' +'e0b4617fe2cb67f4ab035fe0ac333d506c4acfd7451b134ec76ee1eca6ee2b64') + +prepare() { + cd $_hkgname-$pkgver + patch -p1 -i ../ghc-8.10.patch + uusi -r semigroups:Cabal -u random $_hkgname.cabal + + # Hack to use Cabal's compatibility layer of semigroups + sed -i 's/import Data.Semigroup.Generic/import Distribution.Compat.Semigroup/' src/Language/Haskell/Brittany/Internal/Config/Types.hs +} + +build() { + cd $_hkgname-$pkgver + + runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ +--prefix=/usr --docdir=/usr/share/doc/$pkgname --enable-tests \ +--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \ +--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 +} + +check() { + cd $_hkgname-$pkgver + runhaskell Setup test +} + +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 -t "$pkgdir"/usr/share/licenses/$pkgname/ + rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE +} Copied: haskell-brittany/repos/community-staging-x86_64/ghc-8.10.patch (from rev 766602, haskell-brittany/trunk/ghc-8.10.patch) === --- community-staging-x86_64/ghc-8.10.patch (rev 0) +++ community-staging-x86_64/ghc-8.10.patch 2020-11-30 16:36:45 UTC (rev 766603) @@ -0,0 +1,3558 @@ +From 17d07edb0a687053fbeb39e0bdf07415ee35a278 Mon Sep 17 00:00:00 2001 +From: jneira +Date: Wed, 13 May 2020 10:44:37 +0200 +Subject: [PATCH 02/17] Relax upper bounds to include updated packages + +--- + brittany.cabal | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/brittany.cabal b/brittany.cabal +index 818e818..590373f 100644 +--- a/brittany.cabal b/brittany.cabal +@@ -91,10 +91,10 @@ library { + -fno-warn-redundant-constraints + } + build-depends: +-{ base >=4.9 && <4.14 +-, ghc >=8.0.1 && <8.9 ++{ base >=4.9 && <4.15 ++, ghc >=8.0.1 && <8.11 + , ghc-paths >=0.1.0.9 && <0.2 +-, ghc-exactprint >=0.5.8 && <0.6.3 ++, ghc-exactprint >=0.5.8 && <0.6.4 + , transformers >=0.5.2.0 && <0.6 + , containers >=0.5.7.1 && <0.7 + , mtl >=2.2.1 && <2.3 +@@ -118,7 +118,7 @@ library { + , semigroups >=0.18.2 && <0.20 + , cmdargs >=0.10.14 && <0.11 + , czipwith >=1.0.1.0 && <1.1 +-, ghc-boot-th >=8.0.1 && <8.9 ++, ghc-boot-th >=8.0.1 && <8.11 + , filepath >=1.4.1.0 && <1.5 + , random >= 1.1 && <1.2 + } + +From b69a8f983c070564b41b6fdec160af6d8aff730b Mon Sep 17 00:00:00 2001 +From: jneira +Date: Wed, 13 May 2020 10:45:14 +0200 +Subject: [PATCH 03/17] Adapt to new GHC modules organization + +--- +
[arch-commits] Commit in haskell-brittany/repos (3 files)
Date: Sunday, November 29, 2020 @ 15:34:21 Author: felixonmars Revision: 766344 archrelease: copy trunk to community-x86_64 Added: haskell-brittany/repos/community-x86_64/ haskell-brittany/repos/community-x86_64/PKGBUILD (from rev 766343, haskell-brittany/trunk/PKGBUILD) haskell-brittany/repos/community-x86_64/ghc-8.10.patch (from rev 766343, haskell-brittany/trunk/ghc-8.10.patch) + PKGBUILD | 59 ghc-8.10.patch | 3558 +++ 2 files changed, 3617 insertions(+) Copied: haskell-brittany/repos/community-x86_64/PKGBUILD (from rev 766343, haskell-brittany/trunk/PKGBUILD) === --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2020-11-29 15:34:21 UTC (rev 766344) @@ -0,0 +1,59 @@ +# Maintainer: Felix Yan + +_hkgname=brittany +pkgname=haskell-brittany +pkgver=0.12.2.0 +pkgrel=1 +pkgdesc="Haskell source code formatter" +url="https://github.com/lspitzner/brittany/; +license=("AGPL") +arch=('x86_64') +depends=('ghc-libs' 'haskell-aeson' 'haskell-butcher' 'haskell-cmdargs' 'haskell-czipwith' + 'haskell-data-tree-print' 'haskell-extra' 'haskell-ghc-exactprint' 'haskell-ghc-paths' + 'haskell-monad-memo' 'haskell-multistate' 'haskell-random' 'haskell-safe' + 'haskell-strict' 'haskell-syb' 'haskell-uniplate' 'haskell-unsafe' 'haskell-yaml') +makedepends=('ghc' 'uusi' 'haskell-hspec') +source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz; +ghc-8.10.patch) +sha256sums=('f437edc73106185213abdbfdc3d34a2f449c341cebd738b51ed39d683ca4670f' +'e0b4617fe2cb67f4ab035fe0ac333d506c4acfd7451b134ec76ee1eca6ee2b64') + +prepare() { + cd $_hkgname-$pkgver + patch -p1 -i ../ghc-8.10.patch + uusi -r semigroups:Cabal -u random $_hkgname.cabal + + # Hack to use Cabal's compatibility layer of semigroups + sed -i 's/import Data.Semigroup.Generic/import Distribution.Compat.Semigroup/' src/Language/Haskell/Brittany/Internal/Config/Types.hs +} + +build() { + cd $_hkgname-$pkgver + + runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ +--prefix=/usr --docdir=/usr/share/doc/$pkgname --enable-tests \ +--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \ +--ghc-option=-optl-Wl\,-z\,relro\,-z\,now \ +--ghc-option='-pie' + + 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 +} + +check() { + cd $_hkgname-$pkgver + runhaskell Setup test +} + +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 -t "$pkgdir"/usr/share/licenses/$pkgname/ + rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE +} Copied: haskell-brittany/repos/community-x86_64/ghc-8.10.patch (from rev 766343, haskell-brittany/trunk/ghc-8.10.patch) === --- community-x86_64/ghc-8.10.patch (rev 0) +++ community-x86_64/ghc-8.10.patch 2020-11-29 15:34:21 UTC (rev 766344) @@ -0,0 +1,3558 @@ +From 17d07edb0a687053fbeb39e0bdf07415ee35a278 Mon Sep 17 00:00:00 2001 +From: jneira +Date: Wed, 13 May 2020 10:44:37 +0200 +Subject: [PATCH 02/17] Relax upper bounds to include updated packages + +--- + brittany.cabal | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/brittany.cabal b/brittany.cabal +index 818e818..590373f 100644 +--- a/brittany.cabal b/brittany.cabal +@@ -91,10 +91,10 @@ library { + -fno-warn-redundant-constraints + } + build-depends: +-{ base >=4.9 && <4.14 +-, ghc >=8.0.1 && <8.9 ++{ base >=4.9 && <4.15 ++, ghc >=8.0.1 && <8.11 + , ghc-paths >=0.1.0.9 && <0.2 +-, ghc-exactprint >=0.5.8 && <0.6.3 ++, ghc-exactprint >=0.5.8 && <0.6.4 + , transformers >=0.5.2.0 && <0.6 + , containers >=0.5.7.1 && <0.7 + , mtl >=2.2.1 && <2.3 +@@ -118,7 +118,7 @@ library { + , semigroups >=0.18.2 && <0.20 + , cmdargs >=0.10.14 && <0.11 + , czipwith >=1.0.1.0 && <1.1 +-, ghc-boot-th >=8.0.1 && <8.9 ++, ghc-boot-th >=8.0.1 && <8.11 + , filepath >=1.4.1.0 && <1.5 + , random >= 1.1 && <1.2 + } + +From b69a8f983c070564b41b6fdec160af6d8aff730b Mon Sep 17 00:00:00 2001 +From: jneira +Date: Wed, 13 May 2020 10:45:14 +0200 +Subject: [PATCH 03/17] Adapt to new GHC modules organization + +--- + .../Haskell/Brittany/Internal/ExactPrintUtils.hs | 6 ++ + src/Language/Haskell/Brittany/Internal/Prelude.hs | 8