summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2023-04-17 19:17:39 +0200
committerAndreas Enge <andreas@enge.fr>2023-04-17 19:17:39 +0200
commit216d7bdb738e05675bbb128d582851bdc9b85aaa (patch)
tree0535efa1427ebc5b14ac10ccf03be17673a8c909 /gnu/packages/patches
parentd3c7ca3c40fd613cfb3fb8f41e8ea064b438414a (diff)
parent50dd91bc30634c75c0001cfd38bbcc2fbbeb894e (diff)
downloadguix-216d7bdb738e05675bbb128d582851bdc9b85aaa.tar.gz
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/r-mixedpower-r2power.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/gnu/packages/patches/r-mixedpower-r2power.patch b/gnu/packages/patches/r-mixedpower-r2power.patch
deleted file mode 100644
index a3307ca7b5..0000000000
--- a/gnu/packages/patches/r-mixedpower-r2power.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e882fda905150649aa887c72731144330ca297b5 Mon Sep 17 00:00:00 2001
-From: Lars-Dominik Braun <lars@6xq.net>
-Date: Fri, 28 Oct 2022 09:18:11 +0200
-Subject: [PATCH] Fix R2power with R>=4.2
-
-The previous commit missed this if statement.
----
- R/meta_functions.R | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/R/meta_functions.R b/R/meta_functions.R
-index a65f0c1..fb3feba 100644
---- a/R/meta_functions.R
-+++ b/R/meta_functions.R
-@@ -172,7 +172,7 @@ R2power <- function(model, data, fixed_effects, simvar,
-   } # end if databased
- 
-   # 2. SESOI
--  suppressWarnings(if (SESOI != F){ # supress warning generated by if statement if SESOI =! F
-+  suppressWarnings(if (!is.logical(SESOI)){
- 
-     # change beta coeficients to SESOI values
-     model@beta <- SESOI
--- 
-2.37.4
-