diff options
| author | Phil Dyer <phildyer@protonmail.com> | 2021-06-25 12:33:54 +1000 |
|---|---|---|
| committer | Phil Dyer <phildyer@protonmail.com> | 2021-08-24 09:11:14 +1000 |
| commit | d7ac07cdbbba71cdd8a5f6a762595f1e7082c9a9 (patch) | |
| tree | 5d4236e33023a6d5eeddf2a43c2a9f1bbb211cc2 /pkgs/development/r-modules/generate-r-packages.R | |
| parent | 99967a54d893b9742b38809ccfe3172b6918bdef (diff) | |
r-modules: fix r package build failures
r-modules: fix r package system dependencies
r-modules: fix terra package dependencies
r-modules: fix edge case for R package import
The R package "import" has a name that clashes
with the nix function "import". The package
name in nixpkgs is correctly modified to
avoid the clash, but the name of the
R package was also being changed in
cran-packages.nix, which broke downloading
of the package.
cran-packages.nix has been manually patched,
and genreate-r-packages.R has been fixed so
future automatic updates will succeed.
r-modules: fix repeated `pkgs.` and svglite
Diffstat (limited to 'pkgs/development/r-modules/generate-r-packages.R')
| -rwxr-xr-x | pkgs/development/r-modules/generate-r-packages.R | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R index da9e0970b0f4..1ac15ef79e79 100755 --- a/pkgs/development/r-modules/generate-r-packages.R +++ b/pkgs/development/r-modules/generate-r-packages.R @@ -48,8 +48,7 @@ escapeName <- function(name) { } formatPackage <- function(name, version, sha256, depends, imports, linkingTo) { - name <- escapeName(name) - attr <- gsub(".", "_", name, fixed=TRUE) + attr <- gsub(".", "_", escapeName(name), fixed=TRUE) options(warn=5) depends <- paste( if (is.na(depends)) "" else gsub("[ \t\n]+", "", depends) , if (is.na(imports)) "" else gsub("[ \t\n]+", "", imports) |