[arch-commits] Commit in stack/repos (12 files)
Felix Yan
felixonmars at archlinux.org
Wed Jul 26 09:19:34 UTC 2017
Date: Wednesday, July 26, 2017 @ 09:19:34
Author: felixonmars
Revision: 246418
archrelease: copy trunk to community-i686, community-x86_64
Added:
stack/repos/community-i686/PKGBUILD
(from rev 246417, stack/trunk/PKGBUILD)
stack/repos/community-i686/path-0.6.1.patch
(from rev 246417, stack/trunk/path-0.6.1.patch)
stack/repos/community-i686/stack.install
(from rev 246417, stack/trunk/stack.install)
stack/repos/community-x86_64/PKGBUILD
(from rev 246417, stack/trunk/PKGBUILD)
stack/repos/community-x86_64/path-0.6.1.patch
(from rev 246417, stack/trunk/path-0.6.1.patch)
stack/repos/community-x86_64/stack.install
(from rev 246417, stack/trunk/stack.install)
Deleted:
stack/repos/community-i686/PKGBUILD
stack/repos/community-i686/path-0.6.1.patch
stack/repos/community-i686/stack.install
stack/repos/community-x86_64/PKGBUILD
stack/repos/community-x86_64/path-0.6.1.patch
stack/repos/community-x86_64/stack.install
-----------------------------------+
/PKGBUILD | 164 ++++++++++++++++++++++++++++++++++++
/path-0.6.1.patch | 98 +++++++++++++++++++++
/stack.install | 8 +
community-i686/PKGBUILD | 83 ------------------
community-i686/path-0.6.1.patch | 49 ----------
community-i686/stack.install | 4
community-x86_64/PKGBUILD | 83 ------------------
community-x86_64/path-0.6.1.patch | 49 ----------
community-x86_64/stack.install | 4
9 files changed, 270 insertions(+), 272 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-07-26 09:18:26 UTC (rev 246417)
+++ community-i686/PKGBUILD 2017-07-26 09:19:34 UTC (rev 246418)
@@ -1,83 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-
-pkgname=stack
-pkgver=1.4.0
-pkgrel=114
-pkgdesc="The Haskell Tool Stack"
-url="https://github.com/commercialhaskell/stack"
-license=("custom:BSD3")
-arch=('i686' 'x86_64')
-depends=('ghc' "haskell-aeson" "haskell-annotated-wl-pprint" "haskell-ansi-terminal"
- "haskell-async" "haskell-attoparsec" "haskell-base-compat" "haskell-base64-bytestring"
- "haskell-binary-tagged" "haskell-blaze-builder" "haskell-clock" "haskell-conduit"
- "haskell-conduit-extra" "haskell-cryptonite" "haskell-cryptonite-conduit"
- "haskell-either" "haskell-errors" "haskell-exceptions" "haskell-extra"
- "haskell-fast-logger" "haskell-file-embed" "haskell-filelock" "haskell-fsnotify"
- "haskell-generic-deriving" "haskell-gitrev" "haskell-hackage-security"
- "haskell-hashable" "haskell-hastache" "haskell-hit" "haskell-http-client"
- "haskell-http-client-tls" "haskell-http-conduit" "haskell-http-types" "haskell-hpack"
- "haskell-lifted-async" "haskell-lifted-base" "haskell-memory" "haskell-microlens"
- "haskell-microlens-mtl" "haskell-monad-control" "haskell-monad-logger"
- "haskell-monad-unlift" "haskell-mtl" "haskell-network-uri" "haskell-open-browser"
- "haskell-optparse-applicative" "haskell-optparse-simple" "haskell-path"
- "haskell-path-io" "haskell-persistent" "haskell-persistent-sqlite"
- "haskell-persistent-template" "haskell-pid1" "haskell-project-template"
- "haskell-regex-applicative-text" "haskell-resourcet" "haskell-retry" "haskell-safe"
- "haskell-safe-exceptions" "haskell-semigroups" "haskell-split" "haskell-stm"
- "haskell-store" "haskell-streaming-commons" "haskell-tar" "haskell-temporary"
- "haskell-text" "haskell-text-binary" "haskell-text-metrics" "haskell-tls"
- "haskell-transformers-base" "haskell-unicode-transforms" "haskell-unix-compat"
- "haskell-unordered-containers" "haskell-vector" "haskell-vector-binary-instances"
- "haskell-yaml" "haskell-zip-archive" "haskell-zlib")
-conflicts=('haskell-stack')
-replaces=('haskell-stack')
-install="stack.install"
-source=("$pkgname-$pkgver.tar.gz::https://github.com/commercialhaskell/stack/archive/v$pkgver.tar.gz"
- "store-0.4.patch::https://github.com/commercialhaskell/stack/commit/d3637126b9045b266d2e53387e183915cb4a912d.patch"
- path-0.6.1.patch)
-sha256sums=('595d311ad117e41ad908b7065743917542b40f343d1334673e98171ee74d36e6'
- 'cf41cad2ce75f05e302d3670d19d6574f8c86ab81abbefde9e2ec498807cb660'
- '2013b76677e62851248f26f8b77d0f37a52496b3380bf3107519d5a84e09808f')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../store-0.4.patch
- patch -p1 -i ../path-0.6.1.patch
- sed -i 's/PathException/InvalidPathException/' src/System/Process/Read.hs
- sed -i 's/, errors < 2.2/, errors < 2.3/' stack.cabal
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- runhaskell Setup configure -O --enable-shared --enable-executable-dynamic \
- --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
- --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
- -f-disable-git-info -f-integration-tests -f-static -f-hide-dependency-versions
- runhaskell Setup build
- runhaskell Setup haddock --hoogle --html
- 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}/${pkgname}-${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"
- install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
- ln -s "/usr/share/doc/${pkgname}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgname}"
- runhaskell Setup copy --destdir="${pkgdir}"
- install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
-
- LD_PRELOAD=$(ls "$pkgdir"/usr/lib/libHSstack-*-ghc*.so) "${pkgdir}"/usr/bin/stack --bash-completion-script /usr/bin/stack > stack_completion_script
- install -Dm644 stack_completion_script "${pkgdir}/usr/share/bash-completion/completions/stack"
-
- # Remove static libs
- find "$pkgdir"/usr/lib -name "*.a" -delete
-}
Copied: stack/repos/community-i686/PKGBUILD (from rev 246417, stack/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-07-26 09:19:34 UTC (rev 246418)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgname=stack
+pkgver=1.5.0
+pkgrel=1
+pkgdesc="The Haskell Tool Stack"
+url="https://github.com/commercialhaskell/stack"
+license=("custom:BSD3")
+arch=('i686' 'x86_64')
+depends=('ghc' "haskell-aeson" "haskell-annotated-wl-pprint" "haskell-ansi-terminal"
+ "haskell-async" "haskell-attoparsec" "haskell-base-compat" "haskell-base64-bytestring"
+ "haskell-binary-tagged" "haskell-blaze-builder" "haskell-clock" "haskell-conduit"
+ "haskell-conduit-extra" "haskell-cryptonite" "haskell-cryptonite-conduit" "haskell-echo"
+ "haskell-either" "haskell-errors" "haskell-exceptions" "haskell-extra"
+ "haskell-fast-logger" "haskell-file-embed" "haskell-filelock" "haskell-fsnotify"
+ "haskell-generic-deriving" "haskell-gitrev" "haskell-hackage-security" "haskell-hashable"
+ "haskell-hastache" "haskell-http-client" "haskell-http-client-tls" "haskell-http-conduit"
+ "haskell-http-types" "haskell-hpack" "haskell-lifted-async" "haskell-lifted-base"
+ "haskell-memory" "haskell-microlens" "haskell-microlens-mtl" "haskell-mintty"
+ "haskell-monad-control" "haskell-monad-logger" "haskell-monad-unlift" "haskell-mtl"
+ "haskell-network-uri" "haskell-open-browser" "haskell-optparse-applicative"
+ "haskell-optparse-simple" "haskell-path" "haskell-path-io" "haskell-persistent"
+ "haskell-persistent-sqlite" "haskell-persistent-template" "haskell-pid1"
+ "haskell-project-template" "haskell-regex-applicative-text" "haskell-resourcet"
+ "haskell-retry" "haskell-safe" "haskell-safe-exceptions" "haskell-semigroups"
+ "haskell-split" "haskell-stm" "haskell-store" "haskell-store-core"
+ "haskell-streaming-commons" "haskell-tar" "haskell-temporary" "haskell-text"
+ "haskell-text-binary" "haskell-text-metrics" "haskell-tls" "haskell-transformers-base"
+ "haskell-unicode-transforms" "haskell-unix-compat" "haskell-unordered-containers"
+ "haskell-vector" "haskell-vector-binary-instances" "haskell-yaml" "haskell-zip-archive"
+ "haskell-zlib")
+conflicts=('haskell-stack')
+replaces=('haskell-stack')
+install="stack.install"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/commercialhaskell/stack/archive/v$pkgver.tar.gz"
+ path-0.6.1.patch)
+sha256sums=('2ffead80e9cc3b72480e9130bb639aaa8a6a684d8f6098a3843fe88803c8e478'
+ '2013b76677e62851248f26f8b77d0f37a52496b3380bf3107519d5a84e09808f')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../path-0.6.1.patch
+
+ sed -e 's/cryptonite >= 0.19 && < 0.24/cryptonite >= 0.19 \&\& < 0.25/' \
+ -e 's/, path >= 0.5.8 && < 0.6/, path >= 0.5.8 \&\& < 0.7/' \
+ -i stack.cabal
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-shared --enable-executable-dynamic \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+ --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
+ -f-disable-git-info -f-integration-tests -f-static -f-hide-dependency-versions
+ runhaskell Setup build
+ runhaskell Setup haddock --hoogle --html
+ 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}/${pkgname}-${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"
+ install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
+ ln -s "/usr/share/doc/${pkgname}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgname}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+
+ LD_PRELOAD=$(ls "$pkgdir"/usr/lib/libHSstack-*-ghc*.so) "${pkgdir}"/usr/bin/stack --bash-completion-script /usr/bin/stack > stack_completion_script
+ install -Dm644 stack_completion_script "${pkgdir}/usr/share/bash-completion/completions/stack"
+
+ # Remove static libs
+ find "$pkgdir"/usr/lib -name "*.a" -delete
+}
Deleted: community-i686/path-0.6.1.patch
===================================================================
--- community-i686/path-0.6.1.patch 2017-07-26 09:18:26 UTC (rev 246417)
+++ community-i686/path-0.6.1.patch 2017-07-26 09:19:34 UTC (rev 246418)
@@ -1,49 +0,0 @@
-commit 06c987c7564b2ee7359462587a55c11fdb3d4f84
-Author: Felix Yan <felixonmars at archlinux.org>
-Date: Sat Jul 1 17:06:02 2017 +0800
-
- Fix build with path 0.6.1
-
-diff --git a/src/Network/HTTP/Download/Verified.hs b/src/Network/HTTP/Download/Verified.hs
-index fad8236b..67f19f2b 100644
---- a/src/Network/HTTP/Download/Verified.hs
-+++ b/src/Network/HTTP/Download/Verified.hs
-@@ -55,7 +55,7 @@ import Network.HTTP.Types.Header (hContentLength, hContentMD5)
- import Path
- import Prelude -- Fix AMP warning
- import System.Directory
--import System.FilePath ((<.>))
-+import qualified System.FilePath as FP ((<.>))
- import System.IO
-
- -- | A request together with some checks to perform.
-@@ -243,7 +243,7 @@ verifiedDownload DownloadRequest{..} destpath progressSink = do
- if p then m >> return True else return False
-
- fp = toFilePath destpath
-- fptmp = fp <.> "tmp"
-+ fptmp = fp FP.<.> "tmp"
- dir = toFilePath $ parent destpath
-
- getShouldDownload = do
-diff --git a/src/Stack/Fetch.hs b/src/Stack/Fetch.hs
-index 1439d114..746b695d 100644
---- a/src/Stack/Fetch.hs
-+++ b/src/Stack/Fetch.hs
-@@ -75,7 +75,6 @@ import Stack.Types.PackageIdentifier
- import Stack.Types.PackageIndex
- import Stack.Types.PackageName
- import Stack.Types.Version
--import System.FilePath ((<.>))
- import qualified System.FilePath as FP
- import System.IO
- import System.PosixCompat (setFileMode)
-@@ -561,7 +560,7 @@ fetchPackages' mdistDir toFetchAll = do
- let cabalFP =
- innerDest FP.</>
- packageNameString (packageIdentifierName ident)
-- <.> "cabal"
-+ FP.<.> "cabal"
- S.writeFile cabalFP $ tfCabal toFetch
-
- atomically $ modifyTVar outputVar $ Map.insert ident destDir
Copied: stack/repos/community-i686/path-0.6.1.patch (from rev 246417, stack/trunk/path-0.6.1.patch)
===================================================================
--- community-i686/path-0.6.1.patch (rev 0)
+++ community-i686/path-0.6.1.patch 2017-07-26 09:19:34 UTC (rev 246418)
@@ -0,0 +1,49 @@
+commit 06c987c7564b2ee7359462587a55c11fdb3d4f84
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Sat Jul 1 17:06:02 2017 +0800
+
+ Fix build with path 0.6.1
+
+diff --git a/src/Network/HTTP/Download/Verified.hs b/src/Network/HTTP/Download/Verified.hs
+index fad8236b..67f19f2b 100644
+--- a/src/Network/HTTP/Download/Verified.hs
++++ b/src/Network/HTTP/Download/Verified.hs
+@@ -55,7 +55,7 @@ import Network.HTTP.Types.Header (hContentLength, hContentMD5)
+ import Path
+ import Prelude -- Fix AMP warning
+ import System.Directory
+-import System.FilePath ((<.>))
++import qualified System.FilePath as FP ((<.>))
+ import System.IO
+
+ -- | A request together with some checks to perform.
+@@ -243,7 +243,7 @@ verifiedDownload DownloadRequest{..} destpath progressSink = do
+ if p then m >> return True else return False
+
+ fp = toFilePath destpath
+- fptmp = fp <.> "tmp"
++ fptmp = fp FP.<.> "tmp"
+ dir = toFilePath $ parent destpath
+
+ getShouldDownload = do
+diff --git a/src/Stack/Fetch.hs b/src/Stack/Fetch.hs
+index 1439d114..746b695d 100644
+--- a/src/Stack/Fetch.hs
++++ b/src/Stack/Fetch.hs
+@@ -75,7 +75,6 @@ import Stack.Types.PackageIdentifier
+ import Stack.Types.PackageIndex
+ import Stack.Types.PackageName
+ import Stack.Types.Version
+-import System.FilePath ((<.>))
+ import qualified System.FilePath as FP
+ import System.IO
+ import System.PosixCompat (setFileMode)
+@@ -561,7 +560,7 @@ fetchPackages' mdistDir toFetchAll = do
+ let cabalFP =
+ innerDest FP.</>
+ packageNameString (packageIdentifierName ident)
+- <.> "cabal"
++ FP.<.> "cabal"
+ S.writeFile cabalFP $ tfCabal toFetch
+
+ atomically $ modifyTVar outputVar $ Map.insert ident destDir
Deleted: community-i686/stack.install
===================================================================
--- community-i686/stack.install 2017-07-26 09:18:26 UTC (rev 246417)
+++ community-i686/stack.install 2017-07-26 09:19:34 UTC (rev 246418)
@@ -1,4 +0,0 @@
-post_install() {
- echo "You need to either 1) install latest stable ghc package from [extra] or 2) install ncurses5-compat-libs from AUR for the prebuilt binaries installed by stack to work."
-}
-
Copied: stack/repos/community-i686/stack.install (from rev 246417, stack/trunk/stack.install)
===================================================================
--- community-i686/stack.install (rev 0)
+++ community-i686/stack.install 2017-07-26 09:19:34 UTC (rev 246418)
@@ -0,0 +1,4 @@
+post_install() {
+ echo "You need to either 1) install latest stable ghc package from [extra] or 2) install ncurses5-compat-libs from AUR for the prebuilt binaries installed by stack to work."
+}
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-07-26 09:18:26 UTC (rev 246417)
+++ community-x86_64/PKGBUILD 2017-07-26 09:19:34 UTC (rev 246418)
@@ -1,83 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-
-pkgname=stack
-pkgver=1.4.0
-pkgrel=114
-pkgdesc="The Haskell Tool Stack"
-url="https://github.com/commercialhaskell/stack"
-license=("custom:BSD3")
-arch=('i686' 'x86_64')
-depends=('ghc' "haskell-aeson" "haskell-annotated-wl-pprint" "haskell-ansi-terminal"
- "haskell-async" "haskell-attoparsec" "haskell-base-compat" "haskell-base64-bytestring"
- "haskell-binary-tagged" "haskell-blaze-builder" "haskell-clock" "haskell-conduit"
- "haskell-conduit-extra" "haskell-cryptonite" "haskell-cryptonite-conduit"
- "haskell-either" "haskell-errors" "haskell-exceptions" "haskell-extra"
- "haskell-fast-logger" "haskell-file-embed" "haskell-filelock" "haskell-fsnotify"
- "haskell-generic-deriving" "haskell-gitrev" "haskell-hackage-security"
- "haskell-hashable" "haskell-hastache" "haskell-hit" "haskell-http-client"
- "haskell-http-client-tls" "haskell-http-conduit" "haskell-http-types" "haskell-hpack"
- "haskell-lifted-async" "haskell-lifted-base" "haskell-memory" "haskell-microlens"
- "haskell-microlens-mtl" "haskell-monad-control" "haskell-monad-logger"
- "haskell-monad-unlift" "haskell-mtl" "haskell-network-uri" "haskell-open-browser"
- "haskell-optparse-applicative" "haskell-optparse-simple" "haskell-path"
- "haskell-path-io" "haskell-persistent" "haskell-persistent-sqlite"
- "haskell-persistent-template" "haskell-pid1" "haskell-project-template"
- "haskell-regex-applicative-text" "haskell-resourcet" "haskell-retry" "haskell-safe"
- "haskell-safe-exceptions" "haskell-semigroups" "haskell-split" "haskell-stm"
- "haskell-store" "haskell-streaming-commons" "haskell-tar" "haskell-temporary"
- "haskell-text" "haskell-text-binary" "haskell-text-metrics" "haskell-tls"
- "haskell-transformers-base" "haskell-unicode-transforms" "haskell-unix-compat"
- "haskell-unordered-containers" "haskell-vector" "haskell-vector-binary-instances"
- "haskell-yaml" "haskell-zip-archive" "haskell-zlib")
-conflicts=('haskell-stack')
-replaces=('haskell-stack')
-install="stack.install"
-source=("$pkgname-$pkgver.tar.gz::https://github.com/commercialhaskell/stack/archive/v$pkgver.tar.gz"
- "store-0.4.patch::https://github.com/commercialhaskell/stack/commit/d3637126b9045b266d2e53387e183915cb4a912d.patch"
- path-0.6.1.patch)
-sha256sums=('595d311ad117e41ad908b7065743917542b40f343d1334673e98171ee74d36e6'
- 'cf41cad2ce75f05e302d3670d19d6574f8c86ab81abbefde9e2ec498807cb660'
- '2013b76677e62851248f26f8b77d0f37a52496b3380bf3107519d5a84e09808f')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../store-0.4.patch
- patch -p1 -i ../path-0.6.1.patch
- sed -i 's/PathException/InvalidPathException/' src/System/Process/Read.hs
- sed -i 's/, errors < 2.2/, errors < 2.3/' stack.cabal
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- runhaskell Setup configure -O --enable-shared --enable-executable-dynamic \
- --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
- --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
- -f-disable-git-info -f-integration-tests -f-static -f-hide-dependency-versions
- runhaskell Setup build
- runhaskell Setup haddock --hoogle --html
- 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}/${pkgname}-${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"
- install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
- ln -s "/usr/share/doc/${pkgname}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgname}"
- runhaskell Setup copy --destdir="${pkgdir}"
- install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
-
- LD_PRELOAD=$(ls "$pkgdir"/usr/lib/libHSstack-*-ghc*.so) "${pkgdir}"/usr/bin/stack --bash-completion-script /usr/bin/stack > stack_completion_script
- install -Dm644 stack_completion_script "${pkgdir}/usr/share/bash-completion/completions/stack"
-
- # Remove static libs
- find "$pkgdir"/usr/lib -name "*.a" -delete
-}
Copied: stack/repos/community-x86_64/PKGBUILD (from rev 246417, stack/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-07-26 09:19:34 UTC (rev 246418)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgname=stack
+pkgver=1.5.0
+pkgrel=1
+pkgdesc="The Haskell Tool Stack"
+url="https://github.com/commercialhaskell/stack"
+license=("custom:BSD3")
+arch=('i686' 'x86_64')
+depends=('ghc' "haskell-aeson" "haskell-annotated-wl-pprint" "haskell-ansi-terminal"
+ "haskell-async" "haskell-attoparsec" "haskell-base-compat" "haskell-base64-bytestring"
+ "haskell-binary-tagged" "haskell-blaze-builder" "haskell-clock" "haskell-conduit"
+ "haskell-conduit-extra" "haskell-cryptonite" "haskell-cryptonite-conduit" "haskell-echo"
+ "haskell-either" "haskell-errors" "haskell-exceptions" "haskell-extra"
+ "haskell-fast-logger" "haskell-file-embed" "haskell-filelock" "haskell-fsnotify"
+ "haskell-generic-deriving" "haskell-gitrev" "haskell-hackage-security" "haskell-hashable"
+ "haskell-hastache" "haskell-http-client" "haskell-http-client-tls" "haskell-http-conduit"
+ "haskell-http-types" "haskell-hpack" "haskell-lifted-async" "haskell-lifted-base"
+ "haskell-memory" "haskell-microlens" "haskell-microlens-mtl" "haskell-mintty"
+ "haskell-monad-control" "haskell-monad-logger" "haskell-monad-unlift" "haskell-mtl"
+ "haskell-network-uri" "haskell-open-browser" "haskell-optparse-applicative"
+ "haskell-optparse-simple" "haskell-path" "haskell-path-io" "haskell-persistent"
+ "haskell-persistent-sqlite" "haskell-persistent-template" "haskell-pid1"
+ "haskell-project-template" "haskell-regex-applicative-text" "haskell-resourcet"
+ "haskell-retry" "haskell-safe" "haskell-safe-exceptions" "haskell-semigroups"
+ "haskell-split" "haskell-stm" "haskell-store" "haskell-store-core"
+ "haskell-streaming-commons" "haskell-tar" "haskell-temporary" "haskell-text"
+ "haskell-text-binary" "haskell-text-metrics" "haskell-tls" "haskell-transformers-base"
+ "haskell-unicode-transforms" "haskell-unix-compat" "haskell-unordered-containers"
+ "haskell-vector" "haskell-vector-binary-instances" "haskell-yaml" "haskell-zip-archive"
+ "haskell-zlib")
+conflicts=('haskell-stack')
+replaces=('haskell-stack')
+install="stack.install"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/commercialhaskell/stack/archive/v$pkgver.tar.gz"
+ path-0.6.1.patch)
+sha256sums=('2ffead80e9cc3b72480e9130bb639aaa8a6a684d8f6098a3843fe88803c8e478'
+ '2013b76677e62851248f26f8b77d0f37a52496b3380bf3107519d5a84e09808f')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../path-0.6.1.patch
+
+ sed -e 's/cryptonite >= 0.19 && < 0.24/cryptonite >= 0.19 \&\& < 0.25/' \
+ -e 's/, path >= 0.5.8 && < 0.6/, path >= 0.5.8 \&\& < 0.7/' \
+ -i stack.cabal
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-shared --enable-executable-dynamic \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+ --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \
+ -f-disable-git-info -f-integration-tests -f-static -f-hide-dependency-versions
+ runhaskell Setup build
+ runhaskell Setup haddock --hoogle --html
+ 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}/${pkgname}-${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"
+ install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
+ ln -s "/usr/share/doc/${pkgname}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgname}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+
+ LD_PRELOAD=$(ls "$pkgdir"/usr/lib/libHSstack-*-ghc*.so) "${pkgdir}"/usr/bin/stack --bash-completion-script /usr/bin/stack > stack_completion_script
+ install -Dm644 stack_completion_script "${pkgdir}/usr/share/bash-completion/completions/stack"
+
+ # Remove static libs
+ find "$pkgdir"/usr/lib -name "*.a" -delete
+}
Deleted: community-x86_64/path-0.6.1.patch
===================================================================
--- community-x86_64/path-0.6.1.patch 2017-07-26 09:18:26 UTC (rev 246417)
+++ community-x86_64/path-0.6.1.patch 2017-07-26 09:19:34 UTC (rev 246418)
@@ -1,49 +0,0 @@
-commit 06c987c7564b2ee7359462587a55c11fdb3d4f84
-Author: Felix Yan <felixonmars at archlinux.org>
-Date: Sat Jul 1 17:06:02 2017 +0800
-
- Fix build with path 0.6.1
-
-diff --git a/src/Network/HTTP/Download/Verified.hs b/src/Network/HTTP/Download/Verified.hs
-index fad8236b..67f19f2b 100644
---- a/src/Network/HTTP/Download/Verified.hs
-+++ b/src/Network/HTTP/Download/Verified.hs
-@@ -55,7 +55,7 @@ import Network.HTTP.Types.Header (hContentLength, hContentMD5)
- import Path
- import Prelude -- Fix AMP warning
- import System.Directory
--import System.FilePath ((<.>))
-+import qualified System.FilePath as FP ((<.>))
- import System.IO
-
- -- | A request together with some checks to perform.
-@@ -243,7 +243,7 @@ verifiedDownload DownloadRequest{..} destpath progressSink = do
- if p then m >> return True else return False
-
- fp = toFilePath destpath
-- fptmp = fp <.> "tmp"
-+ fptmp = fp FP.<.> "tmp"
- dir = toFilePath $ parent destpath
-
- getShouldDownload = do
-diff --git a/src/Stack/Fetch.hs b/src/Stack/Fetch.hs
-index 1439d114..746b695d 100644
---- a/src/Stack/Fetch.hs
-+++ b/src/Stack/Fetch.hs
-@@ -75,7 +75,6 @@ import Stack.Types.PackageIdentifier
- import Stack.Types.PackageIndex
- import Stack.Types.PackageName
- import Stack.Types.Version
--import System.FilePath ((<.>))
- import qualified System.FilePath as FP
- import System.IO
- import System.PosixCompat (setFileMode)
-@@ -561,7 +560,7 @@ fetchPackages' mdistDir toFetchAll = do
- let cabalFP =
- innerDest FP.</>
- packageNameString (packageIdentifierName ident)
-- <.> "cabal"
-+ FP.<.> "cabal"
- S.writeFile cabalFP $ tfCabal toFetch
-
- atomically $ modifyTVar outputVar $ Map.insert ident destDir
Copied: stack/repos/community-x86_64/path-0.6.1.patch (from rev 246417, stack/trunk/path-0.6.1.patch)
===================================================================
--- community-x86_64/path-0.6.1.patch (rev 0)
+++ community-x86_64/path-0.6.1.patch 2017-07-26 09:19:34 UTC (rev 246418)
@@ -0,0 +1,49 @@
+commit 06c987c7564b2ee7359462587a55c11fdb3d4f84
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Sat Jul 1 17:06:02 2017 +0800
+
+ Fix build with path 0.6.1
+
+diff --git a/src/Network/HTTP/Download/Verified.hs b/src/Network/HTTP/Download/Verified.hs
+index fad8236b..67f19f2b 100644
+--- a/src/Network/HTTP/Download/Verified.hs
++++ b/src/Network/HTTP/Download/Verified.hs
+@@ -55,7 +55,7 @@ import Network.HTTP.Types.Header (hContentLength, hContentMD5)
+ import Path
+ import Prelude -- Fix AMP warning
+ import System.Directory
+-import System.FilePath ((<.>))
++import qualified System.FilePath as FP ((<.>))
+ import System.IO
+
+ -- | A request together with some checks to perform.
+@@ -243,7 +243,7 @@ verifiedDownload DownloadRequest{..} destpath progressSink = do
+ if p then m >> return True else return False
+
+ fp = toFilePath destpath
+- fptmp = fp <.> "tmp"
++ fptmp = fp FP.<.> "tmp"
+ dir = toFilePath $ parent destpath
+
+ getShouldDownload = do
+diff --git a/src/Stack/Fetch.hs b/src/Stack/Fetch.hs
+index 1439d114..746b695d 100644
+--- a/src/Stack/Fetch.hs
++++ b/src/Stack/Fetch.hs
+@@ -75,7 +75,6 @@ import Stack.Types.PackageIdentifier
+ import Stack.Types.PackageIndex
+ import Stack.Types.PackageName
+ import Stack.Types.Version
+-import System.FilePath ((<.>))
+ import qualified System.FilePath as FP
+ import System.IO
+ import System.PosixCompat (setFileMode)
+@@ -561,7 +560,7 @@ fetchPackages' mdistDir toFetchAll = do
+ let cabalFP =
+ innerDest FP.</>
+ packageNameString (packageIdentifierName ident)
+- <.> "cabal"
++ FP.<.> "cabal"
+ S.writeFile cabalFP $ tfCabal toFetch
+
+ atomically $ modifyTVar outputVar $ Map.insert ident destDir
Deleted: community-x86_64/stack.install
===================================================================
--- community-x86_64/stack.install 2017-07-26 09:18:26 UTC (rev 246417)
+++ community-x86_64/stack.install 2017-07-26 09:19:34 UTC (rev 246418)
@@ -1,4 +0,0 @@
-post_install() {
- echo "You need to either 1) install latest stable ghc package from [extra] or 2) install ncurses5-compat-libs from AUR for the prebuilt binaries installed by stack to work."
-}
-
Copied: stack/repos/community-x86_64/stack.install (from rev 246417, stack/trunk/stack.install)
===================================================================
--- community-x86_64/stack.install (rev 0)
+++ community-x86_64/stack.install 2017-07-26 09:19:34 UTC (rev 246418)
@@ -0,0 +1,4 @@
+post_install() {
+ echo "You need to either 1) install latest stable ghc package from [extra] or 2) install ncurses5-compat-libs from AUR for the prebuilt binaries installed by stack to work."
+}
+
More information about the arch-commits
mailing list