diff --git a/BioArchLinux/r-dbitest/PKGBUILD b/BioArchLinux/r-dbitest/PKGBUILD index fb56925a1e..727c1d7c68 100644 --- a/BioArchLinux/r-dbitest/PKGBUILD +++ b/BioArchLinux/r-dbitest/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Pekka Ristola _pkgname=DBItest -_pkgver=1.7.3 +_pkgver=1.8.0 pkgname=r-${_pkgname,,} pkgver=${_pkgver//-/.} -pkgrel=2 +pkgrel=0 pkgdesc="Testing DBI Backends" arch=(any) url="https://cran.r-project.org/package=$_pkgname" @@ -16,8 +16,9 @@ depends=( r-desc r-hms r-lubridate + r-magrittr + r-nanoarrow r-palmerpenguins - r-r6 r-rlang r-testthat r-vctrs @@ -25,17 +26,19 @@ depends=( ) optdepends=( r-clipr - r-dblog + r-constructive r-debugme r-devtools + r-dplyr r-knitr r-lintr + r-pkgload r-rmarkdown r-rsqlite ) source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -md5sums=('a43445d47911fa2d62ec63c653522354') -b2sums=('91f6845cfe4935e9050b90d65ce24537c19823c62dd3e24b9a877ea0f080373bf8b972c8a87d435de4ac941a1e9019fd62bebf6f840c7ea7e5ab4d3a8570a0a5') +md5sums=('c30ed34e11c4e2e44ecb051fad564b66') +b2sums=('06bf87c55f921fa832f96968334932c59dcdd810eeeadeb1837ff4258cecd6c7b921053e84eb31356ea1ec7186a7b31f6e27a55da961b147f3fad352cfc68730') build() { mkdir build diff --git a/BioArchLinux/r-dbitest/lilac.yaml b/BioArchLinux/r-dbitest/lilac.yaml index efd03b41a5..d3fcfe7ca7 100644 --- a/BioArchLinux/r-dbitest/lilac.yaml +++ b/BioArchLinux/r-dbitest/lilac.yaml @@ -9,8 +9,9 @@ repo_depends: - r-desc - r-hms - r-lubridate +- r-magrittr +- r-nanoarrow - r-palmerpenguins -- r-r6 - r-rlang - r-testthat - r-vctrs diff --git a/BioArchLinux/r-gemma.r/lilac.py b/BioArchLinux/r-gemma.r/lilac.py index 46d51a28d6..b5cdb057c5 100644 --- a/BioArchLinux/r-gemma.r/lilac.py +++ b/BioArchLinux/r-gemma.r/lilac.py @@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions')) from lilac_r_utils import r_pre_build def pre_build(): - r_pre_build( - _G, - expect_license = "Apache License (>= 2)", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-nanoarrow/PKGBUILD b/BioArchLinux/r-nanoarrow/PKGBUILD new file mode 100644 index 0000000000..66e1f0c7e8 --- /dev/null +++ b/BioArchLinux/r-nanoarrow/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Pekka Ristola + +_pkgname=nanoarrow +_pkgver=0.3.0.1 +pkgname=r-${_pkgname,,} +pkgver=${_pkgver//-/.} +pkgrel=1 +pkgdesc="Interface to the 'nanoarrow' 'C' Library" +arch=(x86_64) +url="https://cran.r-project.org/package=$_pkgname" +license=(Apache) +depends=( + r +) +checkdepends=( + r-bit64 + r-blob + r-hms + r-testthat +) +optdepends=( + r-arrow + r-bit64 + r-blob + r-hms + r-rlang + r-testthat + r-tibble + r-vctrs + r-withr +) +source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz") +md5sums=('7937fd861a963d997d34119d1debb469') +b2sums=('0810244661fa50e44f1fbca77bef733f52f4b841d7dfc04b1e1604ae05d35ac4d7702980f8e5ca776128c243acff5dac99dbc328d4d8b8d1f4ceae7723b9cfda') + +build() { + mkdir build + R CMD INSTALL -l build "$_pkgname" +} + +check() { + cd "$_pkgname/tests" + R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R +} + +package() { + install -d "$pkgdir/usr/lib/R/library" + cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library" +} diff --git a/BioArchLinux/r-nanoarrow/lilac.py b/BioArchLinux/r-nanoarrow/lilac.py new file mode 100644 index 0000000000..b5cdb057c5 --- /dev/null +++ b/BioArchLinux/r-nanoarrow/lilac.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python3 +from lilaclib import * + +import os +import sys +sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions')) +from lilac_r_utils import r_pre_build + +def pre_build(): + r_pre_build(_G) + +def post_build(): + git_pkgbuild_commit() + update_aur_repo() diff --git a/BioArchLinux/r-nanoarrow/lilac.yaml b/BioArchLinux/r-nanoarrow/lilac.yaml new file mode 100644 index 0000000000..cc8d4f770d --- /dev/null +++ b/BioArchLinux/r-nanoarrow/lilac.yaml @@ -0,0 +1,15 @@ +build_prefix: extra-x86_64 +maintainers: +- github: pekkarr + email: pekkarr@protonmail.com +repo_makedepends: +- r-bit64 +- r-blob +- r-hms +- r-testthat +update_on: +- source: rpkgs + pkgname: nanoarrow + repo: cran + md5: true +- alias: r diff --git a/BioArchLinux/r-raids/lilac.py b/BioArchLinux/r-raids/lilac.py index 46d51a28d6..b5cdb057c5 100644 --- a/BioArchLinux/r-raids/lilac.py +++ b/BioArchLinux/r-raids/lilac.py @@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions')) from lilac_r_utils import r_pre_build def pre_build(): - r_pre_build( - _G, - expect_license = "Apache License (>= 2)", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py index 02bb3769b8..3b9be2879e 100644 --- a/lilac-extensions/lilac_r_utils.py +++ b/lilac-extensions/lilac_r_utils.py @@ -188,6 +188,7 @@ license_map = { "AGPL-3": "AGPL3", "Apache License": "Apache", "Apache License (== 2.0)": "Apache", + "Apache License (>= 2)": "Apache", "Apache License (>= 2.0)": "Apache", "Apache License 2.0": "Apache", "Artistic-2.0": "Artistic2.0",