summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Martin2015-09-07 22:16:40 -0500
committerStephen Martin2015-09-07 22:16:40 -0500
commit4a82af7f05585b5fe575c06a9c9ffc9eec129fbe (patch)
treebdc9b730af81de8f8754147faaff40d279a4cbbd
parente8467db9357013740408ce60d3ccfae6a91c2135 (diff)
downloadaur-4a82af7f05585b5fe575c06a9c9ffc9eec129fbe.tar.gz
Preparing for transition to rjson away from rjsonio
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--rbundle.R2
3 files changed, 5 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d724ae870ff..a156b37ba56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -102,7 +102,6 @@ pkgbase = jasp-rbundle
provides = r-cran-logspline
provides = r-cran-lsmeans
provides = r-cran-plotrix
- provides = r-cran-rjsonio
provides = r-cran-semtools
provides = r-cran-vcd
provides = r-cran-vcdextra
@@ -202,13 +201,12 @@ pkgbase = jasp-rbundle
conflicts = r-cran-logspline
conflicts = r-cran-lsmeans
conflicts = r-cran-plotrix
- conflicts = r-cran-rjsonio
conflicts = r-cran-semtools
conflicts = r-cran-vcd
conflicts = r-cran-vcdextra
conflicts = r-cran-gnm
source = rbundle.R
- md5sums = 85087ac1d6e0ffa885f4887c40985982
+ md5sums = d6e6072fc775909ce44462b2dd18a355
pkgname = jasp-rbundle
diff --git a/PKGBUILD b/PKGBUILD
index 4556da56be3..bf4d8fb5146 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,8 @@ source=("rbundle.R")
pkgver() {
echo $(date +%Y.%m.%d)
}
-provides=('r-cran-abind' 'r-cran-htmltools' 'r-cran-jsonlite' 'r-cran-yaml' 'r-cran-xtable' 'r-cran-iterators' 'r-cran-arm' 'r-cran-htmlwidgets' 'r-cran-rstudioapi' 'r-cran-rcolorbrewer' 'r-cran-dichromat' 'r-cran-labeling' 'r-cran-pkgmaker' 'r-cran-registry' 'r-cran-rngtools' 'r-cran-gridbase' 'r-cran-foreach' 'r-cran-doparallel' 'r-cran-stringi' 'r-cran-magrittr' 'r-cran-modeltools' 'r-cran-sparsem' 'r-cran-matrixcalc' 'r-cran-mi' 'r-cran-diagrammer' 'r-cran-formula' 'r-cran-proto' 'r-cran-scales' 'r-cran-latticeextra' 'r-cran-acepack' 'r-cran-gtable' 'r-cran-gridextra' 'r-cran-nmf' 'r-cran-irlba' 'r-cran-digest' 'r-cran-rjson' 'r-cran-whisker' 'r-cran-th.data' 'r-cran-sandwich' 'r-cran-zoo' 'r-cran-coda' 'r-cran-pbapply' 'r-cran-mvtnorm' 'r-cran-stringr' 'r-cran-gtools' 'r-cran-matrixmodels' 'r-cran-rcppeigen' 'r-cran-minqa' 'r-cran-nloptr' 'r-cran-reshape2' 'r-cran-coin' 'r-cran-pbkrtest' 'r-cran-quantreg' 'r-cran-colorspace' 'r-cran-psych' 'r-cran-ellipse' 'r-cran-sem' 'r-cran-plyr' 'r-cran-hmisc' 'r-cran-igraph' 'r-cran-jpeg' 'r-cran-png' 'r-cran-sna' 'r-cran-corpcor' 'r-cran-ggplot2' 'r-cran-glasso' 'r-cran-huge' 'r-cran-fdrtool' 'r-cran-d3network' 'r-cran-ggm' 'r-cran-elliptic' 'r-cran-contfrac' 'r-cran-desolve' 'r-cran-mnormt' 'r-cran-pbivnorm' 'r-cran-quadprog' 'r-cran-estimability' 'r-cran-multcomp' 'r-cran-lmtest' 'r-cran-qvcalc' 'r-cran-relimp' 'r-cran-bayesfactor' 'r-cran-lme4' 'r-cran-rcpp' 'r-cran-rinside' 'r-cran-afex' 'r-cran-base64' 'r-cran-car' 'r-cran-effects' 'r-cran-qgraph' 'r-cran-hypergeo' 'r-cran-lavaan' 'r-cran-logspline' 'r-cran-lsmeans' 'r-cran-plotrix' 'r-cran-rjsonio' 'r-cran-semtools' 'r-cran-vcd' 'r-cran-vcdextra' 'r-cran-gnm')
-conflicts=('r-cran-abind' 'r-cran-htmltools' 'r-cran-jsonlite' 'r-cran-yaml' 'r-cran-xtable' 'r-cran-iterators' 'r-cran-arm' 'r-cran-htmlwidgets' 'r-cran-rstudioapi' 'r-cran-rcolorbrewer' 'r-cran-dichromat' 'r-cran-labeling' 'r-cran-pkgmaker' 'r-cran-registry' 'r-cran-rngtools' 'r-cran-gridbase' 'r-cran-foreach' 'r-cran-doparallel' 'r-cran-stringi' 'r-cran-magrittr' 'r-cran-modeltools' 'r-cran-sparsem' 'r-cran-matrixcalc' 'r-cran-mi' 'r-cran-diagrammer' 'r-cran-formula' 'r-cran-proto' 'r-cran-scales' 'r-cran-latticeextra' 'r-cran-acepack' 'r-cran-gtable' 'r-cran-gridextra' 'r-cran-nmf' 'r-cran-irlba' 'r-cran-digest' 'r-cran-rjson' 'r-cran-whisker' 'r-cran-th.data' 'r-cran-sandwich' 'r-cran-zoo' 'r-cran-coda' 'r-cran-pbapply' 'r-cran-mvtnorm' 'r-cran-stringr' 'r-cran-gtools' 'r-cran-matrixmodels' 'r-cran-rcppeigen' 'r-cran-minqa' 'r-cran-nloptr' 'r-cran-reshape2' 'r-cran-coin' 'r-cran-pbkrtest' 'r-cran-quantreg' 'r-cran-colorspace' 'r-cran-psych' 'r-cran-ellipse' 'r-cran-sem' 'r-cran-plyr' 'r-cran-hmisc' 'r-cran-igraph' 'r-cran-jpeg' 'r-cran-png' 'r-cran-sna' 'r-cran-corpcor' 'r-cran-ggplot2' 'r-cran-glasso' 'r-cran-huge' 'r-cran-fdrtool' 'r-cran-d3network' 'r-cran-ggm' 'r-cran-elliptic' 'r-cran-contfrac' 'r-cran-desolve' 'r-cran-mnormt' 'r-cran-pbivnorm' 'r-cran-quadprog' 'r-cran-estimability' 'r-cran-multcomp' 'r-cran-lmtest' 'r-cran-qvcalc' 'r-cran-relimp' 'r-cran-bayesfactor' 'r-cran-lme4' 'r-cran-rcpp' 'r-cran-rinside' 'r-cran-afex' 'r-cran-base64' 'r-cran-car' 'r-cran-effects' 'r-cran-qgraph' 'r-cran-hypergeo' 'r-cran-lavaan' 'r-cran-logspline' 'r-cran-lsmeans' 'r-cran-plotrix' 'r-cran-rjsonio' 'r-cran-semtools' 'r-cran-vcd' 'r-cran-vcdextra' 'r-cran-gnm')
+provides=('r-cran-abind' 'r-cran-htmltools' 'r-cran-jsonlite' 'r-cran-yaml' 'r-cran-xtable' 'r-cran-iterators' 'r-cran-arm' 'r-cran-htmlwidgets' 'r-cran-rstudioapi' 'r-cran-rcolorbrewer' 'r-cran-dichromat' 'r-cran-labeling' 'r-cran-pkgmaker' 'r-cran-registry' 'r-cran-rngtools' 'r-cran-gridbase' 'r-cran-foreach' 'r-cran-doparallel' 'r-cran-stringi' 'r-cran-magrittr' 'r-cran-modeltools' 'r-cran-sparsem' 'r-cran-matrixcalc' 'r-cran-mi' 'r-cran-diagrammer' 'r-cran-formula' 'r-cran-proto' 'r-cran-scales' 'r-cran-latticeextra' 'r-cran-acepack' 'r-cran-gtable' 'r-cran-gridextra' 'r-cran-nmf' 'r-cran-irlba' 'r-cran-digest' 'r-cran-rjson' 'r-cran-whisker' 'r-cran-th.data' 'r-cran-sandwich' 'r-cran-zoo' 'r-cran-coda' 'r-cran-pbapply' 'r-cran-mvtnorm' 'r-cran-stringr' 'r-cran-gtools' 'r-cran-matrixmodels' 'r-cran-rcppeigen' 'r-cran-minqa' 'r-cran-nloptr' 'r-cran-reshape2' 'r-cran-coin' 'r-cran-pbkrtest' 'r-cran-quantreg' 'r-cran-colorspace' 'r-cran-psych' 'r-cran-ellipse' 'r-cran-sem' 'r-cran-plyr' 'r-cran-hmisc' 'r-cran-igraph' 'r-cran-jpeg' 'r-cran-png' 'r-cran-sna' 'r-cran-corpcor' 'r-cran-ggplot2' 'r-cran-glasso' 'r-cran-huge' 'r-cran-fdrtool' 'r-cran-d3network' 'r-cran-ggm' 'r-cran-elliptic' 'r-cran-contfrac' 'r-cran-desolve' 'r-cran-mnormt' 'r-cran-pbivnorm' 'r-cran-quadprog' 'r-cran-estimability' 'r-cran-multcomp' 'r-cran-lmtest' 'r-cran-qvcalc' 'r-cran-relimp' 'r-cran-bayesfactor' 'r-cran-lme4' 'r-cran-rcpp' 'r-cran-rinside' 'r-cran-afex' 'r-cran-base64' 'r-cran-car' 'r-cran-effects' 'r-cran-qgraph' 'r-cran-hypergeo' 'r-cran-lavaan' 'r-cran-logspline' 'r-cran-lsmeans' 'r-cran-plotrix' 'r-cran-semtools' 'r-cran-vcd' 'r-cran-vcdextra' 'r-cran-gnm')
+conflicts=('r-cran-abind' 'r-cran-htmltools' 'r-cran-jsonlite' 'r-cran-yaml' 'r-cran-xtable' 'r-cran-iterators' 'r-cran-arm' 'r-cran-htmlwidgets' 'r-cran-rstudioapi' 'r-cran-rcolorbrewer' 'r-cran-dichromat' 'r-cran-labeling' 'r-cran-pkgmaker' 'r-cran-registry' 'r-cran-rngtools' 'r-cran-gridbase' 'r-cran-foreach' 'r-cran-doparallel' 'r-cran-stringi' 'r-cran-magrittr' 'r-cran-modeltools' 'r-cran-sparsem' 'r-cran-matrixcalc' 'r-cran-mi' 'r-cran-diagrammer' 'r-cran-formula' 'r-cran-proto' 'r-cran-scales' 'r-cran-latticeextra' 'r-cran-acepack' 'r-cran-gtable' 'r-cran-gridextra' 'r-cran-nmf' 'r-cran-irlba' 'r-cran-digest' 'r-cran-rjson' 'r-cran-whisker' 'r-cran-th.data' 'r-cran-sandwich' 'r-cran-zoo' 'r-cran-coda' 'r-cran-pbapply' 'r-cran-mvtnorm' 'r-cran-stringr' 'r-cran-gtools' 'r-cran-matrixmodels' 'r-cran-rcppeigen' 'r-cran-minqa' 'r-cran-nloptr' 'r-cran-reshape2' 'r-cran-coin' 'r-cran-pbkrtest' 'r-cran-quantreg' 'r-cran-colorspace' 'r-cran-psych' 'r-cran-ellipse' 'r-cran-sem' 'r-cran-plyr' 'r-cran-hmisc' 'r-cran-igraph' 'r-cran-jpeg' 'r-cran-png' 'r-cran-sna' 'r-cran-corpcor' 'r-cran-ggplot2' 'r-cran-glasso' 'r-cran-huge' 'r-cran-fdrtool' 'r-cran-d3network' 'r-cran-ggm' 'r-cran-elliptic' 'r-cran-contfrac' 'r-cran-desolve' 'r-cran-mnormt' 'r-cran-pbivnorm' 'r-cran-quadprog' 'r-cran-estimability' 'r-cran-multcomp' 'r-cran-lmtest' 'r-cran-qvcalc' 'r-cran-relimp' 'r-cran-bayesfactor' 'r-cran-lme4' 'r-cran-rcpp' 'r-cran-rinside' 'r-cran-afex' 'r-cran-base64' 'r-cran-car' 'r-cran-effects' 'r-cran-qgraph' 'r-cran-hypergeo' 'r-cran-lavaan' 'r-cran-logspline' 'r-cran-lsmeans' 'r-cran-plotrix' 'r-cran-semtools' 'r-cran-vcd' 'r-cran-vcdextra' 'r-cran-gnm')
prepare(){
@@ -29,4 +29,4 @@ build(){
package(){
cp -r $srcdir/usr $pkgdir/
}
-md5sums=('85087ac1d6e0ffa885f4887c40985982')
+md5sums=('d6e6072fc775909ce44462b2dd18a355')
diff --git a/rbundle.R b/rbundle.R
index a988ff0ba0f..6039976f0da 100644
--- a/rbundle.R
+++ b/rbundle.R
@@ -9,7 +9,7 @@ print(path)
#List of R packages to be installed
libs <- c('BayesFactor','lme4','Rcpp','RInside','afex','base64','car','effects','qgraph','hypergeo','lavaan',
- 'logspline','lsmeans','plotrix','RJSONIO','semTools','vcd','vcdExtra','gnm')
+ 'logspline','lsmeans','plotrix','rjson','semTools','vcd','vcdExtra','gnm')
#They modified gnm