* [PR PATCH] R cran updates
@ 2022-09-06 2:53 CameronNemo
2022-09-06 3:05 ` [PR PATCH] [Updated] " CameronNemo
2022-09-06 14:41 ` [PR PATCH] [Merged]: " sgn
0 siblings, 2 replies; 4+ messages in thread
From: CameronNemo @ 2022-09-06 2:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is a new pull request by CameronNemo against master on the void-packages repository
https://github.com/CameronNemo/void-packages R-cran-updates
https://github.com/void-linux/void-packages/pull/39128
R cran updates
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39128.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-R-cran-updates-39128.patch --]
[-- Type: text/x-diff, Size: 39959 bytes --]
From bc9285f05a89ea2afabb27a8f3f3c9cc342534ad Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 6 Aug 2022 04:54:05 +0200
Subject: [PATCH 01/28] xbps-src: clean up fetch hook and allow mirroring
---
common/environment/build-style/R-cran.sh | 3 +-
common/hooks/do-fetch/00-distfiles.sh | 201 ++++++++++++-----------
srcpkgs/R-cran-pillar/template | 3 +-
3 files changed, 110 insertions(+), 97 deletions(-)
diff --git a/common/environment/build-style/R-cran.sh b/common/environment/build-style/R-cran.sh
index ded66793396b..905c3b9dc0c7 100644
--- a/common/environment/build-style/R-cran.sh
+++ b/common/environment/build-style/R-cran.sh
@@ -4,5 +4,6 @@ wrksrc="${XBPS_BUILDDIR}/${pkgname#R-cran-}"
# default to cran
if [ -z "$distfiles" ]; then
- distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
+ distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz
+ https://cran.r-project.org/src/contrib/Archive/${pkgname#R-cran-}/${pkgname#R-cran-}_${version//r/-}.tar.gz"
fi
diff --git a/common/hooks/do-fetch/00-distfiles.sh b/common/hooks/do-fetch/00-distfiles.sh
index e2bf54378fe0..5fa394c9c790 100644
--- a/common/hooks/do-fetch/00-distfiles.sh
+++ b/common/hooks/do-fetch/00-distfiles.sh
@@ -2,24 +2,6 @@
# the $distfiles variable and then verifies its sha256 checksum comparing
# its value with the one stored in the $checksum variable.
-# Get the checksum for $curfile at index $dfcount
-get_cksum() {
- local curfile="$1" dfcount="$2" ckcount cksum i
-
- ckcount=0
- cksum=0
- for i in ${checksum}; do
- if [ $dfcount -eq $ckcount -a -n "$i" ]; then
- cksum=$i
- fi
- ckcount=$((ckcount + 1))
- done
- if [ -z "$cksum" ]; then
- msg_error "$pkgver: cannot find checksum for $curfile.\n"
- fi
- echo "$cksum"
-}
-
# Return the checksum of the contents of a tarball
contents_cksum() {
local curfile="$1" cursufx cksum
@@ -110,9 +92,7 @@ contents_cksum() {
# Verify the checksum for $curfile stored at $distfile and index $dfcount
verify_cksum() {
- local curfile="$1" distfile="$2" dfcount="$3" filesum cksum
-
- cksum=$(get_cksum $curfile $dfcount)
+ local curfile="$1" distfile="$2" cksum="$3" filesum
# If the checksum starts with an commercial at (@) it is the contents checksum
if [ "${cksum:0:1}" = "@" ]; then
@@ -121,7 +101,7 @@ verify_cksum() {
filesum=$(contents_cksum "$curfile")
if [ "${cksum}" != "$filesum" ]; then
echo
- msg_red "SHA256 mismatch for '$curfile:'\n@$filesum\n"
+ msg_red "SHA256 mismatch for '${curfile}:'\n@${filesum}\n"
errors=$((errors + 1))
else
msg_normal_append "OK.\n"
@@ -131,7 +111,7 @@ verify_cksum() {
filesum=$(${XBPS_DIGEST_CMD} "$distfile")
if [ "$cksum" != "$filesum" ]; then
echo
- msg_red "SHA256 mismatch for '$curfile:'\n$filesum\n"
+ msg_red "SHA256 mismatch for '${curfile}:'\n${filesum}\n"
errors=$((errors + 1))
else
if [ ! -f "$XBPS_SRCDISTDIR/by_sha256/${cksum}_${curfile}" ]; then
@@ -145,22 +125,20 @@ verify_cksum() {
# Link an existing cksum $distfile for $curfile at index $dfcount
link_cksum() {
- local curfile="$1" distfile="$2" dfcount="$3" filesum cksum
-
- cksum=$(get_cksum $curfile $dfcount)
-
+ local curfile="$1" distfile="$2" cksum="$3"
if [ -n "$cksum" -a -f "$XBPS_SRCDISTDIR/by_sha256/${cksum}_${curfile}" ]; then
ln -f "$XBPS_SRCDISTDIR/by_sha256/${cksum}_${curfile}" "$distfile"
msg_normal "$pkgver: using known distfile $curfile.\n"
+ return 0
fi
+ return 1
}
try_mirrors() {
- local curfile="$1" distfile="$2" dfcount="$3" subdir="$4" f="$5"
- local filesum cksum basefile mirror path scheme
- [ -z "$XBPS_DISTFILES_MIRROR" ] && return
+ local curfile="$1" distfile="$2" cksum="$3" f="$4"
+ local filesum basefile mirror path scheme good
+ [ -z "$XBPS_DISTFILES_MIRROR" ] && return 1
basefile="${f##*/}"
- cksum=$(get_cksum $curfile $dfcount)
for mirror in $XBPS_DISTFILES_MIRROR; do
scheme="file"
if [[ $mirror == *://* ]]; then
@@ -179,28 +157,80 @@ try_mirrors() {
fi
if [[ "$mirror" == *voidlinux* ]]; then
# For distfiles.voidlinux.* append the subdirectory
- mirror="$mirror/$subdir"
+ mirror="$mirror/$pkgname-$version"
fi
- msg_normal "$pkgver: fetching distfile '$curfile' from '$mirror'...\n"
+ msg_normal "$pkgver: fetching distfile '$curfile' from mirror '$mirror'...\n"
$fetch_cmd "$mirror/$curfile"
# If basefile was not found, but a curfile file may exist, try to fetch it
- if [ ! -f "$distfile" -a "$basefile" != "$curfile" ]; then
- $fetch_cmd "$mirror/$basefile"
- fi
+ # if [ ! -f "$distfile" -a "$basefile" != "$curfile" ]; then
+ # msg_normal "$pkgver: fetching distfile '$basefile' from mirror '$mirror'...\n"
+ # $fetch_cmd "$mirror/$basefile"
+ # fi
[ ! -f "$distfile" ] && continue
flock -n ${distfile}.part rm -f ${distfile}.part
filesum=$(${XBPS_DIGEST_CMD} "$distfile")
- [ "$cksum" == "$filesum" ] && break
+ if [ "$cksum" == "$filesum" ]; then
+ return 0
+ fi
msg_normal "$pkgver: checksum failed - removing '$curfile'...\n"
rm -f ${distfile}
done
+ return 1
+}
+
+try_urls() {
+ local curfile="$1"
+ local good=
+ for i in ${_file_idxs["$curfile"]}; do
+ local cksum=${_checksums["$i"]}
+ local url=${_distfiles["$i"]}
+
+ # If distfile does not exist, download it from the original location.
+ if [[ "$FTP_RETRIES" && "${url}" =~ ^ftp:// ]]; then
+ max_retries="$FTP_RETRIES"
+ else
+ max_retries=1
+ fi
+ for retry in $(seq 1 1 $max_retries); do
+ if [ ! -f "$distfile" ]; then
+ if [ "$retry" == 1 ]; then
+ msg_normal "$pkgver: fetching distfile '$curfile' from '$url'...\n"
+ else
+ msg_normal "$pkgver: fetch attempt $retry of $max_retries...\n"
+ fi
+ flock "${distfile}.part" $fetch_cmd "$url"
+ fi
+ done
+
+ if [ ! -f "$distfile" ]; then
+ continue
+ fi
+
+ # distfile downloaded, verify sha256 hash.
+ flock -n "${distfile}.part" rm -f "${distfile}.part"
+ verify_cksum "$f" "$distfile" "$cksum"
+ return 0
+ done
+ return 1
}
hook() {
local srcdir="$XBPS_SRCDISTDIR/$pkgname-$version"
local dfcount=0 dfgood=0 errors=0 max_retries
- if [ ! -d "$srcdir" ]; then
+ local -a _distfiles=($distfiles)
+ local -a _checksums=($checksum)
+ local -A _file_idxs
+
+ # Create a map from target file to index in _distfiles/_checksums
+ for i in ${!_distfiles[@]}; do
+ f="${_distfiles[$i]}"
+ curfile="${f#*>}"
+ curfile="${curfile##*/}"
+ _file_idxs["$curfile"]+=" $i"
+ done
+
+ if [[ ! -d "$srcdir" ]]; then
mkdir -p -m775 "$srcdir"
chgrp $(id -g) "$srcdir"
fi
@@ -212,87 +242,68 @@ hook() {
# Detect bsdtar and GNU tar (in that order of preference)
TAR_CMD="$(command -v bsdtar)"
- if [ -z "$TAR_CMD" ]; then
+ if [[ -z "$TAR_CMD" ]]; then
TAR_CMD="$(command -v tar)"
fi
# Detect distfiles with obsolete checksum and purge them from the cache
- for f in ${distfiles}; do
- curfile="${f#*>}"
- curfile="${curfile##*/}"
- distfile="$srcdir/$curfile"
-
- if [ -f "$distfile" ]; then
- cksum=$(get_cksum $curfile $dfcount)
- if [ "${cksum:0:1}" = "@" ]; then
- cksum=${cksum:1}
- filesum=$(contents_cksum "$distfile")
- else
- filesum=$(${XBPS_DIGEST_CMD} "$distfile")
- fi
- if [ "$cksum" = "$filesum" ]; then
- dfgood=$((dfgood + 1))
- else
- inode=$(stat "$distfile" --printf "%i")
- msg_warn "$pkgver: wrong checksum found for ${curfile} - purging\n"
- find ${XBPS_SRCDISTDIR} -inum ${inode} -delete -print
+ for f in ${!_file_idxs[@]}; do
+ distfile="$srcdir/$f"
+ for i in ${_file_idxs["$f"]}; do
+ if [[ -f $distfile ]]; then
+ cksum=${_checksums["$i"]}
+ if [[ ${cksum:0:1} = @ ]]; then
+ cksum=${cksum:1}
+ filesum=$(contents_cksum "$distfile")
+ else
+ filesum=$(${XBPS_DIGEST_CMD} "$distfile")
+ fi
+ if [[ $cksum = $filesum ]]; then
+ dfgood=$((dfgood + 1))
+ else
+ inode=$(stat "$distfile" --printf "%i")
+ msg_warn "$pkgver: wrong checksum found for ${curfile} - purging\n"
+ find ${XBPS_SRCDISTDIR} -inum ${inode} -delete -print
+ fi
fi
- fi
- dfcount=$((dfcount + 1))
+ dfcount=$((dfcount + 1))
+ done
done
# We're done, if all distfiles were found and had good checksums
- [ $dfcount -eq $dfgood ] && return
+ [[ $dfcount -eq $dfgood ]] && return
# Download missing distfiles and verify their checksums
- dfcount=0
- for f in ${distfiles}; do
- curfile="${f#*>}"
- curfile="${curfile##*/}"
+ for curfile in ${!_file_idxs[@]}; do
distfile="$srcdir/$curfile"
# If file lock cannot be acquired wait until it's available.
- while true; do
- flock -w 1 ${distfile}.part true
- [ $? -eq 0 ] && break
+ while ! flock -w 1 "${distfile}.part" true; do
msg_warn "$pkgver: ${curfile} is already being downloaded, waiting for 1s ...\n"
done
+
+ if [[ -f "$distfile" ]]; then
+ continue
+ fi
+
# If distfile does not exist, try to link to it.
- if [ ! -f "$distfile" ]; then
- link_cksum $curfile $distfile $dfcount
+ if link_cksum "$curfile" "$distfile" "${_checksums[0]}"; then
+ continue
fi
+
# If distfile does not exist, download it from a mirror location.
- if [ ! -f "$distfile" ]; then
- try_mirrors $curfile $distfile $dfcount $pkgname-$version $f
- fi
- # If distfile does not exist, download it from the original location.
- if [[ "$FTP_RETRIES" && "${f}" =~ ^ftp:// ]]; then
- max_retries="$FTP_RETRIES"
- else
- max_retries=1
+ if try_mirrors "$curfile" "$distfile" "${_checksums[0]}" "${_distfiles[0]}"; then
+ continue
fi
- for retry in $(seq 1 1 $max_retries); do
- if [ ! -f "$distfile" ]; then
- if [ "$retry" == 1 ]; then
- msg_normal "$pkgver: fetching distfile '$curfile'...\n"
- else
- msg_normal "$pkgver: fetch attempt $retry of $max_retries...\n"
- fi
- flock "${distfile}.part" $fetch_cmd "$f"
- fi
- done
- if [ ! -f "$distfile" ]; then
- msg_error "$pkgver: failed to fetch $curfile.\n"
+
+ if ! try_urls "$curfile"; then
+ msg_error "$pkgver: failed to fetch '$curfile'.\n"
fi
- # distfile downloaded, verify sha256 hash.
- flock -n ${distfile}.part rm -f ${distfile}.part
- verify_cksum $curfile $distfile $dfcount
- dfcount=$((dfcount + 1))
done
unset TAR_CMD
- if [ $errors -gt 0 ]; then
+ if [[ $errors -gt 0 ]]; then
msg_error "$pkgver: couldn't verify distfiles, exiting...\n"
fi
}
diff --git a/srcpkgs/R-cran-pillar/template b/srcpkgs/R-cran-pillar/template
index e041a7a7c4b9..d8d381b8e4ac 100644
--- a/srcpkgs/R-cran-pillar/template
+++ b/srcpkgs/R-cran-pillar/template
@@ -11,4 +11,5 @@ short_desc="Coloured Formatting for Columns"
maintainer="Florian Wagner <florian@wagner-flo.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/r-lib/pillar/"
-checksum=0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672
+checksum="0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672
+ 0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672"
From 7bad627adb859a6014a9be29c975623e8b72a346 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:15:29 -0800
Subject: [PATCH 02/28] R-cran-R6: update to 2.5.1
---
srcpkgs/R-cran-R6/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index 3c35ffadb069..bfc8737d4458 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -1,13 +1,13 @@
# Template file for 'R-cran-R6'
pkgname=R-cran-R6
-version=2.5.0
+version=2.5.1
revision=1
build_style=R-cran
short_desc="Classes with Reference Semantics"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://github.com/r-lib/R6"
-checksum=aec1af9626ec532cb883b544bf9eff4cb2d89c343c7ce0fa31761ec5a7882e02
+checksum=8d92bd29c2ed7bf15f2778618ffe4a95556193d21d8431a7f75e7e5fc102bf48
post_install() {
vlicense LICENSE
From 02a350f615b39e6e8285bde49cc836c3a98690c3 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:15:51 -0800
Subject: [PATCH 03/28] R-cran-cli: update to 3.3.0
---
srcpkgs/R-cran-cli/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-cli/template b/srcpkgs/R-cran-cli/template
index b6c445ea9371..5ad29a2c44ed 100644
--- a/srcpkgs/R-cran-cli/template
+++ b/srcpkgs/R-cran-cli/template
@@ -1,15 +1,15 @@
# Template file for 'R-cran-cli'
pkgname=R-cran-cli
-version=2.3.1
+version=3.3.0
revision=1
build_style=R-cran
makedepends="R-cran-assertthat R-cran-glue"
depends="R-cran-assertthat R-cran-glue"
short_desc="Helpers for Developing Command Line Interfaces"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://github.com/r-lib/cli/"
-checksum=516ce2de54b4a58afa943f31dfdd925e532b67cf5f91aec355e255637b2406ca
+checksum=c3a9ebbcb9017fb9aeda4f7df5ca981e42b169cbd7ce13e592cda2cd74250d63
post_install() {
vlicense LICENSE
From eb60c725588c1decb0a8b0c85f764280b5134de3 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:16:05 -0800
Subject: [PATCH 04/28] R-cran-colorspace: update to 2.0r3
---
srcpkgs/R-cran-colorspace/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/R-cran-colorspace/template b/srcpkgs/R-cran-colorspace/template
index 8490d34fdb58..67f6ddceacbb 100644
--- a/srcpkgs/R-cran-colorspace/template
+++ b/srcpkgs/R-cran-colorspace/template
@@ -1,13 +1,13 @@
# Template file for 'R-cran-colorspace'
pkgname=R-cran-colorspace
-version=1.4r1
-revision=2
+version=2.0r3
+revision=1
build_style=R-cran
short_desc="Color Space Manipulation"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="BSD-3-Clause"
homepage="http://www.hclwizard.org/r-colorspace/"
-checksum=693d713a050f8bfecdb7322739f04b40d99b55aed168803686e43401d5f0d673
+checksum=e75681cc4dd6e4b70303fd96a6d4597065dc6bffcaa4ae4244b73ff19016857f
post_install() {
vlicense LICENSE
From 2e3ea2227a68d8aa5dfaf1ebccc0f677625b66d8 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:16:22 -0800
Subject: [PATCH 05/28] R-cran-cpp11: update to 0.4.2
---
srcpkgs/R-cran-cpp11/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/R-cran-cpp11/template b/srcpkgs/R-cran-cpp11/template
index db827ed635bd..da285c944758 100644
--- a/srcpkgs/R-cran-cpp11/template
+++ b/srcpkgs/R-cran-cpp11/template
@@ -1,13 +1,13 @@
# Template file for 'R-cran-cpp11'
pkgname=R-cran-cpp11
-version=0.2.7
+version=0.4.2
revision=1
build_style=R-cran
short_desc="Header only, C++11 interface to R's C interface"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://github.com/r-lib/cpp11"
-checksum=1d4154c0d8ef4b564eea828ebebc836b7dbdc89a0848a840dd98173b07f661d4
+checksum=403ce0bf82358d237176053b0fb1e958cb6bfa4d0fb3555bf5801db6a6939b99
post_install() {
vlicense LICENSE
From f9e4367918b3123d189d7c1fe20167eb5aaf0e35 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:16:35 -0800
Subject: [PATCH 06/28] R-cran-crayon: update to 1.5.1
---
srcpkgs/R-cran-crayon/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-crayon/template b/srcpkgs/R-cran-crayon/template
index c836f1b82ac2..6b932041bc97 100644
--- a/srcpkgs/R-cran-crayon/template
+++ b/srcpkgs/R-cran-crayon/template
@@ -1,13 +1,13 @@
# Template file for 'R-cran-crayon'
pkgname=R-cran-crayon
-version=1.4.1
+version=1.5.1
revision=1
build_style=R-cran
short_desc="Colored Terminal Output"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://github.com/r-lib/crayon/"
-checksum=08b6e42e748d096960b2f32b7ffe690c25742e29fe14c19d1834cd6ff43029c7
+checksum=c025c73b78a8e88e8e4363c8e1a941da5089a7baea39e59ea5342ab9ebe45df9
post_install() {
vlicense LICENSE
From 41f1945b6596c0521204ca58ce7886836d86d9ae Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:16:45 -0800
Subject: [PATCH 07/28] R-cran-digest: update to 0.6.29
---
srcpkgs/R-cran-digest/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-digest/template b/srcpkgs/R-cran-digest/template
index 0bf4c97052fe..1edac6b6b418 100644
--- a/srcpkgs/R-cran-digest/template
+++ b/srcpkgs/R-cran-digest/template
@@ -1,11 +1,11 @@
# Template file for 'R-cran-digest'
pkgname=R-cran-digest
-version=0.6.27
+version=0.6.29
revision=1
build_style=R-cran
short_desc="Create Compact Hash Digests of R Objects"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-2.0-or-later"
homepage="http://dirk.eddelbuettel.com/code/digest.html"
changelog="https://github.com/eddelbuettel/digest/raw/master/ChangeLog"
-checksum=f485f75122907da24c41d4a62c91a232f0c371befd2f77e973342a1bef00253f
+checksum=792c1f14a4c8047745152f5e45ce7351978af8d770c29d2ea39c7acd5d619cd9
From 5d8b60484a2c112375f0a346504954e6254b3de0 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:16:56 -0800
Subject: [PATCH 08/28] R-cran-dplyr: update to 1.0.9
---
srcpkgs/R-cran-dplyr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/R-cran-dplyr/template b/srcpkgs/R-cran-dplyr/template
index 46e0fe526326..7f7c71e8467f 100644
--- a/srcpkgs/R-cran-dplyr/template
+++ b/srcpkgs/R-cran-dplyr/template
@@ -1,6 +1,6 @@
# Template file for 'R-cran-dplyr'
pkgname=R-cran-dplyr
-version=1.0.5
+version=1.0.9
revision=1
build_style=R-cran
makedepends="R-cran-ellipsis R-cran-generics R-cran-glue R-cran-lifecycle
@@ -13,7 +13,7 @@ short_desc="Grammar of Data Manipulation for R"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://dplyr.tidyverse.org/"
-checksum=7541a09c66ecb40736e25bc9ec9591f26ec4ee67c99823b4ac855760b5c96e70
+checksum=e2e1f7312618b4e32ada9a1da79cef32eaec12acd408c973a6b069c6be4fb46b
post_install() {
vlicense LICENSE
From 32c9701e1e93825ee408e15e0e94151c1b0fdbd6 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:17:08 -0800
Subject: [PATCH 09/28] R-cran-ellipsis: update to 0.3.2
---
srcpkgs/R-cran-ellipsis/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/R-cran-ellipsis/template b/srcpkgs/R-cran-ellipsis/template
index 0e9f695fcec7..c9ff7782b4ed 100644
--- a/srcpkgs/R-cran-ellipsis/template
+++ b/srcpkgs/R-cran-ellipsis/template
@@ -1,12 +1,12 @@
# Template file for 'R-cran-ellipsis'
pkgname=R-cran-ellipsis
-version=0.3.1
-revision=2
+version=0.3.2
+revision=1
build_style=R-cran
makedepends="R-cran-rlang"
depends="R-cran-rlang>=0.3.0"
short_desc="Tools for making ... safer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-only"
homepage="https://ellipsis.r-lib.org/"
-checksum=4f8a15158dfc27cdc0f7554c7a61e92b02e4d70bfc3d968f01a99da2189b75db
+checksum=a90266e5eb59c7f419774d5c6d6bd5e09701a26c9218c5933c9bce6765aa1558
From 2fc51610ddf2e502b3762fe8cdc620407747f3af Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:17:21 -0800
Subject: [PATCH 10/28] R-cran-fansi: update to 1.0.3
---
srcpkgs/R-cran-fansi/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-fansi/template b/srcpkgs/R-cran-fansi/template
index a10f86c52f5e..811c00489e6a 100644
--- a/srcpkgs/R-cran-fansi/template
+++ b/srcpkgs/R-cran-fansi/template
@@ -1,10 +1,10 @@
# Template file for 'R-cran-fansi'
pkgname=R-cran-fansi
-version=0.4.2
+version=1.0.3
revision=1
build_style=R-cran
short_desc="ANSI Control Sequence Aware String Functions"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-2.0-or-later"
homepage="https://cran.r-project.org/web/packages/fansi/index.html"
-checksum=a2edf06cf8b91333a5df4990d50cdb35a63aa4b63c8c8ddf5bedcb499daafc44
+checksum=86a7b83d8c9d28baebbde310cd0b459d0950a9c7ff1a6276ce5858f6a89bc06a
From c49e2c921754d757db54618437a233236dc0e965 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:17:32 -0800
Subject: [PATCH 11/28] R-cran-farver: update to 2.1.1
---
srcpkgs/R-cran-farver/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/R-cran-farver/template b/srcpkgs/R-cran-farver/template
index 370c2330df8a..5d726787f42f 100644
--- a/srcpkgs/R-cran-farver/template
+++ b/srcpkgs/R-cran-farver/template
@@ -1,13 +1,13 @@
# Template file for 'R-cran-farver'
pkgname=R-cran-farver
-version=2.0.3
-revision=2
+version=2.1.1
+revision=1
build_style=R-cran
short_desc="High Performance Colour Space Manipulation"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://github.com/thomasp85/farver"
-checksum=0e1590df79ec6078f10426411b96216b70568a4eaf3ffd84ca723add0ed8e5cc
+checksum=0dcfda6ca743f465372790bcff1bcbc6a7145fdac1c682b021f654e8c6c996ce
post_install() {
vlicense LICENSE
From aa0fe9cf6984f10d01966b071cac4cc0c3865d59 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:17:41 -0800
Subject: [PATCH 12/28] R-cran-generics: update to 0.1.3
---
srcpkgs/R-cran-generics/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/R-cran-generics/template b/srcpkgs/R-cran-generics/template
index 0d3797c2cddc..aeb133cbc85d 100644
--- a/srcpkgs/R-cran-generics/template
+++ b/srcpkgs/R-cran-generics/template
@@ -1,10 +1,10 @@
# Template file for 'R-cran-generics'
pkgname=R-cran-generics
-version=0.1.0
+version=0.1.3
revision=1
build_style=R-cran
short_desc="Common generic S3 methods "
maintainer="luhann <lukehannan@gmail.com>"
license="GPL-2.0-only"
homepage="https://github.com/r-lib/generics"
-checksum=ab71d1bdbb66c782364c61cede3c1186d6a94c03635f9af70d926e2c1ac88763
+checksum=75046163bfa8b8a4f4214c1b689e796207f6447182f2e5062cf570302387d053
From 80cb4da7b8f3a1cdc54814c9f894a56a6e5ebb33 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:17:51 -0800
Subject: [PATCH 13/28] R-cran-glue: update to 1.6.2
---
srcpkgs/R-cran-glue/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-glue/template b/srcpkgs/R-cran-glue/template
index 33a22e9c8dc7..13bfe1819336 100644
--- a/srcpkgs/R-cran-glue/template
+++ b/srcpkgs/R-cran-glue/template
@@ -1,13 +1,13 @@
# Template file for 'R-cran-glue'
pkgname=R-cran-glue
-version=1.4.2
+version=1.6.2
revision=1
build_style=R-cran
short_desc="Interpreted String Literals"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://github.com/tidyverse/glue/"
-checksum=9f7354132a26e9a876428fa87629b9aaddcd558f9932328e6ac065b95b8ef7ad
+checksum=9da518f12be584c90e75fe8e07f711ee3f6fc0d03d817f72c25dc0f66499fdbf
post_install() {
vlicense LICENSE
From a06269047580a022e5f3aaff403413dab699f562 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:17:59 -0800
Subject: [PATCH 14/28] R-cran-isoband: update to 0.2.5
---
srcpkgs/R-cran-isoband/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/R-cran-isoband/template b/srcpkgs/R-cran-isoband/template
index dd88c5e9d570..22f35be2bdbf 100644
--- a/srcpkgs/R-cran-isoband/template
+++ b/srcpkgs/R-cran-isoband/template
@@ -1,13 +1,13 @@
# Template file for 'R-cran-isoband'
pkgname=R-cran-isoband
-version=0.2.4
+version=0.2.5
revision=1
build_style=R-cran
short_desc="Generate Isolines and Isobands from Regularly Spaced Elevation Grids"
maintainer="Luke Hannan <lukehannan@gmail.com>"
license="MIT"
homepage="https://github.com/wilkelab/isoband"
-checksum=96d5bbdbfa4ead40bf30cec5a0d525b6a6b0f21eb92d179289ce2c4459bf387c
+checksum=46f53fa066f0966f02cb2bf050190c0d5e950dab2cdf565feb63fc092c886ba5
post_install() {
vlicense LICENSE
From f5eb8174709d263b626495036d1915b253e4efc4 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:18:11 -0800
Subject: [PATCH 15/28] R-cran-labeling: update to 0.4.2
---
srcpkgs/R-cran-labeling/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/R-cran-labeling/template b/srcpkgs/R-cran-labeling/template
index 4ec70142e3d9..0afa63e078e9 100644
--- a/srcpkgs/R-cran-labeling/template
+++ b/srcpkgs/R-cran-labeling/template
@@ -1,13 +1,13 @@
# Template file for 'R-cran-labeling'
pkgname=R-cran-labeling
-version=0.3
-revision=2
+version=0.4.2
+revision=1
build_style=R-cran
short_desc="Axis Labeling"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://cran.r-project.org/web/packages/labeling/"
-checksum=0d8069eb48e91f6f6d6a9148f4e2dc5026cabead15dd15fc343eff9cf33f538f
+checksum=e022d79276173e0d62bf9e37d7574db65ab439eb2ae1833e460b1cff529bd165
post_install() {
vlicense LICENSE
From 220c543e5c85351dd0e81d285338dda59830ef56 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:18:27 -0800
Subject: [PATCH 16/28] R-cran-lifecycle: update to 1.0.1
---
srcpkgs/R-cran-lifecycle/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/R-cran-lifecycle/template b/srcpkgs/R-cran-lifecycle/template
index e3a2af69c4e6..3b160be0b795 100644
--- a/srcpkgs/R-cran-lifecycle/template
+++ b/srcpkgs/R-cran-lifecycle/template
@@ -1,6 +1,6 @@
# Template file for 'R-cran-lifecycle'
pkgname=R-cran-lifecycle
-version=1.0.0
+version=1.0.1
revision=1
build_style=R-cran
makedepends="R-cran-glue R-cran-rlang"
@@ -9,7 +9,7 @@ short_desc="Manage the Life Cycle of your Package Functions"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://github.com/r-lib/lifecycle"
-checksum=03334ab213f2ad49a49e184e73f2051e04d35d43f562db903e68243cd2ec0f8e
+checksum=1da76e1c00f1be96ca34e122ae611259430bf99d6a1b999fdef70c00c30f7ba0
post_install() {
vlicense LICENSE
From 9046c0305c245765420c167fcc62e8d32bfa7c68 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:18:56 -0800
Subject: [PATCH 17/28] R-cran-magrittr: update to 2.0.3
---
srcpkgs/R-cran-magrittr/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-magrittr/template b/srcpkgs/R-cran-magrittr/template
index 1e4ecaa43834..0aa6a608e95f 100644
--- a/srcpkgs/R-cran-magrittr/template
+++ b/srcpkgs/R-cran-magrittr/template
@@ -1,13 +1,13 @@
# Template file for 'R-cran-magrittr'
pkgname=R-cran-magrittr
-version=2.0.1
+version=2.0.3
revision=1
build_style=R-cran
short_desc="Forward-Pipe Operator for R"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://cran.r-project.org/web/packages/magrittr/index.html"
-checksum=75c265d51cc2b34beb27040edb09823c7b954d3990a7a931e40690b75d4aad5f
+checksum=a2bff83f792a1acb801bfe6330bb62724c74d5308832f2cb6a6178336ace55d2
post_install() {
vlicense LICENSE
From cb0b6112e867aba46e472f95e4fe43010f41b957 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:19:06 -0800
Subject: [PATCH 18/28] R-cran-pillar: update to 1.7.0
---
srcpkgs/R-cran-pillar/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/R-cran-pillar/template b/srcpkgs/R-cran-pillar/template
index d8d381b8e4ac..93502d554bc6 100644
--- a/srcpkgs/R-cran-pillar/template
+++ b/srcpkgs/R-cran-pillar/template
@@ -1,6 +1,6 @@
# Template file for 'R-cran-pillar'
pkgname=R-cran-pillar
-version=1.5.1
+version=1.7.0
revision=1
build_style=R-cran
makedepends="R-cran-cli R-cran-crayon R-cran-ellipsis R-cran-lifecycle
@@ -8,8 +8,7 @@ makedepends="R-cran-cli R-cran-crayon R-cran-ellipsis R-cran-lifecycle
depends="R-cran-cli R-cran-crayon R-cran-ellipsis R-cran-lifecycle
R-cran-rlang R-cran-utf8 R-cran-fansi R-cran-vctrs"
short_desc="Coloured Formatting for Columns"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/r-lib/pillar/"
-checksum="0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672
- 0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672"
+checksum=7841f89658cc8935568c0ff24dc480b4481bac896de2f6447050abc4360a13bb
From 22f2bc2eb8e30509ec38686fcf94ec8bcbb150be Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:19:18 -0800
Subject: [PATCH 19/28] R-cran-rlang: update to 1.0.4
---
srcpkgs/R-cran-rlang/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-rlang/template b/srcpkgs/R-cran-rlang/template
index 73a4a65e4e9b..da816988b4e3 100644
--- a/srcpkgs/R-cran-rlang/template
+++ b/srcpkgs/R-cran-rlang/template
@@ -1,10 +1,10 @@
# Template file for 'R-cran-rlang'
pkgname=R-cran-rlang
-version=0.4.10
+version=1.0.4
revision=1
build_style=R-cran
short_desc="Functions for Base Types and Core R and 'Tidyverse' Features"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://rlang.r-lib.org/"
-checksum=07530270c4c199f2b7efc5d57a476d99babd9d0c3388a02bb7d57fe312da3576
+checksum=1fb789d46c6a855ce37eba63c353b85aa600c4a2a7ca6075f2632540b42a8696
From 774e14ddcf65a6a218985b2eba7146afb0d667aa Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:19:28 -0800
Subject: [PATCH 20/28] R-cran-svglite: update to 2.1.0
---
srcpkgs/R-cran-svglite/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/R-cran-svglite/template b/srcpkgs/R-cran-svglite/template
index 90557ae178aa..2834a8de965e 100644
--- a/srcpkgs/R-cran-svglite/template
+++ b/srcpkgs/R-cran-svglite/template
@@ -1,6 +1,6 @@
# Template file for 'R-cran-svglite'
pkgname=R-cran-svglite
-version=2.0.0
+version=2.1.0
revision=1
build_style=R-cran
makedepends="R-cran-systemfonts R-cran-cpp11 libpng-devel"
@@ -9,4 +9,4 @@ short_desc="Lightweight svg graphics device for R"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-2.0-or-later"
homepage="https://svglite.r-lib.org"
-checksum=76e625fe172a5b7ce99a67b6d631b037b3f7f0021cfe15f2e15e8851b89defa5
+checksum=ad40f590c7e80ae83001a3826b6e8394ba733446ed51fd55faeda974ab839c9b
From d484b5e34b59705ed7e012317cfcd6c7524c577f Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:19:38 -0800
Subject: [PATCH 21/28] R-cran-systemfonts: update to 1.0.4
---
srcpkgs/R-cran-systemfonts/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/R-cran-systemfonts/template b/srcpkgs/R-cran-systemfonts/template
index b779dd8d8ebf..6144b3f64cf9 100644
--- a/srcpkgs/R-cran-systemfonts/template
+++ b/srcpkgs/R-cran-systemfonts/template
@@ -1,6 +1,6 @@
# Template file for 'R-cran-systemfonts'
pkgname=R-cran-systemfonts
-version=1.0.2
+version=1.0.4
revision=1
build_style=R-cran
hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ short_desc="System Native Font Handling in R"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://github.com/r-lib/systemfonts"
-checksum=21ac96412846e06a4062362b159213cb9d83bd60fdf03aa235992b6c49fb36a9
+checksum=ef766c75b942f147d382664a00d6a4930f1bfe0cce9d88943f571682a85a84c0
post_install() {
vlicense LICENSE
From f1135ab02d93a49f07c2824ac2865e607bf0ec2d Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:19:51 -0800
Subject: [PATCH 22/28] R-cran-tibble: update to 3.1.7
---
srcpkgs/R-cran-tibble/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-tibble/template b/srcpkgs/R-cran-tibble/template
index 048d739f793e..6cf15890a190 100644
--- a/srcpkgs/R-cran-tibble/template
+++ b/srcpkgs/R-cran-tibble/template
@@ -1,6 +1,6 @@
# Template file for 'R-cran-tibble'
pkgname=R-cran-tibble
-version=3.1.0
+version=3.1.7
revision=1
build_style=R-cran
makedepends="R-cran-ellipsis
@@ -10,10 +10,10 @@ depends="R-cran-ellipsis
R-cran-fansi R-cran-lifecycle R-cran-magrittr
R-cran-pillar R-cran-rlang R-cran-pkgconfig R-cran-vctrs"
short_desc="Simple Data Frames"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="http://tibble.tidyverse.org/"
-checksum=959e28dea05181a7cd43a744028892261bda4c7ec78ad35fb148d144dcf5154e
+checksum=e1a50891f476803526960b4c4d736a72e7d9c3d366946744a02d6347f591c872
post_install() {
vlicense LICENSE
From b26882c246b9d8ebdf7e7c04fdabee6a77c35781 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:20:04 -0800
Subject: [PATCH 23/28] R-cran-tidyselect: update to 1.1.2
---
srcpkgs/R-cran-tidyselect/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/R-cran-tidyselect/template b/srcpkgs/R-cran-tidyselect/template
index e7cd851913e6..0482a5f46fda 100644
--- a/srcpkgs/R-cran-tidyselect/template
+++ b/srcpkgs/R-cran-tidyselect/template
@@ -1,6 +1,6 @@
# Template file for 'R-cran-tidyselect'
pkgname=R-cran-tidyselect
-version=1.1.0
+version=1.1.2
revision=1
build_style=R-cran
makedepends="R-cran-ellipsis R-cran-glue R-cran-purrr R-cran-rlang R-cran-vctrs"
@@ -10,4 +10,4 @@ short_desc="Backend for selecting functions of the tidyverse"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://tidyselect.r-lib.org/"
-checksum=e635ed381fb53f7a53c3fa36bb33e134a3273d272367de2a8d909c821be93893
+checksum=0389a3b15417954a30d6d692f6ebdd3d0f318cb94a5c9b05365df2f4ea1d8270
From 3bb1f0ca8955132f9468e19e653f127482499e2f Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:20:15 -0800
Subject: [PATCH 24/28] R-cran-utf8: update to 1.2.2
---
srcpkgs/R-cran-utf8/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/R-cran-utf8/template b/srcpkgs/R-cran-utf8/template
index 55923b13fa51..4850bcb947fb 100644
--- a/srcpkgs/R-cran-utf8/template
+++ b/srcpkgs/R-cran-utf8/template
@@ -1,10 +1,10 @@
# Template file for 'R-cran-utf8'
pkgname=R-cran-utf8
-version=1.1.4
-revision=2
+version=1.2.2
+revision=1
build_style=R-cran
short_desc="Unicode Text Processing"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="Apache-2.0"
homepage="https://github.com/patperry/r-utf8/"
-checksum=f6da9cadfc683057d45f54b43312a359cf96ec2731c0dda18a8eae31d1e31e54
+checksum=a71aee87d43a9bcf29249c7a5a2e9ca1d2a836e8d5ee3a264d3062f25378d8f4
From a019f37f35b88850710800ef03928c5d4e9475c2 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:20:35 -0800
Subject: [PATCH 25/28] R-cran-vctrs: update to 0.4.1
---
srcpkgs/R-cran-vctrs/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/R-cran-vctrs/template b/srcpkgs/R-cran-vctrs/template
index 2246112ef700..0165012b8f6b 100644
--- a/srcpkgs/R-cran-vctrs/template
+++ b/srcpkgs/R-cran-vctrs/template
@@ -1,12 +1,12 @@
# Template file for 'R-cran-vctrs'
pkgname=R-cran-vctrs
-version=0.3.6
+version=0.4.1
revision=1
build_style=R-cran
-makedepends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"
-depends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"
+makedepends="R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-cli"
+depends="R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-cli"
short_desc="Vector Helpers"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-only"
homepage="https://github.com/r-lib/vctrs"
-checksum=df7d368c9f2d2ad14872ba2a09821ec4f5a8ad77c81a0b05e1f440e5ffebad25
+checksum=9676881e009aa1217818f326338e8b35dd9a9438918f8b1ac249f4c8afe460dd
From d6db2c578cec4d4cfe30694f38698e5abecafd15 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:20:46 -0800
Subject: [PATCH 26/28] R-cran-viridisLite: update to 0.4.0
---
srcpkgs/R-cran-viridisLite/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/R-cran-viridisLite/template b/srcpkgs/R-cran-viridisLite/template
index c0b759859975..978e4fac83c4 100644
--- a/srcpkgs/R-cran-viridisLite/template
+++ b/srcpkgs/R-cran-viridisLite/template
@@ -1,13 +1,13 @@
# Template file for 'R-cran-viridisLite'
pkgname=R-cran-viridisLite
-version=0.3.0
-revision=2
+version=0.4.0
+revision=1
build_style=R-cran
short_desc="Default Color Maps from 'matplotlib' (Lite Version)"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="MIT"
homepage="https://github.com/sjmgarnier/viridisLite"
-checksum=780ea12e7c4024d5ba9029f3a107321c74b8d6d9165262f6e64b79e00aa0c2af
+checksum=849955dc8ad9bc52bdc50ed4867fd92a510696fc8294e6971efa018437c83c6a
post_install() {
vlicense LICENSE
From 6420ae5297c6f75666f7f2d817a8cf267f6b332d Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:21:00 -0800
Subject: [PATCH 27/28] R-cran-withr: update to 2.5.0
---
srcpkgs/R-cran-withr/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-withr/template b/srcpkgs/R-cran-withr/template
index 60285166a63f..0d2c3bd8d39a 100644
--- a/srcpkgs/R-cran-withr/template
+++ b/srcpkgs/R-cran-withr/template
@@ -1,10 +1,10 @@
# Template file for 'R-cran-withr'
pkgname=R-cran-withr
-version=2.4.1
+version=2.5.0
revision=1
build_style=R-cran
short_desc="Run Code 'With' Temporarily Modified Global State"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-2.0-or-later"
homepage="http://withr.r-lib.org/"
-checksum=5f5ed9058d51b676f8b170b32bc0952ace6790e038f2b6d6860c5bb94f67178f
+checksum=37317b3ed790a08407072993a05ab255f6305f95a12a16e0e28aa6aa80fc8bc0
From b02be564e725d8f70ab5f962fafa6336f4634c78 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 17 Jul 2022 14:48:59 -0700
Subject: [PATCH 28/28] R-cran-ggplot2: update to 3.3.6
---
srcpkgs/R-cran-ggplot2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ddf1e5bb6038..56ac2296907e 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
# Template file for 'R-cran-ggplot2'
pkgname=R-cran-ggplot2
-version=3.3.5
+version=3.3.6
revision=1
build_style=R-cran
makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,4 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
maintainer="Florian Wagner <florian@wagner-flo.net>"
license="GPL-2.0-only"
homepage="https://ggplot2.tidyverse.org/"
-checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
+checksum=bfcb4eb92a0fcd3fab713aca4bb25e916e05914f2540271a45522ad7e43943a9
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] R cran updates
2022-09-06 2:53 [PR PATCH] R cran updates CameronNemo
@ 2022-09-06 3:05 ` CameronNemo
2022-09-06 14:41 ` [PR PATCH] [Merged]: " sgn
1 sibling, 0 replies; 4+ messages in thread
From: CameronNemo @ 2022-09-06 3:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]
There is an updated pull request by CameronNemo against master on the void-packages repository
https://github.com/CameronNemo/void-packages R-cran-updates
https://github.com/void-linux/void-packages/pull/39128
R cran updates
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39128.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-R-cran-updates-39128.patch --]
[-- Type: text/x-diff, Size: 42419 bytes --]
From bc9285f05a89ea2afabb27a8f3f3c9cc342534ad Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 6 Aug 2022 04:54:05 +0200
Subject: [PATCH 01/28] xbps-src: clean up fetch hook and allow mirroring
---
common/environment/build-style/R-cran.sh | 3 +-
common/hooks/do-fetch/00-distfiles.sh | 201 ++++++++++++-----------
srcpkgs/R-cran-pillar/template | 3 +-
3 files changed, 110 insertions(+), 97 deletions(-)
diff --git a/common/environment/build-style/R-cran.sh b/common/environment/build-style/R-cran.sh
index ded66793396b..905c3b9dc0c7 100644
--- a/common/environment/build-style/R-cran.sh
+++ b/common/environment/build-style/R-cran.sh
@@ -4,5 +4,6 @@ wrksrc="${XBPS_BUILDDIR}/${pkgname#R-cran-}"
# default to cran
if [ -z "$distfiles" ]; then
- distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
+ distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz
+ https://cran.r-project.org/src/contrib/Archive/${pkgname#R-cran-}/${pkgname#R-cran-}_${version//r/-}.tar.gz"
fi
diff --git a/common/hooks/do-fetch/00-distfiles.sh b/common/hooks/do-fetch/00-distfiles.sh
index e2bf54378fe0..5fa394c9c790 100644
--- a/common/hooks/do-fetch/00-distfiles.sh
+++ b/common/hooks/do-fetch/00-distfiles.sh
@@ -2,24 +2,6 @@
# the $distfiles variable and then verifies its sha256 checksum comparing
# its value with the one stored in the $checksum variable.
-# Get the checksum for $curfile at index $dfcount
-get_cksum() {
- local curfile="$1" dfcount="$2" ckcount cksum i
-
- ckcount=0
- cksum=0
- for i in ${checksum}; do
- if [ $dfcount -eq $ckcount -a -n "$i" ]; then
- cksum=$i
- fi
- ckcount=$((ckcount + 1))
- done
- if [ -z "$cksum" ]; then
- msg_error "$pkgver: cannot find checksum for $curfile.\n"
- fi
- echo "$cksum"
-}
-
# Return the checksum of the contents of a tarball
contents_cksum() {
local curfile="$1" cursufx cksum
@@ -110,9 +92,7 @@ contents_cksum() {
# Verify the checksum for $curfile stored at $distfile and index $dfcount
verify_cksum() {
- local curfile="$1" distfile="$2" dfcount="$3" filesum cksum
-
- cksum=$(get_cksum $curfile $dfcount)
+ local curfile="$1" distfile="$2" cksum="$3" filesum
# If the checksum starts with an commercial at (@) it is the contents checksum
if [ "${cksum:0:1}" = "@" ]; then
@@ -121,7 +101,7 @@ verify_cksum() {
filesum=$(contents_cksum "$curfile")
if [ "${cksum}" != "$filesum" ]; then
echo
- msg_red "SHA256 mismatch for '$curfile:'\n@$filesum\n"
+ msg_red "SHA256 mismatch for '${curfile}:'\n@${filesum}\n"
errors=$((errors + 1))
else
msg_normal_append "OK.\n"
@@ -131,7 +111,7 @@ verify_cksum() {
filesum=$(${XBPS_DIGEST_CMD} "$distfile")
if [ "$cksum" != "$filesum" ]; then
echo
- msg_red "SHA256 mismatch for '$curfile:'\n$filesum\n"
+ msg_red "SHA256 mismatch for '${curfile}:'\n${filesum}\n"
errors=$((errors + 1))
else
if [ ! -f "$XBPS_SRCDISTDIR/by_sha256/${cksum}_${curfile}" ]; then
@@ -145,22 +125,20 @@ verify_cksum() {
# Link an existing cksum $distfile for $curfile at index $dfcount
link_cksum() {
- local curfile="$1" distfile="$2" dfcount="$3" filesum cksum
-
- cksum=$(get_cksum $curfile $dfcount)
-
+ local curfile="$1" distfile="$2" cksum="$3"
if [ -n "$cksum" -a -f "$XBPS_SRCDISTDIR/by_sha256/${cksum}_${curfile}" ]; then
ln -f "$XBPS_SRCDISTDIR/by_sha256/${cksum}_${curfile}" "$distfile"
msg_normal "$pkgver: using known distfile $curfile.\n"
+ return 0
fi
+ return 1
}
try_mirrors() {
- local curfile="$1" distfile="$2" dfcount="$3" subdir="$4" f="$5"
- local filesum cksum basefile mirror path scheme
- [ -z "$XBPS_DISTFILES_MIRROR" ] && return
+ local curfile="$1" distfile="$2" cksum="$3" f="$4"
+ local filesum basefile mirror path scheme good
+ [ -z "$XBPS_DISTFILES_MIRROR" ] && return 1
basefile="${f##*/}"
- cksum=$(get_cksum $curfile $dfcount)
for mirror in $XBPS_DISTFILES_MIRROR; do
scheme="file"
if [[ $mirror == *://* ]]; then
@@ -179,28 +157,80 @@ try_mirrors() {
fi
if [[ "$mirror" == *voidlinux* ]]; then
# For distfiles.voidlinux.* append the subdirectory
- mirror="$mirror/$subdir"
+ mirror="$mirror/$pkgname-$version"
fi
- msg_normal "$pkgver: fetching distfile '$curfile' from '$mirror'...\n"
+ msg_normal "$pkgver: fetching distfile '$curfile' from mirror '$mirror'...\n"
$fetch_cmd "$mirror/$curfile"
# If basefile was not found, but a curfile file may exist, try to fetch it
- if [ ! -f "$distfile" -a "$basefile" != "$curfile" ]; then
- $fetch_cmd "$mirror/$basefile"
- fi
+ # if [ ! -f "$distfile" -a "$basefile" != "$curfile" ]; then
+ # msg_normal "$pkgver: fetching distfile '$basefile' from mirror '$mirror'...\n"
+ # $fetch_cmd "$mirror/$basefile"
+ # fi
[ ! -f "$distfile" ] && continue
flock -n ${distfile}.part rm -f ${distfile}.part
filesum=$(${XBPS_DIGEST_CMD} "$distfile")
- [ "$cksum" == "$filesum" ] && break
+ if [ "$cksum" == "$filesum" ]; then
+ return 0
+ fi
msg_normal "$pkgver: checksum failed - removing '$curfile'...\n"
rm -f ${distfile}
done
+ return 1
+}
+
+try_urls() {
+ local curfile="$1"
+ local good=
+ for i in ${_file_idxs["$curfile"]}; do
+ local cksum=${_checksums["$i"]}
+ local url=${_distfiles["$i"]}
+
+ # If distfile does not exist, download it from the original location.
+ if [[ "$FTP_RETRIES" && "${url}" =~ ^ftp:// ]]; then
+ max_retries="$FTP_RETRIES"
+ else
+ max_retries=1
+ fi
+ for retry in $(seq 1 1 $max_retries); do
+ if [ ! -f "$distfile" ]; then
+ if [ "$retry" == 1 ]; then
+ msg_normal "$pkgver: fetching distfile '$curfile' from '$url'...\n"
+ else
+ msg_normal "$pkgver: fetch attempt $retry of $max_retries...\n"
+ fi
+ flock "${distfile}.part" $fetch_cmd "$url"
+ fi
+ done
+
+ if [ ! -f "$distfile" ]; then
+ continue
+ fi
+
+ # distfile downloaded, verify sha256 hash.
+ flock -n "${distfile}.part" rm -f "${distfile}.part"
+ verify_cksum "$f" "$distfile" "$cksum"
+ return 0
+ done
+ return 1
}
hook() {
local srcdir="$XBPS_SRCDISTDIR/$pkgname-$version"
local dfcount=0 dfgood=0 errors=0 max_retries
- if [ ! -d "$srcdir" ]; then
+ local -a _distfiles=($distfiles)
+ local -a _checksums=($checksum)
+ local -A _file_idxs
+
+ # Create a map from target file to index in _distfiles/_checksums
+ for i in ${!_distfiles[@]}; do
+ f="${_distfiles[$i]}"
+ curfile="${f#*>}"
+ curfile="${curfile##*/}"
+ _file_idxs["$curfile"]+=" $i"
+ done
+
+ if [[ ! -d "$srcdir" ]]; then
mkdir -p -m775 "$srcdir"
chgrp $(id -g) "$srcdir"
fi
@@ -212,87 +242,68 @@ hook() {
# Detect bsdtar and GNU tar (in that order of preference)
TAR_CMD="$(command -v bsdtar)"
- if [ -z "$TAR_CMD" ]; then
+ if [[ -z "$TAR_CMD" ]]; then
TAR_CMD="$(command -v tar)"
fi
# Detect distfiles with obsolete checksum and purge them from the cache
- for f in ${distfiles}; do
- curfile="${f#*>}"
- curfile="${curfile##*/}"
- distfile="$srcdir/$curfile"
-
- if [ -f "$distfile" ]; then
- cksum=$(get_cksum $curfile $dfcount)
- if [ "${cksum:0:1}" = "@" ]; then
- cksum=${cksum:1}
- filesum=$(contents_cksum "$distfile")
- else
- filesum=$(${XBPS_DIGEST_CMD} "$distfile")
- fi
- if [ "$cksum" = "$filesum" ]; then
- dfgood=$((dfgood + 1))
- else
- inode=$(stat "$distfile" --printf "%i")
- msg_warn "$pkgver: wrong checksum found for ${curfile} - purging\n"
- find ${XBPS_SRCDISTDIR} -inum ${inode} -delete -print
+ for f in ${!_file_idxs[@]}; do
+ distfile="$srcdir/$f"
+ for i in ${_file_idxs["$f"]}; do
+ if [[ -f $distfile ]]; then
+ cksum=${_checksums["$i"]}
+ if [[ ${cksum:0:1} = @ ]]; then
+ cksum=${cksum:1}
+ filesum=$(contents_cksum "$distfile")
+ else
+ filesum=$(${XBPS_DIGEST_CMD} "$distfile")
+ fi
+ if [[ $cksum = $filesum ]]; then
+ dfgood=$((dfgood + 1))
+ else
+ inode=$(stat "$distfile" --printf "%i")
+ msg_warn "$pkgver: wrong checksum found for ${curfile} - purging\n"
+ find ${XBPS_SRCDISTDIR} -inum ${inode} -delete -print
+ fi
fi
- fi
- dfcount=$((dfcount + 1))
+ dfcount=$((dfcount + 1))
+ done
done
# We're done, if all distfiles were found and had good checksums
- [ $dfcount -eq $dfgood ] && return
+ [[ $dfcount -eq $dfgood ]] && return
# Download missing distfiles and verify their checksums
- dfcount=0
- for f in ${distfiles}; do
- curfile="${f#*>}"
- curfile="${curfile##*/}"
+ for curfile in ${!_file_idxs[@]}; do
distfile="$srcdir/$curfile"
# If file lock cannot be acquired wait until it's available.
- while true; do
- flock -w 1 ${distfile}.part true
- [ $? -eq 0 ] && break
+ while ! flock -w 1 "${distfile}.part" true; do
msg_warn "$pkgver: ${curfile} is already being downloaded, waiting for 1s ...\n"
done
+
+ if [[ -f "$distfile" ]]; then
+ continue
+ fi
+
# If distfile does not exist, try to link to it.
- if [ ! -f "$distfile" ]; then
- link_cksum $curfile $distfile $dfcount
+ if link_cksum "$curfile" "$distfile" "${_checksums[0]}"; then
+ continue
fi
+
# If distfile does not exist, download it from a mirror location.
- if [ ! -f "$distfile" ]; then
- try_mirrors $curfile $distfile $dfcount $pkgname-$version $f
- fi
- # If distfile does not exist, download it from the original location.
- if [[ "$FTP_RETRIES" && "${f}" =~ ^ftp:// ]]; then
- max_retries="$FTP_RETRIES"
- else
- max_retries=1
+ if try_mirrors "$curfile" "$distfile" "${_checksums[0]}" "${_distfiles[0]}"; then
+ continue
fi
- for retry in $(seq 1 1 $max_retries); do
- if [ ! -f "$distfile" ]; then
- if [ "$retry" == 1 ]; then
- msg_normal "$pkgver: fetching distfile '$curfile'...\n"
- else
- msg_normal "$pkgver: fetch attempt $retry of $max_retries...\n"
- fi
- flock "${distfile}.part" $fetch_cmd "$f"
- fi
- done
- if [ ! -f "$distfile" ]; then
- msg_error "$pkgver: failed to fetch $curfile.\n"
+
+ if ! try_urls "$curfile"; then
+ msg_error "$pkgver: failed to fetch '$curfile'.\n"
fi
- # distfile downloaded, verify sha256 hash.
- flock -n ${distfile}.part rm -f ${distfile}.part
- verify_cksum $curfile $distfile $dfcount
- dfcount=$((dfcount + 1))
done
unset TAR_CMD
- if [ $errors -gt 0 ]; then
+ if [[ $errors -gt 0 ]]; then
msg_error "$pkgver: couldn't verify distfiles, exiting...\n"
fi
}
diff --git a/srcpkgs/R-cran-pillar/template b/srcpkgs/R-cran-pillar/template
index e041a7a7c4b9..d8d381b8e4ac 100644
--- a/srcpkgs/R-cran-pillar/template
+++ b/srcpkgs/R-cran-pillar/template
@@ -11,4 +11,5 @@ short_desc="Coloured Formatting for Columns"
maintainer="Florian Wagner <florian@wagner-flo.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/r-lib/pillar/"
-checksum=0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672
+checksum="0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672
+ 0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672"
From 76044c6771453be87eac9ec24c5c553373692379 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:15:29 -0800
Subject: [PATCH 02/28] R-cran-R6: update to 2.5.1
---
srcpkgs/R-cran-R6/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index 3c35ffadb069..f68a32f2b334 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -1,13 +1,14 @@
# Template file for 'R-cran-R6'
pkgname=R-cran-R6
-version=2.5.0
+version=2.5.1
revision=1
build_style=R-cran
short_desc="Classes with Reference Semantics"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="MIT"
homepage="https://github.com/r-lib/R6"
-checksum=aec1af9626ec532cb883b544bf9eff4cb2d89c343c7ce0fa31761ec5a7882e02
+checksum="8d92bd29c2ed7bf15f2778618ffe4a95556193d21d8431a7f75e7e5fc102bf48
+ 8d92bd29c2ed7bf15f2778618ffe4a95556193d21d8431a7f75e7e5fc102bf48"
post_install() {
vlicense LICENSE
From e98cca57e48159c404cedc9b1235eb8c5c29790c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:15:51 -0800
Subject: [PATCH 03/28] R-cran-cli: update to 3.3.0
---
srcpkgs/R-cran-cli/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-cli/template b/srcpkgs/R-cran-cli/template
index b6c445ea9371..29740c254243 100644
--- a/srcpkgs/R-cran-cli/template
+++ b/srcpkgs/R-cran-cli/template
@@ -1,15 +1,16 @@
# Template file for 'R-cran-cli'
pkgname=R-cran-cli
-version=2.3.1
+version=3.3.0
revision=1
build_style=R-cran
makedepends="R-cran-assertthat R-cran-glue"
depends="R-cran-assertthat R-cran-glue"
short_desc="Helpers for Developing Command Line Interfaces"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="MIT"
homepage="https://github.com/r-lib/cli/"
-checksum=516ce2de54b4a58afa943f31dfdd925e532b67cf5f91aec355e255637b2406ca
+checksum="c3a9ebbcb9017fb9aeda4f7df5ca981e42b169cbd7ce13e592cda2cd74250d63
+ c3a9ebbcb9017fb9aeda4f7df5ca981e42b169cbd7ce13e592cda2cd74250d63"
post_install() {
vlicense LICENSE
From 5753c41bbdaaf3822a40778163f7179f7d976ea1 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:16:05 -0800
Subject: [PATCH 04/28] R-cran-colorspace: update to 2.0r3
---
srcpkgs/R-cran-colorspace/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/R-cran-colorspace/template b/srcpkgs/R-cran-colorspace/template
index 8490d34fdb58..4d3c2652e41d 100644
--- a/srcpkgs/R-cran-colorspace/template
+++ b/srcpkgs/R-cran-colorspace/template
@@ -1,13 +1,14 @@
# Template file for 'R-cran-colorspace'
pkgname=R-cran-colorspace
-version=1.4r1
-revision=2
+version=2.0r3
+revision=1
build_style=R-cran
short_desc="Color Space Manipulation"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="BSD-3-Clause"
homepage="http://www.hclwizard.org/r-colorspace/"
-checksum=693d713a050f8bfecdb7322739f04b40d99b55aed168803686e43401d5f0d673
+checksum="e75681cc4dd6e4b70303fd96a6d4597065dc6bffcaa4ae4244b73ff19016857f
+ e75681cc4dd6e4b70303fd96a6d4597065dc6bffcaa4ae4244b73ff19016857f"
post_install() {
vlicense LICENSE
From 765c30874ad79966a571437b72724afda0902df7 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:16:22 -0800
Subject: [PATCH 05/28] R-cran-cpp11: update to 0.4.2
---
srcpkgs/R-cran-cpp11/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-cpp11/template b/srcpkgs/R-cran-cpp11/template
index db827ed635bd..c4c696860df0 100644
--- a/srcpkgs/R-cran-cpp11/template
+++ b/srcpkgs/R-cran-cpp11/template
@@ -1,13 +1,14 @@
# Template file for 'R-cran-cpp11'
pkgname=R-cran-cpp11
-version=0.2.7
+version=0.4.2
revision=1
build_style=R-cran
short_desc="Header only, C++11 interface to R's C interface"
-maintainer="Cameron Nemo <cnemo@tutanota.com>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="MIT"
homepage="https://github.com/r-lib/cpp11"
-checksum=1d4154c0d8ef4b564eea828ebebc836b7dbdc89a0848a840dd98173b07f661d4
+checksum="403ce0bf82358d237176053b0fb1e958cb6bfa4d0fb3555bf5801db6a6939b99
+ 403ce0bf82358d237176053b0fb1e958cb6bfa4d0fb3555bf5801db6a6939b99"
post_install() {
vlicense LICENSE
From f50861ca43fc8a060fdd7c3ee9f670c7a046119c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:16:35 -0800
Subject: [PATCH 06/28] R-cran-crayon: update to 1.5.1
---
srcpkgs/R-cran-crayon/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-crayon/template b/srcpkgs/R-cran-crayon/template
index c836f1b82ac2..3046cdce3c32 100644
--- a/srcpkgs/R-cran-crayon/template
+++ b/srcpkgs/R-cran-crayon/template
@@ -1,13 +1,14 @@
# Template file for 'R-cran-crayon'
pkgname=R-cran-crayon
-version=1.4.1
+version=1.5.1
revision=1
build_style=R-cran
short_desc="Colored Terminal Output"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="MIT"
homepage="https://github.com/r-lib/crayon/"
-checksum=08b6e42e748d096960b2f32b7ffe690c25742e29fe14c19d1834cd6ff43029c7
+checksum="c025c73b78a8e88e8e4363c8e1a941da5089a7baea39e59ea5342ab9ebe45df9
+ c025c73b78a8e88e8e4363c8e1a941da5089a7baea39e59ea5342ab9ebe45df9"
post_install() {
vlicense LICENSE
From 8f7c7a5edc4e64ab1db5bc6091c8fd2deb4557a2 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:16:45 -0800
Subject: [PATCH 07/28] R-cran-digest: update to 0.6.29
---
srcpkgs/R-cran-digest/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-digest/template b/srcpkgs/R-cran-digest/template
index 0bf4c97052fe..c7144b801335 100644
--- a/srcpkgs/R-cran-digest/template
+++ b/srcpkgs/R-cran-digest/template
@@ -1,11 +1,12 @@
# Template file for 'R-cran-digest'
pkgname=R-cran-digest
-version=0.6.27
+version=0.6.29
revision=1
build_style=R-cran
short_desc="Create Compact Hash Digests of R Objects"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-2.0-or-later"
homepage="http://dirk.eddelbuettel.com/code/digest.html"
changelog="https://github.com/eddelbuettel/digest/raw/master/ChangeLog"
-checksum=f485f75122907da24c41d4a62c91a232f0c371befd2f77e973342a1bef00253f
+checksum="792c1f14a4c8047745152f5e45ce7351978af8d770c29d2ea39c7acd5d619cd9
+ 792c1f14a4c8047745152f5e45ce7351978af8d770c29d2ea39c7acd5d619cd9"
From d64c3565d009941dc81c1c025922287fe4419344 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:16:56 -0800
Subject: [PATCH 08/28] R-cran-dplyr: update to 1.0.9
---
srcpkgs/R-cran-dplyr/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-dplyr/template b/srcpkgs/R-cran-dplyr/template
index 46e0fe526326..0dfd7f990819 100644
--- a/srcpkgs/R-cran-dplyr/template
+++ b/srcpkgs/R-cran-dplyr/template
@@ -1,6 +1,6 @@
# Template file for 'R-cran-dplyr'
pkgname=R-cran-dplyr
-version=1.0.5
+version=1.0.9
revision=1
build_style=R-cran
makedepends="R-cran-ellipsis R-cran-generics R-cran-glue R-cran-lifecycle
@@ -10,10 +10,11 @@ depends="R-cran-ellipsis R-cran-generics R-cran-glue>=1.3.2
R-cran-lifecycle>=1.0.0 R-cran-magrittr>=1.5 R-cran-R6 R-cran-rlang>=0.4.10
R-cran-tibble>=2.1.3 R-cran-tidyselect>=1.1.0 R-cran-vctrs>=0.3.5"
short_desc="Grammar of Data Manipulation for R"
-maintainer="Cameron Nemo <cnemo@tutanota.com>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="MIT"
homepage="https://dplyr.tidyverse.org/"
-checksum=7541a09c66ecb40736e25bc9ec9591f26ec4ee67c99823b4ac855760b5c96e70
+checksum="e2e1f7312618b4e32ada9a1da79cef32eaec12acd408c973a6b069c6be4fb46b
+ e2e1f7312618b4e32ada9a1da79cef32eaec12acd408c973a6b069c6be4fb46b"
post_install() {
vlicense LICENSE
From eb1a5c63c8e0f9e78aa7c070ce2861c3664fd624 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:17:08 -0800
Subject: [PATCH 09/28] R-cran-ellipsis: update to 0.3.2
---
srcpkgs/R-cran-ellipsis/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/R-cran-ellipsis/template b/srcpkgs/R-cran-ellipsis/template
index 0e9f695fcec7..12e10542af68 100644
--- a/srcpkgs/R-cran-ellipsis/template
+++ b/srcpkgs/R-cran-ellipsis/template
@@ -1,12 +1,13 @@
# Template file for 'R-cran-ellipsis'
pkgname=R-cran-ellipsis
-version=0.3.1
-revision=2
+version=0.3.2
+revision=1
build_style=R-cran
makedepends="R-cran-rlang"
depends="R-cran-rlang>=0.3.0"
short_desc="Tools for making ... safer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-only"
homepage="https://ellipsis.r-lib.org/"
-checksum=4f8a15158dfc27cdc0f7554c7a61e92b02e4d70bfc3d968f01a99da2189b75db
+checksum="a90266e5eb59c7f419774d5c6d6bd5e09701a26c9218c5933c9bce6765aa1558
+ a90266e5eb59c7f419774d5c6d6bd5e09701a26c9218c5933c9bce6765aa1558"
From 3defb117cf93e6d0a7e6be09bddb39d3f78baaa2 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:17:21 -0800
Subject: [PATCH 10/28] R-cran-fansi: update to 1.0.3
---
srcpkgs/R-cran-fansi/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-fansi/template b/srcpkgs/R-cran-fansi/template
index a10f86c52f5e..b0b9e9dbff70 100644
--- a/srcpkgs/R-cran-fansi/template
+++ b/srcpkgs/R-cran-fansi/template
@@ -1,10 +1,11 @@
# Template file for 'R-cran-fansi'
pkgname=R-cran-fansi
-version=0.4.2
+version=1.0.3
revision=1
build_style=R-cran
short_desc="ANSI Control Sequence Aware String Functions"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-2.0-or-later"
homepage="https://cran.r-project.org/web/packages/fansi/index.html"
-checksum=a2edf06cf8b91333a5df4990d50cdb35a63aa4b63c8c8ddf5bedcb499daafc44
+checksum="86a7b83d8c9d28baebbde310cd0b459d0950a9c7ff1a6276ce5858f6a89bc06a
+ 86a7b83d8c9d28baebbde310cd0b459d0950a9c7ff1a6276ce5858f6a89bc06a"
From cba5696ff34030bd1ea9b68ca89c2ce626ad0d7d Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:17:32 -0800
Subject: [PATCH 11/28] R-cran-farver: update to 2.1.1
---
srcpkgs/R-cran-farver/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/R-cran-farver/template b/srcpkgs/R-cran-farver/template
index 370c2330df8a..35c0238b4e49 100644
--- a/srcpkgs/R-cran-farver/template
+++ b/srcpkgs/R-cran-farver/template
@@ -1,13 +1,14 @@
# Template file for 'R-cran-farver'
pkgname=R-cran-farver
-version=2.0.3
-revision=2
+version=2.1.1
+revision=1
build_style=R-cran
short_desc="High Performance Colour Space Manipulation"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="MIT"
homepage="https://github.com/thomasp85/farver"
-checksum=0e1590df79ec6078f10426411b96216b70568a4eaf3ffd84ca723add0ed8e5cc
+checksum="0dcfda6ca743f465372790bcff1bcbc6a7145fdac1c682b021f654e8c6c996ce
+ 0dcfda6ca743f465372790bcff1bcbc6a7145fdac1c682b021f654e8c6c996ce"
post_install() {
vlicense LICENSE
From 0b24cf3e63d845f15e918ef2506bfb114ccb8100 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:17:41 -0800
Subject: [PATCH 12/28] R-cran-generics: update to 0.1.3
---
srcpkgs/R-cran-generics/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/R-cran-generics/template b/srcpkgs/R-cran-generics/template
index 0d3797c2cddc..d77cdc63360d 100644
--- a/srcpkgs/R-cran-generics/template
+++ b/srcpkgs/R-cran-generics/template
@@ -1,10 +1,11 @@
# Template file for 'R-cran-generics'
pkgname=R-cran-generics
-version=0.1.0
+version=0.1.3
revision=1
build_style=R-cran
short_desc="Common generic S3 methods "
maintainer="luhann <lukehannan@gmail.com>"
license="GPL-2.0-only"
homepage="https://github.com/r-lib/generics"
-checksum=ab71d1bdbb66c782364c61cede3c1186d6a94c03635f9af70d926e2c1ac88763
+checksum="75046163bfa8b8a4f4214c1b689e796207f6447182f2e5062cf570302387d053
+ 75046163bfa8b8a4f4214c1b689e796207f6447182f2e5062cf570302387d053"
From 8daf259b323445e56c912edce60d27ad3061501c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:17:51 -0800
Subject: [PATCH 13/28] R-cran-glue: update to 1.6.2
---
srcpkgs/R-cran-glue/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-glue/template b/srcpkgs/R-cran-glue/template
index 33a22e9c8dc7..3ed8437147ab 100644
--- a/srcpkgs/R-cran-glue/template
+++ b/srcpkgs/R-cran-glue/template
@@ -1,13 +1,14 @@
# Template file for 'R-cran-glue'
pkgname=R-cran-glue
-version=1.4.2
+version=1.6.2
revision=1
build_style=R-cran
short_desc="Interpreted String Literals"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="MIT"
homepage="https://github.com/tidyverse/glue/"
-checksum=9f7354132a26e9a876428fa87629b9aaddcd558f9932328e6ac065b95b8ef7ad
+checksum="9da518f12be584c90e75fe8e07f711ee3f6fc0d03d817f72c25dc0f66499fdbf
+ 9da518f12be584c90e75fe8e07f711ee3f6fc0d03d817f72c25dc0f66499fdbf"
post_install() {
vlicense LICENSE
From 44c97b5c3be81abd02b16abb059a167cffe0ffa9 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:17:59 -0800
Subject: [PATCH 14/28] R-cran-isoband: update to 0.2.5
---
srcpkgs/R-cran-isoband/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/R-cran-isoband/template b/srcpkgs/R-cran-isoband/template
index dd88c5e9d570..b0e1d1d2fc2f 100644
--- a/srcpkgs/R-cran-isoband/template
+++ b/srcpkgs/R-cran-isoband/template
@@ -1,13 +1,14 @@
# Template file for 'R-cran-isoband'
pkgname=R-cran-isoband
-version=0.2.4
+version=0.2.5
revision=1
build_style=R-cran
short_desc="Generate Isolines and Isobands from Regularly Spaced Elevation Grids"
maintainer="Luke Hannan <lukehannan@gmail.com>"
license="MIT"
homepage="https://github.com/wilkelab/isoband"
-checksum=96d5bbdbfa4ead40bf30cec5a0d525b6a6b0f21eb92d179289ce2c4459bf387c
+checksum="46f53fa066f0966f02cb2bf050190c0d5e950dab2cdf565feb63fc092c886ba5
+ 46f53fa066f0966f02cb2bf050190c0d5e950dab2cdf565feb63fc092c886ba5"
post_install() {
vlicense LICENSE
From 6d574d040c8017331688db558e9409b0baa9cea3 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:18:11 -0800
Subject: [PATCH 15/28] R-cran-labeling: update to 0.4.2
---
srcpkgs/R-cran-labeling/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/R-cran-labeling/template b/srcpkgs/R-cran-labeling/template
index 4ec70142e3d9..d4567c0f8974 100644
--- a/srcpkgs/R-cran-labeling/template
+++ b/srcpkgs/R-cran-labeling/template
@@ -1,13 +1,14 @@
# Template file for 'R-cran-labeling'
pkgname=R-cran-labeling
-version=0.3
-revision=2
+version=0.4.2
+revision=1
build_style=R-cran
short_desc="Axis Labeling"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="MIT"
homepage="https://cran.r-project.org/web/packages/labeling/"
-checksum=0d8069eb48e91f6f6d6a9148f4e2dc5026cabead15dd15fc343eff9cf33f538f
+checksum="e022d79276173e0d62bf9e37d7574db65ab439eb2ae1833e460b1cff529bd165
+ e022d79276173e0d62bf9e37d7574db65ab439eb2ae1833e460b1cff529bd165"
post_install() {
vlicense LICENSE
From 97a6d7ce6d75f45d2c41b5be50c0d952828a7a47 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:18:27 -0800
Subject: [PATCH 16/28] R-cran-lifecycle: update to 1.0.1
---
srcpkgs/R-cran-lifecycle/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-lifecycle/template b/srcpkgs/R-cran-lifecycle/template
index e3a2af69c4e6..8ba75db113a5 100644
--- a/srcpkgs/R-cran-lifecycle/template
+++ b/srcpkgs/R-cran-lifecycle/template
@@ -1,15 +1,16 @@
# Template file for 'R-cran-lifecycle'
pkgname=R-cran-lifecycle
-version=1.0.0
+version=1.0.1
revision=1
build_style=R-cran
makedepends="R-cran-glue R-cran-rlang"
depends="R-cran-glue R-cran-rlang"
short_desc="Manage the Life Cycle of your Package Functions"
-maintainer="Cameron Nemo <cnemo@tutanota.com>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="MIT"
homepage="https://github.com/r-lib/lifecycle"
-checksum=03334ab213f2ad49a49e184e73f2051e04d35d43f562db903e68243cd2ec0f8e
+checksum="1da76e1c00f1be96ca34e122ae611259430bf99d6a1b999fdef70c00c30f7ba0
+ 1da76e1c00f1be96ca34e122ae611259430bf99d6a1b999fdef70c00c30f7ba0"
post_install() {
vlicense LICENSE
From a171a2efa37be8047c8a027ceb151ddafa7ddc20 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:18:56 -0800
Subject: [PATCH 17/28] R-cran-magrittr: update to 2.0.3
---
srcpkgs/R-cran-magrittr/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-magrittr/template b/srcpkgs/R-cran-magrittr/template
index 1e4ecaa43834..a7e77b259bcd 100644
--- a/srcpkgs/R-cran-magrittr/template
+++ b/srcpkgs/R-cran-magrittr/template
@@ -1,13 +1,14 @@
# Template file for 'R-cran-magrittr'
pkgname=R-cran-magrittr
-version=2.0.1
+version=2.0.3
revision=1
build_style=R-cran
short_desc="Forward-Pipe Operator for R"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="MIT"
homepage="https://cran.r-project.org/web/packages/magrittr/index.html"
-checksum=75c265d51cc2b34beb27040edb09823c7b954d3990a7a931e40690b75d4aad5f
+checksum="a2bff83f792a1acb801bfe6330bb62724c74d5308832f2cb6a6178336ace55d2
+ a2bff83f792a1acb801bfe6330bb62724c74d5308832f2cb6a6178336ace55d2"
post_install() {
vlicense LICENSE
From fcb8bf4b6c410142f00384b6726f3924a8da4ae7 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:19:06 -0800
Subject: [PATCH 18/28] R-cran-pillar: update to 1.7.0
---
srcpkgs/R-cran-pillar/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/R-cran-pillar/template b/srcpkgs/R-cran-pillar/template
index d8d381b8e4ac..c7a529db88fa 100644
--- a/srcpkgs/R-cran-pillar/template
+++ b/srcpkgs/R-cran-pillar/template
@@ -1,6 +1,6 @@
# Template file for 'R-cran-pillar'
pkgname=R-cran-pillar
-version=1.5.1
+version=1.7.0
revision=1
build_style=R-cran
makedepends="R-cran-cli R-cran-crayon R-cran-ellipsis R-cran-lifecycle
@@ -8,8 +8,8 @@ makedepends="R-cran-cli R-cran-crayon R-cran-ellipsis R-cran-lifecycle
depends="R-cran-cli R-cran-crayon R-cran-ellipsis R-cran-lifecycle
R-cran-rlang R-cran-utf8 R-cran-fansi R-cran-vctrs"
short_desc="Coloured Formatting for Columns"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/r-lib/pillar/"
-checksum="0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672
- 0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672"
+checksum="7841f89658cc8935568c0ff24dc480b4481bac896de2f6447050abc4360a13bb
+ 7841f89658cc8935568c0ff24dc480b4481bac896de2f6447050abc4360a13bb"
From 65156644de0ac054b244a4f325c5e13fb6344e09 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:19:18 -0800
Subject: [PATCH 19/28] R-cran-rlang: update to 1.0.4
---
srcpkgs/R-cran-rlang/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-rlang/template b/srcpkgs/R-cran-rlang/template
index 73a4a65e4e9b..885949f969eb 100644
--- a/srcpkgs/R-cran-rlang/template
+++ b/srcpkgs/R-cran-rlang/template
@@ -1,10 +1,11 @@
# Template file for 'R-cran-rlang'
pkgname=R-cran-rlang
-version=0.4.10
+version=1.0.4
revision=1
build_style=R-cran
short_desc="Functions for Base Types and Core R and 'Tidyverse' Features"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-or-later"
homepage="https://rlang.r-lib.org/"
-checksum=07530270c4c199f2b7efc5d57a476d99babd9d0c3388a02bb7d57fe312da3576
+checksum="1fb789d46c6a855ce37eba63c353b85aa600c4a2a7ca6075f2632540b42a8696
+ 1fb789d46c6a855ce37eba63c353b85aa600c4a2a7ca6075f2632540b42a8696"
From 40987739a96c00d42a6992a75d8d652ba94c3eaf Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:19:28 -0800
Subject: [PATCH 20/28] R-cran-svglite: update to 2.1.0
---
srcpkgs/R-cran-svglite/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-svglite/template b/srcpkgs/R-cran-svglite/template
index 90557ae178aa..deaea819d563 100644
--- a/srcpkgs/R-cran-svglite/template
+++ b/srcpkgs/R-cran-svglite/template
@@ -1,12 +1,13 @@
# Template file for 'R-cran-svglite'
pkgname=R-cran-svglite
-version=2.0.0
+version=2.1.0
revision=1
build_style=R-cran
makedepends="R-cran-systemfonts R-cran-cpp11 libpng-devel"
depends="R-cran-systemfonts"
short_desc="Lightweight svg graphics device for R"
-maintainer="Cameron Nemo <cnemo@tutanota.com>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-2.0-or-later"
homepage="https://svglite.r-lib.org"
-checksum=76e625fe172a5b7ce99a67b6d631b037b3f7f0021cfe15f2e15e8851b89defa5
+checksum="ad40f590c7e80ae83001a3826b6e8394ba733446ed51fd55faeda974ab839c9b
+ ad40f590c7e80ae83001a3826b6e8394ba733446ed51fd55faeda974ab839c9b"
From 977b000199d24f229a436f26a62b9060db5059fa Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:19:38 -0800
Subject: [PATCH 21/28] R-cran-systemfonts: update to 1.0.4
---
srcpkgs/R-cran-systemfonts/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-systemfonts/template b/srcpkgs/R-cran-systemfonts/template
index b779dd8d8ebf..a477c6dbcc79 100644
--- a/srcpkgs/R-cran-systemfonts/template
+++ b/srcpkgs/R-cran-systemfonts/template
@@ -1,15 +1,16 @@
# Template file for 'R-cran-systemfonts'
pkgname=R-cran-systemfonts
-version=1.0.2
+version=1.0.4
revision=1
build_style=R-cran
hostmakedepends="pkg-config"
makedepends="fontconfig-devel freetype-devel R-cran-cpp11"
short_desc="System Native Font Handling in R"
-maintainer="Cameron Nemo <cnemo@tutanota.com>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="MIT"
homepage="https://github.com/r-lib/systemfonts"
-checksum=21ac96412846e06a4062362b159213cb9d83bd60fdf03aa235992b6c49fb36a9
+checksum="ef766c75b942f147d382664a00d6a4930f1bfe0cce9d88943f571682a85a84c0
+ ef766c75b942f147d382664a00d6a4930f1bfe0cce9d88943f571682a85a84c0"
post_install() {
vlicense LICENSE
From a367df60a39b8cd312355e73f27233b169ff9f8e Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:19:51 -0800
Subject: [PATCH 22/28] R-cran-tibble: update to 3.1.7
---
srcpkgs/R-cran-tibble/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-tibble/template b/srcpkgs/R-cran-tibble/template
index 048d739f793e..e7c030604b4f 100644
--- a/srcpkgs/R-cran-tibble/template
+++ b/srcpkgs/R-cran-tibble/template
@@ -1,6 +1,6 @@
# Template file for 'R-cran-tibble'
pkgname=R-cran-tibble
-version=3.1.0
+version=3.1.7
revision=1
build_style=R-cran
makedepends="R-cran-ellipsis
@@ -10,10 +10,11 @@ depends="R-cran-ellipsis
R-cran-fansi R-cran-lifecycle R-cran-magrittr
R-cran-pillar R-cran-rlang R-cran-pkgconfig R-cran-vctrs"
short_desc="Simple Data Frames"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="MIT"
homepage="http://tibble.tidyverse.org/"
-checksum=959e28dea05181a7cd43a744028892261bda4c7ec78ad35fb148d144dcf5154e
+checksum="e1a50891f476803526960b4c4d736a72e7d9c3d366946744a02d6347f591c872
+ e1a50891f476803526960b4c4d736a72e7d9c3d366946744a02d6347f591c872"
post_install() {
vlicense LICENSE
From d55d10cf242ba4b306467cf57fca26ce9fd1114d Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:20:04 -0800
Subject: [PATCH 23/28] R-cran-tidyselect: update to 1.1.2
---
srcpkgs/R-cran-tidyselect/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-tidyselect/template b/srcpkgs/R-cran-tidyselect/template
index e7cd851913e6..6755ab433e86 100644
--- a/srcpkgs/R-cran-tidyselect/template
+++ b/srcpkgs/R-cran-tidyselect/template
@@ -1,13 +1,14 @@
# Template file for 'R-cran-tidyselect'
pkgname=R-cran-tidyselect
-version=1.1.0
+version=1.1.2
revision=1
build_style=R-cran
makedepends="R-cran-ellipsis R-cran-glue R-cran-purrr R-cran-rlang R-cran-vctrs"
depends="R-cran-ellipsis R-cran-glue>=1.3.0 R-cran-purrr>=0.3.2
R-cran-rlang>=0.4.6 R-cran-vctrs>=0.2.2"
short_desc="Backend for selecting functions of the tidyverse"
-maintainer="Cameron Nemo <cnemo@tutanota.com>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-or-later"
homepage="https://tidyselect.r-lib.org/"
-checksum=e635ed381fb53f7a53c3fa36bb33e134a3273d272367de2a8d909c821be93893
+checksum="0389a3b15417954a30d6d692f6ebdd3d0f318cb94a5c9b05365df2f4ea1d8270
+ 0389a3b15417954a30d6d692f6ebdd3d0f318cb94a5c9b05365df2f4ea1d8270"
From ef770c6695405f7115d8d11467dabe1c8c01f028 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:20:15 -0800
Subject: [PATCH 24/28] R-cran-utf8: update to 1.2.2
---
srcpkgs/R-cran-utf8/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/R-cran-utf8/template b/srcpkgs/R-cran-utf8/template
index 55923b13fa51..ee32436be4da 100644
--- a/srcpkgs/R-cran-utf8/template
+++ b/srcpkgs/R-cran-utf8/template
@@ -1,10 +1,11 @@
# Template file for 'R-cran-utf8'
pkgname=R-cran-utf8
-version=1.1.4
-revision=2
+version=1.2.2
+revision=1
build_style=R-cran
short_desc="Unicode Text Processing"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="Apache-2.0"
homepage="https://github.com/patperry/r-utf8/"
-checksum=f6da9cadfc683057d45f54b43312a359cf96ec2731c0dda18a8eae31d1e31e54
+checksum="a71aee87d43a9bcf29249c7a5a2e9ca1d2a836e8d5ee3a264d3062f25378d8f4
+ a71aee87d43a9bcf29249c7a5a2e9ca1d2a836e8d5ee3a264d3062f25378d8f4"
From a585c0802b253a8ca6e730b05ca67e34e6f8c6c1 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:20:35 -0800
Subject: [PATCH 25/28] R-cran-vctrs: update to 0.4.1
---
srcpkgs/R-cran-vctrs/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/R-cran-vctrs/template b/srcpkgs/R-cran-vctrs/template
index 2246112ef700..9fff406c16b8 100644
--- a/srcpkgs/R-cran-vctrs/template
+++ b/srcpkgs/R-cran-vctrs/template
@@ -1,12 +1,13 @@
# Template file for 'R-cran-vctrs'
pkgname=R-cran-vctrs
-version=0.3.6
+version=0.4.1
revision=1
build_style=R-cran
-makedepends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"
-depends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"
+makedepends="R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-cli"
+depends="R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-cli"
short_desc="Vector Helpers"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-only"
homepage="https://github.com/r-lib/vctrs"
-checksum=df7d368c9f2d2ad14872ba2a09821ec4f5a8ad77c81a0b05e1f440e5ffebad25
+checksum="9676881e009aa1217818f326338e8b35dd9a9438918f8b1ac249f4c8afe460dd
+ 9676881e009aa1217818f326338e8b35dd9a9438918f8b1ac249f4c8afe460dd"
From 1812347aebbd8e34051e4f1b00d8032b862765e9 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:20:46 -0800
Subject: [PATCH 26/28] R-cran-viridisLite: update to 0.4.0
---
srcpkgs/R-cran-viridisLite/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/R-cran-viridisLite/template b/srcpkgs/R-cran-viridisLite/template
index c0b759859975..a825ef5d5694 100644
--- a/srcpkgs/R-cran-viridisLite/template
+++ b/srcpkgs/R-cran-viridisLite/template
@@ -1,13 +1,14 @@
# Template file for 'R-cran-viridisLite'
pkgname=R-cran-viridisLite
-version=0.3.0
-revision=2
+version=0.4.0
+revision=1
build_style=R-cran
short_desc="Default Color Maps from 'matplotlib' (Lite Version)"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="MIT"
homepage="https://github.com/sjmgarnier/viridisLite"
-checksum=780ea12e7c4024d5ba9029f3a107321c74b8d6d9165262f6e64b79e00aa0c2af
+checksum="849955dc8ad9bc52bdc50ed4867fd92a510696fc8294e6971efa018437c83c6a
+ 849955dc8ad9bc52bdc50ed4867fd92a510696fc8294e6971efa018437c83c6a"
post_install() {
vlicense LICENSE
From d245b692e955ac318640cd585920292c326a9796 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 12 Mar 2022 16:21:00 -0800
Subject: [PATCH 27/28] R-cran-withr: update to 2.5.0
---
srcpkgs/R-cran-withr/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/R-cran-withr/template b/srcpkgs/R-cran-withr/template
index 60285166a63f..0461f1cbd9f7 100644
--- a/srcpkgs/R-cran-withr/template
+++ b/srcpkgs/R-cran-withr/template
@@ -1,10 +1,11 @@
# Template file for 'R-cran-withr'
pkgname=R-cran-withr
-version=2.4.1
+version=2.5.0
revision=1
build_style=R-cran
short_desc="Run Code 'With' Temporarily Modified Global State"
-maintainer="Florian Wagner <florian@wagner-flo.net>"
+maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-2.0-or-later"
homepage="http://withr.r-lib.org/"
-checksum=5f5ed9058d51b676f8b170b32bc0952ace6790e038f2b6d6860c5bb94f67178f
+checksum="37317b3ed790a08407072993a05ab255f6305f95a12a16e0e28aa6aa80fc8bc0
+ 37317b3ed790a08407072993a05ab255f6305f95a12a16e0e28aa6aa80fc8bc0"
From 76aed4ba58c2cdcb6fed7af14cda541b46a23438 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 17 Jul 2022 14:48:59 -0700
Subject: [PATCH 28/28] R-cran-ggplot2: update to 3.3.6
---
srcpkgs/R-cran-ggplot2/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ddf1e5bb6038..6f758342cadf 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -1,6 +1,6 @@
# Template file for 'R-cran-ggplot2'
pkgname=R-cran-ggplot2
-version=3.3.5
+version=3.3.6
revision=1
build_style=R-cran
makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
@@ -11,4 +11,5 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
maintainer="Florian Wagner <florian@wagner-flo.net>"
license="GPL-2.0-only"
homepage="https://ggplot2.tidyverse.org/"
-checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
+checksum="bfcb4eb92a0fcd3fab713aca4bb25e916e05914f2540271a45522ad7e43943a9
+ bfcb4eb92a0fcd3fab713aca4bb25e916e05914f2540271a45522ad7e43943a9"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: R cran updates
2022-09-06 2:53 [PR PATCH] R cran updates CameronNemo
2022-09-06 3:05 ` [PR PATCH] [Updated] " CameronNemo
@ 2022-09-06 14:41 ` sgn
1 sibling, 0 replies; 4+ messages in thread
From: sgn @ 2022-09-06 14:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There's a merged pull request on the void-packages repository
R cran updates
https://github.com/void-linux/void-packages/pull/39128
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: R cran updates
2022-10-18 3:06 [PR PATCH] " CameronNemo
@ 2022-10-24 0:56 ` sgn
0 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2022-10-24 0:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1454 bytes --]
There's a merged pull request on the void-packages repository
R cran updates
https://github.com/void-linux/void-packages/pull/40016
Description:
- R-cran-cli: update to 3.4.1
- R-cran-cpp11: update to 0.4.3
- R-cran-dplyr: update to 1.0.10
- R-cran-crayon: update to 1.5.2
- R-cran-lifecycle: update to 1.0.3
- R-cran-pillar: update to 1.8.1
- R-cran-purrr: update to 0.3.5
- R-cran-rlang: update to 1.0.6
- R-cran-tibble: update to 3.1.8
- R-cran-tidyselect: update to 1.2.0
- R-cran-vctrs: update to 0.4.2
- R-cran-viridisLite: update to 0.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-24 0:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-06 2:53 [PR PATCH] R cran updates CameronNemo
2022-09-06 3:05 ` [PR PATCH] [Updated] " CameronNemo
2022-09-06 14:41 ` [PR PATCH] [Merged]: " sgn
2022-10-18 3:06 [PR PATCH] " CameronNemo
2022-10-24 0:56 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).