[arch-commits] Commit in stack/trunk (PKGBUILD path-0.6.1.patch)
Felix Yan
felixonmars at archlinux.org
Sat Sep 16 13:53:38 UTC 2017
Date: Saturday, September 16, 2017 @ 13:53:37
Author: felixonmars
Revision: 257812
upgpkg: stack 1.5.1.20170916-1
Modified:
stack/trunk/PKGBUILD
Deleted:
stack/trunk/path-0.6.1.patch
------------------+
PKGBUILD | 59 ++++++++++++++++++++---------------------------------
path-0.6.1.patch | 49 --------------------------------------------
2 files changed, 23 insertions(+), 85 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-09-16 13:53:05 UTC (rev 257811)
+++ PKGBUILD 2017-09-16 13:53:37 UTC (rev 257812)
@@ -3,50 +3,40 @@
# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
pkgname=stack
-pkgver=1.5.0
-pkgrel=29
+pkgver=1.5.1.20170916
+_commit=4de4a450e426f70a5e5f127d7e7568f556ec9404
+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"
+depends=('ghc-libs' "haskell-aeson" "haskell-annotated-wl-pprint" "haskell-ansi-terminal"
+ "haskell-attoparsec" "haskell-base64-bytestring" "haskell-bindings-uname"
+ "haskell-blaze-builder" "haskell-clock" "haskell-conduit" "haskell-conduit-extra"
+ "haskell-cryptonite" "haskell-cryptonite-conduit" "haskell-echo" "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-memory"
+ "haskell-microlens" "haskell-microlens-mtl" "haskell-mintty" "haskell-monad-logger"
+ "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-persistent-sqlite" "haskell-persistent-template" "haskell-pid1" "haskell-primitive"
"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")
+ "haskell-retry" "haskell-semigroups" "haskell-split" "haskell-stm" "haskell-store"
+ "haskell-store-core" "haskell-streaming-commons" "haskell-tar" "haskell-text"
+ "haskell-text-metrics" "haskell-tls" "haskell-unicode-transforms" "haskell-unix-compat"
+ "haskell-unliftio" "haskell-unordered-containers" "haskell-vector" "haskell-yaml"
+ "haskell-zip-archive" "haskell-zlib")
+makedepends=('ghc')
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')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/commercialhaskell/stack/archive/$_commit.tar.gz")
+sha512sums=('6bb019c61e89631d83704fe3215d2cb7c790d150ad5b8a2e8e3863ad644aea5306aa4bb02bd64f9a6164bf540f5b98d042f30712029e1f5e314a4b6766d2b931')
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/' \
- -e 's/, aeson (>= 1.0 && < 1.2)/, aeson (>= 1.0 \&\& < 1.3)/' \
- -i stack.cabal
+ mv $pkgname-$_commit $pkgname-$pkgver
}
build() {
@@ -57,7 +47,6 @@
--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
@@ -69,8 +58,6 @@
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"
Deleted: path-0.6.1.patch
===================================================================
--- path-0.6.1.patch 2017-09-16 13:53:05 UTC (rev 257811)
+++ path-0.6.1.patch 2017-09-16 13:53:37 UTC (rev 257812)
@@ -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
More information about the arch-commits
mailing list