diff --git a/BioArchLinux/r-m3drop/PKGBUILD b/BioArchLinux/r-m3drop/PKGBUILD index 88ab62c1fa..a109d16660 100644 --- a/BioArchLinux/r-m3drop/PKGBUILD +++ b/BioArchLinux/r-m3drop/PKGBUILD @@ -1,16 +1,15 @@ # Maintainer: Guoyi Zhang _pkgname=M3Drop -_pkgver=1.28.0 +_pkgver=1.28.8 pkgname=r-${_pkgname,,} -pkgver=1.28.0 -pkgrel=1 -pkgdesc='Michaelis-Menten Modelling of Dropouts in single-cell RNASeq' -arch=('any') -url="https://bioconductor.org/packages/${_pkgname}" -license=('GPL') +pkgver=${_pkgver//-/.} +pkgrel=0 +pkgdesc="Michaelis-Menten Modelling of Dropouts in single-cell RNASeq" +arch=(any) +url="https://bioconductor.org/packages/$_pkgname" +license=('GPL-2.0-or-later') depends=( - r r-bbmle r-gplots r-hmisc @@ -19,27 +18,27 @@ depends=( r-numderiv r-rcolorbrewer r-reldist + r-scater r-statmod ) optdepends=( r-biobase r-knitr r-m3dexampledata - r-monocle r-rocr - r-scater r-seurat r-singlecellexperiment ) source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('7fde2f66d62efe74b514c50ae584beb7ac4f79e9e67f2783a390c3c3262ac476') +md5sums=('cffb60b3200abaaad64e2d179376679a') +b2sums=('bb47683ea9057372517bb26ecfe6ab3b40a179ba856be63dbdde7c4bf4f78c144dfa5794b30351d469faa94bafc64b8c99447de7583e529e17069844c5d472f0') build() { - R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}" + mkdir build + R CMD INSTALL -l build "$_pkgname" } package() { - install -dm0755 "${pkgdir}/usr/lib/R/library" - cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library" + install -d "$pkgdir/usr/lib/R/library" + cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library" } -# vim:set ts=2 sw=2 et: diff --git a/BioArchLinux/r-m3drop/lilac.py b/BioArchLinux/r-m3drop/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-m3drop/lilac.py +++ b/BioArchLinux/r-m3drop/lilac.py @@ -1,12 +1,13 @@ #!/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(): - for line in edit_file('PKGBUILD'): - if line.startswith('_pkgver='): - line = f'_pkgver={_G.newver}' - print(line) - update_pkgver_and_pkgrel(_G.newver.replace(':', '.').replace('-', '.')) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-m3drop/lilac.yaml b/BioArchLinux/r-m3drop/lilac.yaml index b7e730eba4..9d1b395af0 100644 --- a/BioArchLinux/r-m3drop/lilac.yaml +++ b/BioArchLinux/r-m3drop/lilac.yaml @@ -11,9 +11,11 @@ repo_depends: - r-numderiv - r-rcolorbrewer - r-reldist +- r-scater - r-statmod update_on: -- regex: M3Drop_([\d._-]+).tar.gz - source: regex - url: https://bioconductor.org/packages/M3Drop +- source: rpkgs + pkgname: M3Drop + repo: bioc + md5: true - alias: r