Date: Friday, August 4, 2017 @ 20:55:51 Author: felixonmars Revision: 248526
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: stack/repos/community-staging-i686/ stack/repos/community-staging-i686/PKGBUILD (from rev 248525, stack/trunk/PKGBUILD) stack/repos/community-staging-i686/path-0.6.1.patch (from rev 248525, stack/trunk/path-0.6.1.patch) stack/repos/community-staging-i686/stack.install (from rev 248525, stack/trunk/stack.install) stack/repos/community-staging-x86_64/ stack/repos/community-staging-x86_64/PKGBUILD (from rev 248525, stack/trunk/PKGBUILD) stack/repos/community-staging-x86_64/path-0.6.1.patch (from rev 248525, stack/trunk/path-0.6.1.patch) stack/repos/community-staging-x86_64/stack.install (from rev 248525, stack/trunk/stack.install) -------------------------------------------+ community-staging-i686/PKGBUILD | 82 ++++++++++++++++++++++++++++ community-staging-i686/path-0.6.1.patch | 49 ++++++++++++++++ community-staging-i686/stack.install | 4 + community-staging-x86_64/PKGBUILD | 82 ++++++++++++++++++++++++++++ community-staging-x86_64/path-0.6.1.patch | 49 ++++++++++++++++ community-staging-x86_64/stack.install | 4 + 6 files changed, 270 insertions(+) Copied: stack/repos/community-staging-i686/PKGBUILD (from rev 248525, stack/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2017-08-04 20:55:51 UTC (rev 248526) @@ -0,0 +1,82 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Arch Haskell Team <arch-hask...@haskell.org> + +pkgname=stack +pkgver=1.5.0 +pkgrel=16 +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 +} Copied: stack/repos/community-staging-i686/path-0.6.1.patch (from rev 248525, stack/trunk/path-0.6.1.patch) =================================================================== --- community-staging-i686/path-0.6.1.patch (rev 0) +++ community-staging-i686/path-0.6.1.patch 2017-08-04 20:55:51 UTC (rev 248526) @@ -0,0 +1,49 @@ +commit 06c987c7564b2ee7359462587a55c11fdb3d4f84 +Author: Felix Yan <felixonm...@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-staging-i686/stack.install (from rev 248525, stack/trunk/stack.install) =================================================================== --- community-staging-i686/stack.install (rev 0) +++ community-staging-i686/stack.install 2017-08-04 20:55:51 UTC (rev 248526) @@ -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." +} + Copied: stack/repos/community-staging-x86_64/PKGBUILD (from rev 248525, stack/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2017-08-04 20:55:51 UTC (rev 248526) @@ -0,0 +1,82 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Arch Haskell Team <arch-hask...@haskell.org> + +pkgname=stack +pkgver=1.5.0 +pkgrel=16 +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 +} Copied: stack/repos/community-staging-x86_64/path-0.6.1.patch (from rev 248525, stack/trunk/path-0.6.1.patch) =================================================================== --- community-staging-x86_64/path-0.6.1.patch (rev 0) +++ community-staging-x86_64/path-0.6.1.patch 2017-08-04 20:55:51 UTC (rev 248526) @@ -0,0 +1,49 @@ +commit 06c987c7564b2ee7359462587a55c11fdb3d4f84 +Author: Felix Yan <felixonm...@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-staging-x86_64/stack.install (from rev 248525, stack/trunk/stack.install) =================================================================== --- community-staging-x86_64/stack.install (rev 0) +++ community-staging-x86_64/stack.install 2017-08-04 20:55:51 UTC (rev 248526) @@ -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." +} +