[arch-commits] Commit in haskell-th-env/repos (3 files)

[Felix Yan]

    Date: Friday, September 10, 2021 @ 14:24:37
  Author: felixonmars
Revision: 1013483

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-th-env/repos/community-staging-x86_64/
  haskell-th-env/repos/community-staging-x86_64/PKGBUILD
    (from rev 1013482, haskell-th-env/trunk/PKGBUILD)
  haskell-th-env/repos/community-staging-x86_64/ghc9.patch
    (from rev 1013482, haskell-th-env/trunk/ghc9.patch)

------------+
 PKGBUILD   |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 ghc9.patch |   25 +++++++++++++++++++++++++
 2 files changed, 77 insertions(+)

Copied: haskell-th-env/repos/community-staging-x86_64/PKGBUILD (from rev 1013482, haskell-th-env/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2021-09-10 14:24:37 UTC (rev 1013483)
@@ -0,0 +1,52 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+_hkgname=th-env
+pkgname=haskell-th-env
+pkgver=0.1.0.2
+pkgrel=50
+pkgdesc="Template Haskell splice that expands to an environment variable"
+url="https://github.com/dzhus/th-env#readme"
+license=("BSD")
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-th-compat')
+makedepends=('ghc' 'haskell-markdown-unlit')
+source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz"
+        ghc9.patch)
+sha256sums=('c0d29be2104dd0964f534637841b8ceb665d594b02318062aa4a245ccb353a8f'
+            '67f0ed6d9e5e84e81f679fbb394aeb7ac04b1a4a8de9ddb3ad37455bd74a6cf0')
+
+prepare() {
+  patch -d $_hkgname-$pkgver -p1 < ghc9.patch
+  sed -i '/template-haskell/a \    , th-compat' $_hkgname-$pkgver/$_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 --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 --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 -t "$pkgdir"/usr/share/licenses/$pkgname/
+  rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE
+}

Copied: haskell-th-env/repos/community-staging-x86_64/ghc9.patch (from rev 1013482, haskell-th-env/trunk/ghc9.patch)
===================================================================
--- community-staging-x86_64/ghc9.patch	                        (rev 0)
+++ community-staging-x86_64/ghc9.patch	2021-09-10 14:24:37 UTC (rev 1013483)
@@ -0,0 +1,25 @@
+diff --git a/src/Language/Haskell/TH/Env.hs b/src/Language/Haskell/TH/Env.hs
+index 38859e2..62c88fe 100644
+--- a/src/Language/Haskell/TH/Env.hs
++++ b/src/Language/Haskell/TH/Env.hs
+@@ -8,6 +8,7 @@ where
+ 
+ import Data.String
+ import Language.Haskell.TH
++import Language.Haskell.TH.Syntax.Compat
+ import System.Environment
+ 
+ -- | Produce a typed expression with the current value of an
+@@ -15,8 +16,8 @@ import System.Environment
+ envQ :: IsString a
+      => String
+      -- ^ Environment variable name.
+-     -> TExpQ (Maybe a)
+-envQ name =
++     -> SpliceQ (Maybe a)
++envQ name = liftSplice $
+   runIO (lookupEnv name) >>= \case
+-    Just v  -> [|| Just (fromString v) ||]
+-    Nothing -> [|| Nothing ||]
++    Just v  -> fromCode $ toCode [|| Just (fromString v) ||]
++    Nothing -> fromCode $ toCode [|| Nothing ||]