Date: Monday, March 13, 2017 @ 03:46:11 Author: felixonmars Revision: 215999
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: purescript/repos/community-staging-i686/ purescript/repos/community-staging-i686/PKGBUILD (from rev 215998, purescript/trunk/PKGBUILD) purescript/repos/community-staging-i686/http-client-0.5.patch (from rev 215998, purescript/trunk/http-client-0.5.patch) purescript/repos/community-staging-x86_64/ purescript/repos/community-staging-x86_64/PKGBUILD (from rev 215998, purescript/trunk/PKGBUILD) purescript/repos/community-staging-x86_64/http-client-0.5.patch (from rev 215998, purescript/trunk/http-client-0.5.patch) ------------------------------------------------+ community-staging-i686/PKGBUILD | 57 ++++++++++++++ community-staging-i686/http-client-0.5.patch | 90 +++++++++++++++++++++++ community-staging-x86_64/PKGBUILD | 57 ++++++++++++++ community-staging-x86_64/http-client-0.5.patch | 90 +++++++++++++++++++++++ 4 files changed, 294 insertions(+) Copied: purescript/repos/community-staging-i686/PKGBUILD (from rev 215998, purescript/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2017-03-13 03:46:11 UTC (rev 215999) @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Arch Haskell Team <arch-hask...@haskell.org> + +pkgname=purescript +pkgver=0.10.7 +pkgrel=13 +pkgdesc="PureScript Programming Language Compiler" +url="http://www.purescript.org/" +license=("custom:BSD3") +arch=('i686' 'x86_64') +depends=('gmp' 'libffi' 'zlib') +makedepends=("ghc=8.0.1" "haskell-aeson" "haskell-aeson-better-errors" "haskell-aeson-pretty" + "haskell-ansi-terminal" "haskell-ansi-wl-pprint" "haskell-base-compat" + "haskell-blaze-html" "haskell-bower-json" "haskell-boxes" "haskell-cheapskate" + "haskell-clock" "haskell-data-ordlist" "haskell-dlist" "haskell-edit-distance" + "haskell-file-embed" "haskell-foldl" "haskell-fsnotify" "haskell-glob" + "haskell-http-client" "haskell-http-types" "haskell-language-javascript" + "haskell-lens" "haskell-lifted-base" "haskell-monad-control" "haskell-monad-logger" + "haskell-mtl" "haskell-optparse-applicative" "haskell-parallel" "haskell-parsec" + "haskell-pattern-arrows" "haskell-pipes" "haskell-pipes-http" "haskell-protolude" + "haskell-regex-tdfa" "haskell-safe" "haskell-semigroups" "haskell-sourcemap" + "haskell-spdx" "haskell-split" "haskell-stm" "haskell-syb" "haskell-system-filepath" + "haskell-text" "haskell-transformers-base" "haskell-transformers-compat" + "haskell-turtle" "haskell-unordered-containers" "haskell-utf8-string" + "haskell-vector" "haskell-wai" "haskell-wai-websockets" "haskell-warp" + "haskell-websockets") +optdepends=('pulp: for development environment') +source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + http-client-0.5.patch) +sha256sums=('85dff2f4b6916e9d45b6a1b2674dc6c91c56ac6c1597f627d5f1cbee9d0b3a9d' + '2e8ac0165d8dfde7f2ec27f4b77fb4139a435cf2148d3853ec95455334601b03') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../http-client-0.5.patch + + sed -e 's/pipes >= 4.0.0 && < 4.3.0,/pipes >= 4.0.0 \&\& < 4.4.0,/' \ + -e 's/websockets >= 0.9 && <0.10/websockets >= 0.9 \&\& <0.11/' \ + -e 's/aeson >= 0.8 && < 1.0,/aeson >= 0.8,/' \ + -i purescript.cabal +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + runhaskell Setup configure -O --enable-library-profiling --enable-shared \ + --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgbase" \ + --libsubdir=\$compiler/site-local/\$pkgid + LC_CTYPE=en_US.UTF-8 runhaskell Setup build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + runhaskell Setup copy --destdir="${pkgdir}" + rm -r "$pkgdir"/usr/{lib,share} +} Copied: purescript/repos/community-staging-i686/http-client-0.5.patch (from rev 215998, purescript/trunk/http-client-0.5.patch) =================================================================== --- community-staging-i686/http-client-0.5.patch (rev 0) +++ community-staging-i686/http-client-0.5.patch 2017-03-13 03:46:11 UTC (rev 215999) @@ -0,0 +1,90 @@ +From e0527fb7f10721870014d7c08b1a2f8f5bf2edcf Mon Sep 17 00:00:00 2001 +From: Oleg Grenrus <oleg.gren...@iki.fi> +Date: Mon, 22 Aug 2016 17:51:42 +0300 +Subject: [PATCH] Support http-client-0.5 + +--- + purescript.cabal | 2 +- + src/Language/PureScript/Ide/Pursuit.hs | 44 ++++++++++++++++------------------ + stack.yaml | 5 +++- + 3 files changed, 25 insertions(+), 26 deletions(-) + +diff --git a/purescript.cabal b/purescript.cabal +index 71fee5d..505e441 100644 +--- a/purescript.cabal ++++ b/purescript.cabal +@@ -117,7 +117,7 @@ library + fsnotify >= 0.2.1, + Glob >= 0.7 && < 0.8, + haskeline >= 0.7.0.0, +- http-client >= 0.4.30 && <0.5, ++ http-client >= 0.4.30 && <0.6, + http-types -any, + language-javascript == 0.6.*, + lifted-base >= 0.2.3 && < 0.2.4, +diff --git a/src/Language/PureScript/Ide/Pursuit.hs b/src/Language/PureScript/Ide/Pursuit.hs +index 962f573..ae40238 100644 +--- a/src/Language/PureScript/Ide/Pursuit.hs ++++ b/src/Language/PureScript/Ide/Pursuit.hs +@@ -35,41 +35,37 @@ import qualified Pipes.Prelude as P + -- TODO: remove this when the issue is fixed at Pursuit + queryPursuit :: Text -> IO ByteString + queryPursuit q = do +- let qClean = T.dropWhileEnd (== '.') q +- req' <- parseRequest "https://pursuit.purescript.org/search" +- let req = req' +- { queryString= "q=" <> (fromString . T.unpack) qClean +- , requestHeaders=[(hAccept, "application/json")] +- } +- m <- newManager tlsManagerSettings +- withHTTP req m $ \resp -> +- P.fold (<>) "" identity (responseBody resp) +- ++ let qClean = T.dropWhileEnd (== '.') q ++ req' <- parseRequest "https://pursuit.purescript.org/search" ++ let req = req' ++ { queryString= "q=" <> (fromString . T.unpack) qClean ++ , requestHeaders=[(hAccept, "application/json")] ++ } ++ m <- newManager tlsManagerSettings ++ withHTTP req m $ \resp -> ++ P.fold (<>) "" identity (responseBody resp) + + handler :: HttpException -> IO [a] +-handler StatusCodeException{} = pure [] + handler _ = pure [] + + searchPursuitForDeclarations :: Text -> IO [PursuitResponse] +-searchPursuitForDeclarations query = +- (do r <- queryPursuit query +- let results' = decode (fromStrict r) :: Maybe Array +- case results' of +- Nothing -> pure [] +- Just results -> pure (mapMaybe (isDeclarationResponse . fromJSON) (toList results))) `E.catch` +- handler ++searchPursuitForDeclarations query = E.handle handler $ do ++ r <- queryPursuit query ++ let results' = decode (fromStrict r) :: Maybe Array ++ case results' of ++ Nothing -> pure [] ++ Just results -> pure (mapMaybe (isDeclarationResponse . fromJSON) (toList results)) + where + isDeclarationResponse (Success a@DeclarationResponse{}) = Just a + isDeclarationResponse _ = Nothing + + findPackagesForModuleIdent :: Text -> IO [PursuitResponse] +-findPackagesForModuleIdent query = +- (do r <- queryPursuit query +- let results' = decode (fromStrict r) :: Maybe Array +- case results' of ++findPackagesForModuleIdent query = E.handle handler $ do ++ r <- queryPursuit query ++ let results' = decode (fromStrict r) :: Maybe Array ++ case results' of + Nothing -> pure [] +- Just results -> pure (mapMaybe (isModuleResponse . fromJSON) (toList results))) `E.catch` +- handler ++ Just results -> pure (mapMaybe (isModuleResponse . fromJSON) (toList results)) + where + isModuleResponse (Success a@ModuleResponse{}) = Just a + isModuleResponse _ = Nothing Copied: purescript/repos/community-staging-x86_64/PKGBUILD (from rev 215998, purescript/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2017-03-13 03:46:11 UTC (rev 215999) @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Arch Haskell Team <arch-hask...@haskell.org> + +pkgname=purescript +pkgver=0.10.7 +pkgrel=13 +pkgdesc="PureScript Programming Language Compiler" +url="http://www.purescript.org/" +license=("custom:BSD3") +arch=('i686' 'x86_64') +depends=('gmp' 'libffi' 'zlib') +makedepends=("ghc=8.0.1" "haskell-aeson" "haskell-aeson-better-errors" "haskell-aeson-pretty" + "haskell-ansi-terminal" "haskell-ansi-wl-pprint" "haskell-base-compat" + "haskell-blaze-html" "haskell-bower-json" "haskell-boxes" "haskell-cheapskate" + "haskell-clock" "haskell-data-ordlist" "haskell-dlist" "haskell-edit-distance" + "haskell-file-embed" "haskell-foldl" "haskell-fsnotify" "haskell-glob" + "haskell-http-client" "haskell-http-types" "haskell-language-javascript" + "haskell-lens" "haskell-lifted-base" "haskell-monad-control" "haskell-monad-logger" + "haskell-mtl" "haskell-optparse-applicative" "haskell-parallel" "haskell-parsec" + "haskell-pattern-arrows" "haskell-pipes" "haskell-pipes-http" "haskell-protolude" + "haskell-regex-tdfa" "haskell-safe" "haskell-semigroups" "haskell-sourcemap" + "haskell-spdx" "haskell-split" "haskell-stm" "haskell-syb" "haskell-system-filepath" + "haskell-text" "haskell-transformers-base" "haskell-transformers-compat" + "haskell-turtle" "haskell-unordered-containers" "haskell-utf8-string" + "haskell-vector" "haskell-wai" "haskell-wai-websockets" "haskell-warp" + "haskell-websockets") +optdepends=('pulp: for development environment') +source=("https://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + http-client-0.5.patch) +sha256sums=('85dff2f4b6916e9d45b6a1b2674dc6c91c56ac6c1597f627d5f1cbee9d0b3a9d' + '2e8ac0165d8dfde7f2ec27f4b77fb4139a435cf2148d3853ec95455334601b03') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../http-client-0.5.patch + + sed -e 's/pipes >= 4.0.0 && < 4.3.0,/pipes >= 4.0.0 \&\& < 4.4.0,/' \ + -e 's/websockets >= 0.9 && <0.10/websockets >= 0.9 \&\& <0.11/' \ + -e 's/aeson >= 0.8 && < 1.0,/aeson >= 0.8,/' \ + -i purescript.cabal +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + runhaskell Setup configure -O --enable-library-profiling --enable-shared \ + --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgbase" \ + --libsubdir=\$compiler/site-local/\$pkgid + LC_CTYPE=en_US.UTF-8 runhaskell Setup build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + runhaskell Setup copy --destdir="${pkgdir}" + rm -r "$pkgdir"/usr/{lib,share} +} Copied: purescript/repos/community-staging-x86_64/http-client-0.5.patch (from rev 215998, purescript/trunk/http-client-0.5.patch) =================================================================== --- community-staging-x86_64/http-client-0.5.patch (rev 0) +++ community-staging-x86_64/http-client-0.5.patch 2017-03-13 03:46:11 UTC (rev 215999) @@ -0,0 +1,90 @@ +From e0527fb7f10721870014d7c08b1a2f8f5bf2edcf Mon Sep 17 00:00:00 2001 +From: Oleg Grenrus <oleg.gren...@iki.fi> +Date: Mon, 22 Aug 2016 17:51:42 +0300 +Subject: [PATCH] Support http-client-0.5 + +--- + purescript.cabal | 2 +- + src/Language/PureScript/Ide/Pursuit.hs | 44 ++++++++++++++++------------------ + stack.yaml | 5 +++- + 3 files changed, 25 insertions(+), 26 deletions(-) + +diff --git a/purescript.cabal b/purescript.cabal +index 71fee5d..505e441 100644 +--- a/purescript.cabal ++++ b/purescript.cabal +@@ -117,7 +117,7 @@ library + fsnotify >= 0.2.1, + Glob >= 0.7 && < 0.8, + haskeline >= 0.7.0.0, +- http-client >= 0.4.30 && <0.5, ++ http-client >= 0.4.30 && <0.6, + http-types -any, + language-javascript == 0.6.*, + lifted-base >= 0.2.3 && < 0.2.4, +diff --git a/src/Language/PureScript/Ide/Pursuit.hs b/src/Language/PureScript/Ide/Pursuit.hs +index 962f573..ae40238 100644 +--- a/src/Language/PureScript/Ide/Pursuit.hs ++++ b/src/Language/PureScript/Ide/Pursuit.hs +@@ -35,41 +35,37 @@ import qualified Pipes.Prelude as P + -- TODO: remove this when the issue is fixed at Pursuit + queryPursuit :: Text -> IO ByteString + queryPursuit q = do +- let qClean = T.dropWhileEnd (== '.') q +- req' <- parseRequest "https://pursuit.purescript.org/search" +- let req = req' +- { queryString= "q=" <> (fromString . T.unpack) qClean +- , requestHeaders=[(hAccept, "application/json")] +- } +- m <- newManager tlsManagerSettings +- withHTTP req m $ \resp -> +- P.fold (<>) "" identity (responseBody resp) +- ++ let qClean = T.dropWhileEnd (== '.') q ++ req' <- parseRequest "https://pursuit.purescript.org/search" ++ let req = req' ++ { queryString= "q=" <> (fromString . T.unpack) qClean ++ , requestHeaders=[(hAccept, "application/json")] ++ } ++ m <- newManager tlsManagerSettings ++ withHTTP req m $ \resp -> ++ P.fold (<>) "" identity (responseBody resp) + + handler :: HttpException -> IO [a] +-handler StatusCodeException{} = pure [] + handler _ = pure [] + + searchPursuitForDeclarations :: Text -> IO [PursuitResponse] +-searchPursuitForDeclarations query = +- (do r <- queryPursuit query +- let results' = decode (fromStrict r) :: Maybe Array +- case results' of +- Nothing -> pure [] +- Just results -> pure (mapMaybe (isDeclarationResponse . fromJSON) (toList results))) `E.catch` +- handler ++searchPursuitForDeclarations query = E.handle handler $ do ++ r <- queryPursuit query ++ let results' = decode (fromStrict r) :: Maybe Array ++ case results' of ++ Nothing -> pure [] ++ Just results -> pure (mapMaybe (isDeclarationResponse . fromJSON) (toList results)) + where + isDeclarationResponse (Success a@DeclarationResponse{}) = Just a + isDeclarationResponse _ = Nothing + + findPackagesForModuleIdent :: Text -> IO [PursuitResponse] +-findPackagesForModuleIdent query = +- (do r <- queryPursuit query +- let results' = decode (fromStrict r) :: Maybe Array +- case results' of ++findPackagesForModuleIdent query = E.handle handler $ do ++ r <- queryPursuit query ++ let results' = decode (fromStrict r) :: Maybe Array ++ case results' of + Nothing -> pure [] +- Just results -> pure (mapMaybe (isModuleResponse . fromJSON) (toList results))) `E.catch` +- handler ++ Just results -> pure (mapMaybe (isModuleResponse . fromJSON) (toList results)) + where + isModuleResponse (Success a@ModuleResponse{}) = Just a + isModuleResponse _ = Nothing