Skip to content

Commit

Permalink
Merge pull request #603 from lorenzwalthert/hook-dependencies-update
Browse files Browse the repository at this point in the history
Hook dependencies update
  • Loading branch information
lorenzwalthert authored Nov 1, 2024
2 parents 9525a2e + 83f6454 commit 7729a33
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 16 deletions.
20 changes: 10 additions & 10 deletions renv.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"R": {
"Version": "4.4.1",
"Version": "4.4.2",
"Repositories": [
{
"Name": "RSPM",
"URL": "https://packagemanager.posit.co/cran/2024-10-11"
"URL": "https://packagemanager.posit.co/cran/2024-10-29"
}
]
},
Expand Down Expand Up @@ -349,7 +349,7 @@
},
"pkgbuild": {
"Package": "pkgbuild",
"Version": "1.4.4",
"Version": "1.4.5",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
Expand All @@ -360,7 +360,7 @@
"desc",
"processx"
],
"Hash": "a29e8e134a460a01e0ca67a4763c595b"
"Hash": "30eaaab94db72652e72e3475c1b55278"
},
"pkgload": {
"Package": "pkgload",
Expand Down Expand Up @@ -399,14 +399,14 @@
},
"ps": {
"Package": "ps",
"Version": "1.8.0",
"Version": "1.8.1",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"R",
"utils"
],
"Hash": "4b9c8485b0c7eecdf0a9ba5132a45576"
"Hash": "b4404b1de13758dea1c0484ad0d48563"
},
"purrr": {
"Package": "purrr",
Expand Down Expand Up @@ -439,13 +439,13 @@
},
"renv": {
"Package": "renv",
"Version": "1.0.10",
"Version": "1.0.11",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"utils"
],
"Hash": "d0387d5687ec933dd7587efd4cfa2d85"
"Hash": "47623f66b4e80b3b0587bc5d7b309888"
},
"rex": {
"Package": "rex",
Expand Down Expand Up @@ -582,15 +582,15 @@
},
"withr": {
"Package": "withr",
"Version": "3.0.1",
"Version": "3.0.2",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"R",
"grDevices",
"graphics"
],
"Hash": "07909200e8bbe90426fbfeb73e1e27aa"
"Hash": "cc2d62c76458d425210d1eb1478b30b4"
},
"xfun": {
"Package": "xfun",
Expand Down
10 changes: 4 additions & 6 deletions renv/activate.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
local({

# the requested version of renv
version <- "1.0.10"
version <- "1.0.11"
attr(version, "sha") <- NULL

# the project directory
Expand Down Expand Up @@ -368,8 +368,7 @@ local({
quiet = TRUE
)

if ("headers" %in% names(formals(utils::download.file)))
{
if ("headers" %in% names(formals(utils::download.file))) {
headers <- renv_bootstrap_download_custom_headers(url)
if (length(headers) && is.character(headers))
args$headers <- headers
Expand Down Expand Up @@ -457,9 +456,8 @@ local({

# add custom headers if available -- note that
# utils::available.packages() will pass this to download.file()
if ("headers" %in% names(formals(utils::download.file)))
{
headers <- renv_bootstrap_download_custom_headers(url)
if ("headers" %in% names(formals(utils::download.file))) {
headers <- renv_bootstrap_download_custom_headers(repos)
if (length(headers) && is.character(headers))
args$headers <- headers
}
Expand Down

0 comments on commit 7729a33

Please sign in to comment.