r-lazyeval: add @0.2.3 and r version conflicts; r-ggstats: add latest @0.13.0, correct dependencies; r-gglpot2: correct dependencies, add r version conflicts; r-gally: add@2.3.0,2.4.0

Author: w8jcik

repos/spack_repo/builtin/packages/r_ggally/package.py

@@ -19,30 +19,57 @@ class RGgally(RPackage):
 
     cran = "GGally"
 
+    version("2.4.0", sha256="c8d458160e0c220bfeae49ceacd7762534a9ade7e75dfcd974c88c79aa8f7382")
+    version("2.3.0", sha256="fe5eabe9eec66fd578ce244e291d0453846dd2181b39ca9039c157971ba16d09")
     version("2.2.1", sha256="8bb326665936a63f6eef92a2af1a11d1fae78dbd28d6980608d2b38ee1f586c6")
     version("2.1.2", sha256="30352f36bf061bc98bdd5fa373ea0f23d007040bd908c7c018c8e627e0fb28e5")
     version("2.1.0", sha256="7ffb86b8a4e79543cf7e6bb1e3684d738ecd8e0ba89e8ef38991898b18dd6c53")
     version("1.4.0", sha256="9a47cdf004c41f5e4024327b94227707f4dad3a0ac5556d8f1fba9bf0a6355fe")
     version("1.3.2", sha256="f4143f45254fed794be991180aeffe459f6756bfa08acad963707d8e843cfd0a")
 
+    depends_on("r@4.3:", type=("build", "run"), when="@2.3:")
     depends_on("r@3.1:", type=("build", "run"))
-    depends_on("r-ggplot2@2.2.0:", type=("build", "run"))
-    depends_on("r-ggplot2@3.3.0:", type=("build", "run"), when="@2.1.0:")
-    depends_on("r-ggplot2@3.3.4:", type=("build", "run"), when="@2.1.2:")
-    depends_on("r-ggplot2@3.4.4:", type=("build", "run"), when="@2.2.0:")
-    depends_on("r-dplyr@1.0.0:", type=("build", "run"), when="@2.1.0:")
-    depends_on("r-ggstats", type=("build", "run"), when="@2.2.0:")
-    depends_on("r-gtable@0.2.0:", type=("build", "run"))
-    depends_on("r-lifecycle", type=("build", "run"), when="@2.1.0:")
-    depends_on("r-plyr@1.8.3:", type=("build", "run"))
+
+    depends_on("r-cli", type=("build", "run"), when="@2.4:")
+
+    depends_on("r-dplyr@1.1:", type=("build", "run"), when="@2.3:")
+    depends_on("r-dplyr@1:", type=("build", "run"), when="@2.1:")
+
+    depends_on("r-ggplot2@3.5.2:", type=("build", "run"), when="@2.3:")
+    depends_on("r-ggplot2@3.4.4:3", type=("build", "run"), when="@2.2.1:2.2")
+    depends_on("r-ggplot2@3.4.4:3", type=("build", "run"), when="@2.2")
+    depends_on("r-ggplot2@3.3.4:3", type=("build", "run"), when="@2.1.2:2.1")
+    depends_on("r-ggplot2@3.3.0:3", type=("build", "run"), when="@2:2.1.1")
+    depends_on("r-ggplot2@2.2:3", type=("build", "run"))
+
+    depends_on("r-ggstats@0.9:", type=("build", "run"), when="@2.3:")
+    depends_on("r-ggstats", type=("build", "run"), when="@2.2:")
+
+    depends_on("r-gtable@0.2:", type=("build", "run"))
+
+    depends_on("r-lifecycle", type=("build", "run"), when="@2:")
+
+    depends_on("r-magrittr", type=("build", "run"), when="@2.2:")
+
+    depends_on("r-network@1.17.1:", type=("build", "run"), when="@2.1.2:")
+
     depends_on("r-progress", type=("build", "run"))
+
     depends_on("r-rcolorbrewer", type=("build", "run"))
-    depends_on("r-rlang", type=("build", "run"), when="@1.4.0:")
-    depends_on("r-scales@1.1.0:", type=("build", "run"), when="@2.1.0:")
-    depends_on("r-tidyr", type=("build", "run"), when="@2.1.0:")
-    depends_on("r-tidyr@1.3.0:", type=("build", "run"), when="@2.2.0:")
-    depends_on("r-magrittr", type=("build", "run"), when="@2.2.0:")
-    depends_on("openssl", when="@1.4.0:")
-
-    depends_on("r-forcats", type=("build", "run"), when="@2.1.0:2.1")
+
+    depends_on("r-rlang", type=("build", "run"), when="@1.4:")
+
+    depends_on("r-s7@0.2", type=("build", "run"), when="@2.3:")
+
+    depends_on("r-scales@1.3:", type=("build", "run"), when="@2.3:")
+    depends_on("r-scales@1.1:", type=("build", "run"), when="@2:")
+
+    depends_on("r-tidyr@1.3:", type=("build", "run"), when="@2.2:")
+    depends_on("r-tidyr", type=("build", "run"), when="@2.1:")
+
+    depends_on("openssl", when="@1.4:")
+
+    # Historical dependencies
+    depends_on("r-plyr@1.8.3:", type=("build", "run"), when="@:2.2")
+    depends_on("r-forcats", type=("build", "run"), when="@2.1")
     depends_on("r-reshape@0.8.5:", type=("build", "run"), when="@:2.1")

repos/spack_repo/builtin/packages/r_ggplot2/package.py

@@ -38,37 +38,59 @@ class RGgplot2(RPackage):
 
     with default_args(type=("build", "run")):
         depends_on("r@4.1:", when="@4:")
-        depends_on("r@3.5:", when="@3.5.0:")
+        depends_on("r@3.5:", when="@3.5:")
         depends_on("r@3.3:", when="@3.3.4:")
-        depends_on("r@3.2:", when="@3.2.0:")
+        depends_on("r@3.2:", when="@3.2:")
         depends_on("r@3.1:")
 
-        depends_on("r-cli", when="@3.4.0:")
+        depends_on("r-cli", when="@3.4:")
+
         depends_on("r-gtable@0.3.6:", when="@4:")
         depends_on("r-gtable@0.1.1:")
-        depends_on("r-isoband", when="@3.3.3:")
-        depends_on("r-lifecycle@1.0.1.1:", when="@3.4.0:")
-        depends_on("r-rlang@1.1.0:", when="@3.4.2:")
-        depends_on("r-rlang@1.0.0:", when="@3.4.0:")
+
+        depends_on("r-isoband", when="@3.3:")
+
+        depends_on("r-lifecycle@1.0.1.1:", when="@3.4:")
+
+        depends_on("r-rlang@1.1:", when="@3.4.2:")
+        depends_on("r-rlang@1:", when="@3.4:")
         depends_on("r-rlang@0.4.10:", when="@3.3.4:")
-        depends_on("r-rlang@0.3.0:", when="@3.0.0:")
+        depends_on("r-rlang@0.3:", when="@3.2:")
+        depends_on("r-rlang@0.2.1:", when="@3.1:")
+        depends_on("r-rlang", when="@3:")
+
         depends_on("r-s7", when="@4:")
-        depends_on("r-scales@1.4.0:", when="@4:")
-        depends_on("r-scales@1.3.0:", when="@3.5.0:")
-        depends_on("r-scales@1.2.0:", when="@3.4.0:3.4.4")
-        depends_on("r-scales@0.5.0:")
-        depends_on("r-vctrs@0.6.0:", when="@3.5.1:")
-        depends_on("r-vctrs@0.5.0:", when="@3.4.0:")
+
+        depends_on("r-scales@1.4:", when="@4:")
+        depends_on("r-scales@1.3:", when="@3.5:")
+        depends_on("r-scales@1.2:", when="@3.4:3.4.4")
+        depends_on("r-scales@0.5:", when="@3:")
+        depends_on("r-scales@0.4.1:", when="@2.2:")
+        depends_on("r-scales@0.3:")
+
+        depends_on("r-vctrs@0.6:", when="@3.5.1:")
+        depends_on("r-vctrs@0.5:", when="@3.4:")
+
         depends_on("r-withr@2.5.0:", when="@3.4.0:")
-        depends_on("r-withr@2.0.0:", when="@3.0.0:")
+        depends_on("r-withr@2:", when="@3:")
 
         # Historical dependencies
-        depends_on("r-digest", when="@:3.3.6")
-        depends_on("r-glue", when="@3.3.3:3")
-        depends_on("r-lazyeval", when="@:3.2.0")
+        depends_on("r-digest", when="@:3.3")
+        depends_on("r-glue", when="@3.3:3")
+        depends_on("r-lazyeval", when="@2.2:3.2")
         depends_on("r-mass", when="@:3")
-        depends_on("r-mgcv", when="@3.2.0:3")
-        depends_on("r-plyr@1.7.1:", when="@:3.1.1")
-        depends_on("r-reshape2", when="@:3.2.0")
-        depends_on("r-tibble", when="@:3")
-        depends_on("r-viridislite", when="@3.0.0:3.2.0")
+        depends_on("r-mgcv", when="@3")
+        depends_on("r-plyr@1.7.1:", when="@:3.1")
+        depends_on("r-reshape2", when="@:3.2")
+        depends_on("r-tibble", when="@2.2:3")
+        depends_on("r-viridislite", when="@3:3.2")
+
+    # R 4.4 changed the way version comparison works causing following build error:
+    #   > Error in .make_numeric_version(x, strict, .standard_regexps()$valid_numeric_version) :
+    #       invalid non-character version specification 'x' (type: double)
+    conflicts("^r@4.4:", when="@3:3.4.2")  # approximate
+
+    # R 4.6 no longer accepts "structure(NULL, ...)"
+    #   > Error in structure(NULL, class = "waiver") :
+    #       attempt to set an attribute on NULL
+    conflicts("^r@4.6:", when="@2.1")

repos/spack_repo/builtin/packages/r_ggstats/package.py

@@ -17,18 +17,35 @@ class RGgstats(RPackage):
 
     license("GPL-3.0-or-later", checked_by="wdconinc")
 
+    version("0.13.0", sha256="82dd03ca8dd49baa5567b54a25c749516800574b008d61e63e95efc6c87cd787")
     version("0.6.0", sha256="f80aaa229f542cb18174b9ab82b0026c6bd3331f22bf2662712ab6af480b6d80")
 
-    depends_on("r-broom-helpers@1.14.0:", type=("build", "run"))
+    depends_on("r@4.2:", type=("build", "run"), when="@0.7:")
+
     depends_on("r-cli", type=("build", "run"))
+
     depends_on("r-dplyr", type=("build", "run"))
+
     depends_on("r-forcats", type=("build", "run"))
-    depends_on("r-ggplot2@3.4.0:", type=("build", "run"))
+
+    depends_on("r-ggplot2@4:", type=("build", "run"), when="@0.11:")
+    depends_on("r-ggplot2@3.4:", type=("build", "run"))
+
     depends_on("r-lifecycle", type=("build", "run"))
-    depends_on("r-magrittr", type=("build", "run"))
+
     depends_on("r-patchwork", type=("build", "run"))
+
     depends_on("r-purrr", type=("build", "run"))
+
     depends_on("r-rlang", type=("build", "run"))
+
     depends_on("r-scales", type=("build", "run"))
+
     depends_on("r-stringr", type=("build", "run"))
+
     depends_on("r-tidyr", type=("build", "run"))
+
+    # Historical dependencies
+    conflicts("^r-vctrs@7:", when="@:0.11")
+    depends_on("r-broom-helpers@1.14:", type=("build", "run"), when="@:0.6")
+    depends_on("r-magrittr", type=("build", "run"), when="@:0.6")

repos/spack_repo/builtin/packages/r_lazyeval/package.py

@@ -18,10 +18,15 @@ class RLazyeval(RPackage):
 
     license("GPL-3.0-only")
 
+    version("0.2.3", sha256="c65db1997b195a7bb0ab3afbb834345ea277b428b2736eeded4242629e86adcb")
     version("0.2.2", sha256="d6904112a21056222cfcd5eb8175a78aa063afe648a562d9c42c6b960a8820d4")
     version("0.2.1", sha256="83b3a43e94c40fe7977e43eb607be0a3cd64c02800eae4f2774e7866d1e93f61")
     version("0.2.0", sha256="13738f55b2044184fe91f53d17516a445dfb508227527921218cda6f01f98dcb")
 
-    depends_on("c", type="build")  # generated
+    depends_on("c", type="build")
 
     depends_on("r@3.1.0:", type=("build", "run"))
+
+    depends_on("r-rlang", when="@0.2.3:", type=("build", "run"))
+
+    conflicts("^r@4.6:", when="@:0.2.2")