From d563e05a192b16ba026df72d88e59c31e402c124 Mon Sep 17 00:00:00 2001 From: J0WI Date: Fri, 10 Apr 2020 22:12:21 +0200 Subject: community/shellcheck: upgrade to 0.7.1 --- community/shellcheck/APKBUILD | 66 +++++++++++++++++++-------------------- community/shellcheck/cabal.config | 53 ++++++++++++++----------------- 2 files changed, 56 insertions(+), 63 deletions(-) (limited to 'community/shellcheck') diff --git a/community/shellcheck/APKBUILD b/community/shellcheck/APKBUILD index 2a05f2b8ae..0f67bd81a2 100644 --- a/community/shellcheck/APKBUILD +++ b/community/shellcheck/APKBUILD @@ -1,14 +1,12 @@ # Maintainer: Olliver Schinagl pkgname=shellcheck -pkgver=0.7.0 -pkgrel=1 +pkgver=0.7.1 +pkgrel=0 pkgdesc="a static analysis tool for shell scripts" url="https://github.com/koalaman/shellcheck" arch="x86_64" # Limited by GHC / Cabal -# Fails to build shellcheck.1 -arch="" license="GPL-3.0" -makedepends="cabal ghc" +makedepends="cabal bash ghc" subpackages="$pkgname-doc" source=" $pkgname-$pkgver.tar.gz::https://github.com/koalaman/shellcheck/archive/v$pkgver.tar.gz @@ -20,11 +18,10 @@ cabal_update() { msg "Freezing $pkgname dependencies" # Resolve deps and generate fresh cabal.config with version constraints. - HOME="$_cabal_home" cabal update + HOME="$_cabal_home" cabal v1-update ( cd "$builddir" - unlink "cabal.config" - HOME="$_cabal_home" cabal freeze --shadow-installed-packages + HOME="$_cabal_home" cabal v1-freeze --shadow-installed-packages # Add version tag at the first line. sed -i "1i--$pkgver" "cabal.config" @@ -39,6 +36,7 @@ cabal_update() { prepare() { default_prepare + ./striptests if [ "$(head -n 1 "$srcdir/cabal.config")" != "--$pkgver" ]; then die "Requirements file is outdated, run 'abuild cabal_update'" @@ -48,27 +46,27 @@ prepare() { } build() { - HOME="$_cabal_home" cabal update - HOME="$_cabal_home" cabal install \ - --disable-documentation \ - --only-dependencies - HOME="$_cabal_home" cabal configure \ - --prefix='/usr' \ - --bindir='$prefix/bin' \ - --docdir='$prefix/share/doc' \ - --datadir='$prefix/share' \ - --htmldir='$docdir/html' \ - --libdir='$prefix/lib' \ - --libsubdir="$pkgname" \ - --datasubdir="$pkgname" \ - --dynlibdir="$pkgname" \ - --sysconfdir='/etc' \ - --disable-library-profiling \ - --disable-profiling \ - --disable-shared \ - --enable-executable-stripping \ - --flags='GMP FFI standalone' - HOME="$_cabal_home" cabal build + HOME="$_cabal_home" cabal v1-update + HOME="$_cabal_home" cabal v1-install \ + --disable-documentation \ + --only-dependencies + HOME="$_cabal_home" cabal v1-configure \ + --prefix='/usr' \ + --bindir='$prefix/bin' \ + --docdir='$prefix/share/doc' \ + --datadir='$prefix/share' \ + --htmldir='$docdir/html' \ + --libdir='$prefix/lib' \ + --libsubdir="$pkgname" \ + --datasubdir="$pkgname" \ + --dynlibdir="$pkgname" \ + --sysconfdir='/etc' \ + --disable-library-profiling \ + --disable-profiling \ + --disable-shared \ + --enable-executable-stripping \ + --flags='GMP FFI standalone' + HOME="$_cabal_home" cabal v1-build -j } check() { @@ -77,15 +75,15 @@ check() { echo "#!/bin/sh" echo echo "exit 0" - } > "${_test_script}" + } > "$_test_script" trap 'rm "$_test_script"' EXIT "$builddir/dist/build/$pkgname/$pkgname" "$_test_script" trap - EXIT - rm "${_test_script}" + rm "$_test_script" } package() { - HOME="$_cabal_home" cabal copy --destdir="$pkgdir" + HOME="$_cabal_home" cabal v1-copy --destdir="$pkgdir" rm -r "$pkgdir/usr/lib/$pkgname" @@ -93,5 +91,5 @@ package() { mv "$pkgdir/usr/share/doc/LICENSE" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="46ef486dff09bd51bdc5f053b1dda9e3f2943c66bbf6788824ddf8fcf3b69b7a3a9c00bf98bca0dee9d57ee6df833ca4088252dbf773815248be0fa667f35215 shellcheck-0.7.0.tar.gz -0107fd97537abd1d36e9ac049c57202967f74444c6ac12e4a253f4248a9128f32f4dedd1fce6c37b3210404586dc46d70f34739bc7b6d3fb2a7cbd164fea58e9 cabal.config" +sha512sums="95ca827f50035e352eabfbee9eb1791278f7c18c10c3a6c2656c5b9e87396b7b6c088f4cefa3d6f954ac6c2765ea50e232985b9f3eeea2dbe77c17473cc4a437 shellcheck-0.7.1.tar.gz +d430254e469108d11e1973df732a1866d1204e91938947a7de59520da709ed5810457b75802351cad38193d0b136625b138cb15002cac1079f31d87a85ce3d60 cabal.config" diff --git a/community/shellcheck/cabal.config b/community/shellcheck/cabal.config index 306deb865a..356aa27416 100644 --- a/community/shellcheck/cabal.config +++ b/community/shellcheck/cabal.config @@ -1,47 +1,42 @@ ---0.7.0 -constraints: Cabal ==2.2.0.1, - Diff ==0.4.0, - QuickCheck ==2.13.2, - StateVar ==1.2, - aeson ==1.4.6.0, - array ==0.5.2.0, - attoparsec ==0.13.2.3, - base ==4.11.1.0, - base-compat ==0.11.0, - base-orphans ==0.8.1, - binary ==0.8.5.1, +--0.7.1 +constraints: Diff ==0.4.0, + aeson ==1.4.7.1, + array ==0.5.3.0, + attoparsec ==0.13.2.4, + base ==4.12.0.0, + base-compat ==0.11.1, + base-compat-batteries ==0.11.1, + base-orphans ==0.8.2, + binary ==0.8.6.0, bytestring ==0.10.8.2, - containers ==0.5.11.0, - contravariant ==1.5.2, - deepseq ==1.4.3.0, - directory ==1.3.1.5, - dlist ==0.8.0.7, - filepath ==1.4.2, - ghc-boot-th ==8.4.4, - ghc-prim ==0.5.2.0, + containers ==0.6.0.1, + deepseq ==1.4.4.0, + directory ==1.3.3.0, + dlist ==0.8.0.8, + filepath ==1.4.2.1, + ghc-boot-th ==8.6.5, + ghc-prim ==0.5.3, hashable ==1.3.0.0, integer-gmp ==1.0.2.0, integer-logarithms ==1.0.3, mtl ==2.2.2, parsec ==3.1.13.0, pretty ==1.1.3.6, - primitive ==0.7.0.0, - process ==1.6.3.0, + primitive ==0.7.0.1, + process ==1.6.5.0, random ==1.1, regex-base ==0.94.0.0, regex-tdfa ==1.3.1.0, rts ==1.0, scientific ==0.3.6.2, - splitmix ==0.0.3, - stm ==2.4.5.1, tagged ==0.8.6, - template-haskell ==2.13.0.0, + template-haskell ==2.14.0.0, text ==1.2.3.1, - th-abstraction ==0.3.1.0, + th-abstraction ==0.3.2.0, time ==1.8.0.2, - time-compat ==1.9.2.2, - transformers ==0.5.5.0, + time-compat ==1.9.3, + transformers ==0.5.6.2, unix ==2.7.2.2, unordered-containers ==0.2.10.0, uuid-types ==1.0.3, - vector ==0.12.0.3 + vector ==0.12.1.2 -- cgit v1.2.3