diff --git a/repos/spack_repo/builtin/packages/r_gtable/package.py b/repos/spack_repo/builtin/packages/r_gtable/package.py index 08318590da4..3f4f5a6de3f 100644 --- a/repos/spack_repo/builtin/packages/r_gtable/package.py +++ b/repos/spack_repo/builtin/packages/r_gtable/package.py @@ -20,6 +20,7 @@ class RGtable(RPackage): license("MIT") + version("0.3.6", sha256="d305a5fa11278b649d2d8edc5288bf28009be888a42be58ff8714018e49de0ef") version("0.3.5", sha256="b19fc1a30359945adbab7d4e915fe95523a839c380e34ae705d70b7ebddeea72") version("0.3.3", sha256="2f9a58d978e2a487b7fd8841539ea33cf948e55ddf6f7a9bd2dd3362600a7b3a") version("0.3.1", sha256="8bd62c5722d5188914d667cabab12991c555f657f4f5ce7b547571ae3aec7cb5") @@ -28,6 +29,7 @@ class RGtable(RPackage): depends_on("r@3.0:", type=("build", "run")) depends_on("r@3.5:", type=("build", "run"), when="@0.3.3:") + depends_on("r@4:", type=("build", "run"), when="@0.3.6:") depends_on("r-rlang@1.1.0:", type=("build", "run"), when="@0.3.3:") depends_on("r-lifecycle", type=("build", "run"), when="@0.3.3:") depends_on("r-glue", type=("build", "run"), when="@0.3.3:") diff --git a/repos/spack_repo/builtin/packages/r_patchwork/package.py b/repos/spack_repo/builtin/packages/r_patchwork/package.py index 201f91a29ff..3d30677bc08 100644 --- a/repos/spack_repo/builtin/packages/r_patchwork/package.py +++ b/repos/spack_repo/builtin/packages/r_patchwork/package.py @@ -21,11 +21,20 @@ class RPatchwork(RPackage): license("MIT") + version("1.3.2", sha256="0ec469acfd69d1a4f1a6317c861e6bf000f768c2d5047e3aed6713df9afe27eb") version("1.2.0", sha256="cc31ea13560c424de9bfe2287d926a7d9e6cc8da2d5561402bb145b4f51b68a1") version("1.1.2", sha256="dab9d5d2d704d591717eaa6efeacf09cb6cd7bee2ca2c46d18414e8503ac8977") version("1.1.1", sha256="cf0d7d9f92945729b499d6e343441c55007d5b371206d5389b9e5154dc7cf481") depends_on("r-ggplot2@3.0.0:", type=("build", "run")) + # https://github.com/thomasp85/patchwork/issues/454#issuecomment-3430577354 + depends_on("r-ggplot2@3.5.2:", type=("build", "run"), when="@1.3.2:") + depends_on("r-gtable", type=("build", "run")) - depends_on("r-cli", type=("build", "run"), when="@1.1.3:") + depends_on("r-gtable@0.3.6:", type=("build", "run"), when="@1.3.2:") + depends_on("r-rlang", type=("build", "run"), when="@1.1.3:") + depends_on("r-rlang@1.0.0:", type=("build", "run"), when="@1.3.2:") + + depends_on("r-cli", type=("build", "run"), when="@1.1.3:") + depends_on("r-farver", type=("build", "run"), when="@1.3.2:")