Update R packages (#1460)

emscripten-forge · Dec 12, 2024 · 64bdd74 · 64bdd74
1 parent b4e1d1b
commit 64bdd74
Show file tree

Hide file tree

Showing 6 changed files with 207 additions and 222 deletions.
diff --git a/recipes/recipes_emscripten/r-htmltools/recipe.yaml b/recipes/recipes_emscripten/r-htmltools/recipe.yaml
@@ -1,11 +1,7 @@
 context:
   name: r-htmltools
   version: 0.5.8.1
-  r_base_version: 4.4.1
-
-package:
-  name: ${{ name }}
-  version: ${{ version }}
+  r_base_version: 4.4.2
 
 source:
   url:
@@ -14,43 +10,45 @@ source:
   sha256: f9f62293ec06c353c4584db6ccedb06a2da12e485208bd26b856f17dd013f176
 
 build:
-  number: 1
-  script:
-    - $R CMD INSTALL $R_ARGS --no-byte-compile .
-    - rm $PREFIX/lib/R/library/grDevices/libs/cairo.so
-    - rm $PREFIX/lib/R/library/tcltk/libs/tcltk.so
-    # The activation script of cross-r-base copies cairo and tcltk from
-    # the build environment.
+  number: 2
+  script: $R CMD INSTALL $R_ARGS --no-byte-compile .
 
-requirements:
+outputs:
+- package:
+    name: ${{ name }}
+    version: ${{ version }}
   build:
-  - cross-r-base >= ${{ r_base_version }}
-  - r-base64enc
-  - r-digest
-  - r-ellipsis
-  - r-fastmap
-  - r-rlang
-  - ${{ compiler('c') }}
-  - ${{ compiler('cxx') }}
-  host:
-  - r-base == ${{ r_base_version }}
-  - r-base64enc
-  - r-digest
-  - r-ellipsis
-  - r-fastmap
-  - r-rlang
-  run:
-  - r-base == ${{ r_base_version }}
-  - r-base64enc
-  - r-digest
-  - r-ellipsis
-  - r-fastmap
-  - r-rlang
+    files:
+      - lib/R/library/${{ name[2:] }}/*
+  requirements:
+    build:
+    - cross-r-base >= ${{ r_base_version }}
+    - r-base64enc
+    - r-digest
+    - r-ellipsis
+    - r-fastmap
+    - r-rlang
+    - ${{ compiler('c') }}
+    - ${{ compiler('cxx') }}
+    host:
+    - r-base >= ${{ r_base_version }}
+    - r-base64enc
+    - r-digest
+    - r-ellipsis
+    - r-fastmap
+    - r-rlang
+    run:
+    - r-base >= ${{ r_base_version }}
+    - r-base64enc
+    - r-digest
+    - r-ellipsis
+    - r-fastmap
+    - r-rlang
 
-tests:
-- package_contents:
-    lib:
-    - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
+  tests:
+  - package_contents:
+      lib:
+      - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
 
 about:
   homepage: https://github.com/rstudio/htmltools

diff --git a/recipes/recipes_emscripten/r-matrix/recipe.yaml b/recipes/recipes_emscripten/r-matrix/recipe.yaml
@@ -1,46 +1,44 @@
 context:
   name: r-matrix
-  version: 1.7-0
-  r_base_version: 4.4.1
-
-package:
-  name: ${{ name }}
-  version: ${{ version|replace('-', '_') }}
+  version: 1.7-1
+  r_base_version: 4.4.2
 
 source:
   url:
     - https://cran.r-project.org/src/contrib/Matrix_${{ version }}.tar.gz
     - https://cloud.r-project.org/src/contrib/Matrix_${{ version }}.tar.gz
-  sha256: fb97bba0df370222eb4f7e2da2e94dd01053b5e054b1c51829ff9a6efc08ad37
+  sha256: a2cabbf04e4e2cafbd0a04281f130bb58e4f7653a91951368a404ef8682b38a1
 
 build:
-  number: 1
-  script:
-    - $R CMD INSTALL $R_ARGS --no-byte-compile .
-    - rm $PREFIX/lib/R/library/grDevices/libs/cairo.so
-    - rm $PREFIX/lib/R/library/tcltk/libs/tcltk.so
-    # The activation script of cross-r-base copies cairo and tcltk from
-    # the build environment.
+  number: 0
+  script: $R CMD INSTALL $R_ARGS --no-byte-compile .
 
-requirements:
+outputs:
+- package:
+    name: ${{ name }}
+    version: ${{ version|replace('-', '_') }}
   build:
-  - cross-r-base >= ${{ r_base_version }}
-  - r-lattice
-  - ${{ compiler('c') }}
-  host:
-  - r-base == ${{ r_base_version }}
-  - r-lattice
-  - libblas>=3.12
-  - liblapack>=3.12
-  - libflang                  # for FortranRuntime
-  run:
-  - r-base == ${{ r_base_version }}
-  - r-lattice
+    files:
+      - lib/R/library/Matrix/*
+  requirements:
+    build:
+    - cross-r-base >= ${{ r_base_version }}
+    - r-lattice
+    - ${{ compiler('c') }}
+    host:
+    - r-base >= ${{ r_base_version }}
+    - r-lattice
+    - libblas>=3.12
+    - liblapack>=3.12
+    - libflang                  # for FortranRuntime
+    run:
+    - r-base >= ${{ r_base_version }}
+    - r-lattice
 
-tests:
-- package_contents:
-    lib:
-    - R/library/Matrix/libs/Matrix.so
+  tests:
+  - package_contents:
+      lib:
+      - R/library/Matrix/libs/Matrix.so
 
 about:
   homepage: http://Matrix.R-forge.R-project.org/

diff --git a/recipes/recipes_emscripten/r-mgcv/recipe.yaml b/recipes/recipes_emscripten/r-mgcv/recipe.yaml
@@ -1,11 +1,7 @@
 context:
   name: r-mgcv
   version: 1.9-1
-  r_base_version: 4.4.1
-
-package:
-  name: ${{ name }}
-  version: ${{ version|replace('-', '_') }}
+  r_base_version: 4.4.2
 
 source:
   url:
@@ -14,39 +10,38 @@ source:
   sha256: 700fbc37bedd3a49505b9bc4949faee156d9cfb4f669d797d06a10a15a5bdb32
 
 build:
-  number: 1
-  script:
-    - $R CMD INSTALL $R_ARGS --no-byte-compile .
-    - rm $PREFIX/lib/R/library/grDevices/libs/cairo.so
-    - rm $PREFIX/lib/R/library/tcltk/libs/tcltk.so
-    # The activation script of cross-r-base copies cairo and tcltk from
-    # the build environment.
-
-    # Remove the Matrix folder which is not required.
-    - rm -rf $PREFIX/lib/R/library/Matrix
+  number: 2
+  script: $R CMD INSTALL $R_ARGS --no-byte-compile .
 
-requirements:
+outputs:
+- package:
+    name: ${{ name }}
+    version: ${{ version|replace('-', '_') }}
   build:
-  - cross-r-base >= ${{ r_base_version }}
-  - r-matrix
-  - r-nlme
-  - ${{ compiler('c') }}
-  host:
-  - r-base == ${{ r_base_version }}
-  - libblas>=3.12
-  - liblapack>=3.12
-  - r-matrix
-  - r-nlme
-  - libflang                  # for FortranRuntime
-  run:
-  - r-base == ${{ r_base_version }}
-  - r-matrix
-  - r-nlme
-
-tests:
-- package_contents:
-    lib:
-    - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
+    files:
+      - lib/R/library/${{ name[2:] }}/*
+  requirements:
+    build:
+    - cross-r-base >= ${{ r_base_version }}
+    - r-matrix
+    - r-nlme
+    - ${{ compiler('c') }}
+    host:
+    - r-base >= ${{ r_base_version }}
+    - libblas>=3.12
+    - liblapack>=3.12
+    - r-matrix
+    - r-nlme
+    - libflang                  # for FortranRuntime
+    run:
+    - r-base >= ${{ r_base_version }}
+    - r-matrix
+    - r-nlme
+
+  tests:
+  - package_contents:
+      lib:
+      - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
 
 about:
   homepage: https://CRAN.R-project.org/package=mgcv

diff --git a/recipes/recipes_emscripten/r-purrr/recipe.yaml b/recipes/recipes_emscripten/r-purrr/recipe.yaml
@@ -1,11 +1,7 @@
 context:
   name: r-purrr
   version: 1.0.2
-  r_base_version: 4.4.1
-
-package:
-  name: ${{ name }}
-  version: ${{ version }}
+  r_base_version: 4.4.2
 
 source:
   url:
@@ -14,42 +10,44 @@ source:
   sha256: 2c1bc6bb88433dff0892b41136f2f5c23573b335ff35a4775c72aa57b48bbb63
 
 build:
-  number: 1
-  script:
-    - $R CMD INSTALL $R_ARGS --no-byte-compile .
-    - rm $PREFIX/lib/R/library/grDevices/libs/cairo.so
-    - rm $PREFIX/lib/R/library/tcltk/libs/tcltk.so
-    # The activation script of cross-r-base copies cairo and tcltk from
-    # the build environment.
+  number: 2
+  script: $R CMD INSTALL $R_ARGS --no-byte-compile .
 
-requirements:
+outputs:
+- package:
+    name: ${{ name }}
+    version: ${{ version }}
   build:
-  - cross-r-base >= ${{ r_base_version }}
-  - r-cli >=3.6.3
-  - r-lifecycle >=1.0.4
-  - r-magrittr
-  - r-rlang
-  - r-vctrs
-  - ${{ compiler('c') }}
-  host:
-  - r-base == ${{ r_base_version }}
-  - r-cli >=3.6.3
-  - r-lifecycle >=1.0.4
-  - r-magrittr
-  - r-rlang
-  - r-vctrs
-  run:
-  - r-base == ${{ r_base_version }}
-  - r-cli >=3.6.3
-  - r-lifecycle >=1.0.4
-  - r-magrittr
-  - r-rlang
-  - r-vctrs
+    files:
+      - lib/R/library/${{ name[2:] }}/*
+  requirements:
+    build:
+    - cross-r-base >= ${{ r_base_version }}
+    - r-cli >=3.6.3
+    - r-lifecycle >=1.0.4
+    - r-magrittr
+    - r-rlang
+    - r-vctrs
+    - ${{ compiler('c') }}
+    host:
+    - r-base >= ${{ r_base_version }}
+    - r-cli >=3.6.3
+    - r-lifecycle >=1.0.4
+    - r-magrittr
+    - r-rlang
+    - r-vctrs
+    run:
+    - r-base >= ${{ r_base_version }}
+    - r-cli >=3.6.3
+    - r-lifecycle >=1.0.4
+    - r-magrittr
+    - r-rlang
+    - r-vctrs
 
-tests:
-- package_contents:
-    lib:
-    - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
+  tests:
+  - package_contents:
+      lib:
+      - R/library/${{ name[2:] }}/libs/${{ name[2:] }}.so
 
 about:
   homepage: https://purrr.tidyverse.org