diff options
| author | Romain GARBAGE <romain.garbage@inria.fr> | 2026-03-25 11:39:55 +0100 |
|---|---|---|
| committer | Romain GARBAGE <romain.garbage@inria.fr> | 2026-03-26 10:03:20 +0100 |
| commit | 5d6b40599012a413095ee3f0fbe79828f20c61c6 (patch) | |
| tree | 9e5ab9e323549aff9fce58719117245fcae15304 | |
| parent | c9476ece9fc18156447803450a5cce950fa60e51 (diff) | |
jasp: Remove broken package.
Fixes #566.
* guix-science/packages/jasp.scm: Remove file.
* patches/jasp-0.14.0.0-includes.patch: Remove file.
* patches/jasp-0.14.0.0-noupdate.patch: Remove file.
| -rw-r--r-- | guix-science/packages/jasp.scm | 165 | ||||
| -rw-r--r-- | patches/jasp-0.14.0.0-includes.patch | 53 | ||||
| -rw-r--r-- | patches/jasp-0.14.0.0-noupdate.patch | 25 |
3 files changed, 0 insertions, 243 deletions
diff --git a/guix-science/packages/jasp.scm b/guix-science/packages/jasp.scm deleted file mode 100644 index 693660e..0000000 --- a/guix-science/packages/jasp.scm +++ /dev/null | |||
| @@ -1,165 +0,0 @@ | |||
| 1 | ;;; SPDX-License-Identifier: GPL-3.0-or-later | ||
| 2 | |||
| 3 | ;; JASP cannot be upstreamed, because it bundles several JavaScript libraries | ||
| 4 | ;; in JASP-Desktop/html/js/ and Resources/Help/ | ||
| 5 | |||
| 6 | (define-module (guix-science packages jasp) | ||
| 7 | #:use-module ((guix licenses) #:prefix license:) | ||
| 8 | #:use-module (guix packages) | ||
| 9 | #:use-module (guix download) | ||
| 10 | #:use-module (guix git-download) | ||
| 11 | #:use-module (guix utils) | ||
| 12 | #:use-module (guix build-system qt) | ||
| 13 | #:use-module (guix build-system r) | ||
| 14 | #:use-module (guix build-system gnu) | ||
| 15 | #:use-module (gnu packages) | ||
| 16 | #:use-module (gnu packages algebra) | ||
| 17 | #:use-module (gnu packages autotools) | ||
| 18 | #:use-module (gnu packages backup) | ||
| 19 | #:use-module (gnu packages boost) | ||
| 20 | #:use-module (gnu packages compression) | ||
| 21 | #:use-module (gnu packages cran) | ||
| 22 | #:use-module (gnu packages gcc) | ||
| 23 | #:use-module (gnu packages gettext) | ||
| 24 | #:use-module (gnu packages statistics) | ||
| 25 | #:use-module (gnu packages qt) | ||
| 26 | #:use-module (gnu packages base)) | ||
| 27 | |||
| 28 | (define-public jasp | ||
| 29 | (package | ||
| 30 | (name "jasp") | ||
| 31 | (version "0.14.1") | ||
| 32 | (source (origin | ||
| 33 | (method git-fetch) | ||
| 34 | (uri (git-reference | ||
| 35 | (url "https://github.com/jasp-stats/jasp-desktop.git") | ||
| 36 | (commit (string-append version)))) | ||
| 37 | (file-name (git-file-name name version)) | ||
| 38 | (sha256 | ||
| 39 | (base32 | ||
| 40 | "05r2gdq7lxmndxzg5h8nmahvrksv9v4xh40ls0azn0wfrpcsnrlq")) | ||
| 41 | (patches | ||
| 42 | (search-patches "patches/jasp-0.14.0.0-noupdate.patch" | ||
| 43 | "patches/jasp-0.14.0.0-includes.patch")))) | ||
| 44 | (build-system qt-build-system) | ||
| 45 | (arguments | ||
| 46 | '(#:tests? #f ; There are tests in JASP-Tests, but they need special setup | ||
| 47 | #:phases | ||
| 48 | (modify-phases %standard-phases | ||
| 49 | (add-after 'unpack 'patch-paths | ||
| 50 | (lambda* (#:key inputs outputs #:allow-other-keys) | ||
| 51 | (let ((out (assoc-ref outputs "out"))) | ||
| 52 | (substitute* "R_HOME.pri" | ||
| 53 | (("\\$\\$_R_HOME/site-library/Rcpp/include") | ||
| 54 | (string-append (assoc-ref inputs "r-rcpp") | ||
| 55 | "/site-library/Rcpp/include")) | ||
| 56 | (("/usr/include/R/") | ||
| 57 | (string-append (assoc-ref inputs "r-minimal") | ||
| 58 | "/lib/R/include")) | ||
| 59 | (("R_EXE = \\$\\$_R_HOME/bin/R") | ||
| 60 | (string-append "R_EXE = " | ||
| 61 | (assoc-ref inputs "r-minimal") | ||
| 62 | "/bin/R"))) | ||
| 63 | (substitute* "JASP.pri" | ||
| 64 | (("^GIT_BRANCH=.+") "GIT_BRANCH=master") | ||
| 65 | (("^GIT_COMMIT=.+") "GIT_COMMIT=undefined") | ||
| 66 | (("INSTALLPATH = /usr/bin") | ||
| 67 | (string-append "INSTALLPATH = " out "/lib/jasp"))) | ||
| 68 | (substitute* "JASP-Desktop/JASP-Desktop.pro" | ||
| 69 | (("target\\.path \\+= /usr/bin") | ||
| 70 | (string-append "target.path += " out "/lib/jasp"))) | ||
| 71 | #t))) | ||
| 72 | (replace 'configure | ||
| 73 | (lambda* (#:key inputs outputs #:allow-other-keys) | ||
| 74 | (let ((out (assoc-ref outputs "out"))) | ||
| 75 | (setenv "R_HOME" | ||
| 76 | (string-append (assoc-ref inputs "r-minimal") "/lib/R")) | ||
| 77 | (invoke "qmake" | ||
| 78 | (string-append "PREFIX=" out) | ||
| 79 | ;; Uncomment, if you want a debug build | ||
| 80 | ;;"CONFIG+=debug" | ||
| 81 | "JASP.pro")))) | ||
| 82 | (add-after 'install 'copy-r-library | ||
| 83 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 84 | ;; Not copied by Makefile. | ||
| 85 | (copy-recursively | ||
| 86 | "R/library" | ||
| 87 | (string-append (assoc-ref outputs "out") "/site-library")) | ||
| 88 | #t)) | ||
| 89 | ;; Add before, so qt-wrap will add qt search paths | ||
| 90 | (add-before 'qt-wrap 'webengine-wrap | ||
| 91 | (lambda* (#:key inputs outputs #:allow-other-keys) | ||
| 92 | (let ((qtwebengineprocess | ||
| 93 | (string-append (assoc-ref inputs "qtwebengine") | ||
| 94 | "/lib/qt5/libexec/QtWebEngineProcess")) | ||
| 95 | (out (assoc-ref outputs "out"))) | ||
| 96 | (mkdir-p (string-append out "/bin")) | ||
| 97 | (symlink | ||
| 98 | (string-append out "/lib/jasp/jasp") | ||
| 99 | (string-append out "/bin/jasp")) | ||
| 100 | (wrap-program (string-append out "/lib/jasp/jasp") | ||
| 101 | `("QTWEBENGINEPROCESS_PATH" = | ||
| 102 | (,qtwebengineprocess))) | ||
| 103 | (wrap-program (string-append out "/lib/jasp/JASPEngine") | ||
| 104 | `("R_LIBS_SITE" ":" = | ||
| 105 | (,(string-append out "/site-library:" (getenv "R_LIBS_SITE")))))) | ||
| 106 | #t))))) | ||
| 107 | (native-inputs | ||
| 108 | (list qtbase-5)) ; qmake | ||
| 109 | (inputs | ||
| 110 | (list qtwebengine-5 | ||
| 111 | qtsvg-5 | ||
| 112 | qtwebchannel-5 | ||
| 113 | qtquickcontrols-5 ; qtquick styles | ||
| 114 | qtquickcontrols2-5 | ||
| 115 | qtdeclarative-5 | ||
| 116 | qtgraphicaleffects | ||
| 117 | boost | ||
| 118 | libarchive | ||
| 119 | zlib | ||
| 120 | readstat | ||
| 121 | r-minimal | ||
| 122 | r-rcpp | ||
| 123 | r-kknn | ||
| 124 | ;; Required to build JASPgraphs. | ||
| 125 | r-ggplot2 | ||
| 126 | r-gridextra | ||
| 127 | r-scales | ||
| 128 | r-gtable | ||
| 129 | r-jsonlite | ||
| 130 | r-r6 | ||
| 131 | r-rcolorbrewer | ||
| 132 | r-rlang | ||
| 133 | r-scales | ||
| 134 | r-stringr | ||
| 135 | r-viridislite | ||
| 136 | ;; Runtime deps. | ||
| 137 | r-rjson | ||
| 138 | r-hypergeo | ||
| 139 | r-logspline | ||
| 140 | r-effects | ||
| 141 | r-car | ||
| 142 | r-afex | ||
| 143 | r-lme4 | ||
| 144 | r-bayesfactor | ||
| 145 | r-lmtest)) | ||
| 146 | (home-page "https://jasp-stats.org/") | ||
| 147 | (synopsis "Statistical package for Bayesian and Frequentist statistical | ||
| 148 | methods") | ||
| 149 | (description "Statistical package for both Bayesian and Frequentist | ||
| 150 | statistical methods, that is easy to use and familiar to users of SPSS.") | ||
| 151 | (license | ||
| 152 | (list | ||
| 153 | license:agpl3 ; The desktop client | ||
| 154 | license:gpl2+ ; The engine | ||
| 155 | license:expat ; marked: Resources/Help/marked.js | ||
| 156 | ; underscore.js: JASP-Desktop/html/js/underscore.js | ||
| 157 | ; jquery ui: JASP-Desktop/html/js/jquery-ui-1.10.1.custom.min.js | ||
| 158 | ; backbone.js: JASP-Desktop/html/js/backbone-1.1.2.js | ||
| 159 | license:bsd-3 ; quilljs: JASP-Desktop/html/js/quill.js | ||
| 160 | ; qwebchannel: JASP-Desktop/html/js/qwebchannel.js | ||
| 161 | license:public-domain ; jsoncpp: JASP-Common/lib_json/ | ||
| 162 | license:bsd-2 ; libarchive: JASP-Common/libzip/ | ||
| 163 | license:boost1.0 ; boost: JASP-Common/boost/ | ||
| 164 | )))) | ||
| 165 | |||
diff --git a/patches/jasp-0.14.0.0-includes.patch b/patches/jasp-0.14.0.0-includes.patch deleted file mode 100644 index fb1a079..0000000 --- a/patches/jasp-0.14.0.0-includes.patch +++ /dev/null | |||
| @@ -1,53 +0,0 @@ | |||
| 1 | Add missing includes for GCC 10. | ||
| 2 | |||
| 3 | --- a/JASP-Common/column.cpp 1970-01-01 01:00:01.000000000 +0100 | ||
| 4 | +++ b/JASP-Column/column.cpp 2021-12-21 10:30:32.455931317 +0100 | ||
| 5 | @@ -21,6 +21,7 @@ | ||
| 6 | |||
| 7 | #include <sstream> | ||
| 8 | #include <string> | ||
| 9 | +#include <cfloat> | ||
| 10 | |||
| 11 | #include <boost/lexical_cast.hpp> | ||
| 12 | #include <boost/algorithm/string/predicate.hpp> | ||
| 13 | --- a/JASP-Engine/rbridge.cpp 1970-01-01 01:00:01.000000000 +0100 | ||
| 14 | +++ b/JASP-Engine/rbridge.cpp 2021-12-21 10:36:47.825085783 +0100 | ||
| 15 | @@ -15,6 +15,8 @@ | ||
| 16 | // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 17 | // | ||
| 18 | |||
| 19 | +#include <cmath> | ||
| 20 | + | ||
| 21 | #include "rbridge.h" | ||
| 22 | #include "columnencoder.h" | ||
| 23 | #include "jsonredirect.h" | ||
| 24 | --- a/JASP-Desktop/widgets/boundqmltextinput.cpp 1970-01-01 01:00:01.000000000 +0100 | ||
| 25 | +++ b/JASP-Desktop/widgets/boundqmltextinput.cpp 2021-12-21 10:40:18.119960946 +0100 | ||
| 26 | @@ -16,6 +16,8 @@ | ||
| 27 | // <http://www.gnu.org/licenses/>. | ||
| 28 | // | ||
| 29 | |||
| 30 | +#include <cmath> | ||
| 31 | + | ||
| 32 | #include "boundqmltextinput.h" | ||
| 33 | #include "../analysis/analysisform.h" | ||
| 34 | #include "../analysis/jaspcontrolbase.h" | ||
| 35 | --- a/JASP-Desktop/data/filtermodel.cpp 1970-01-01 01:00:01.000000000 +0100 | ||
| 36 | +++ b/JASP-Desktop/data/filtermodel.cpp 2021-12-21 10:43:56.571897913 +0100 | ||
| 37 | @@ -1,3 +1,5 @@ | ||
| 38 | +#include <cmath> | ||
| 39 | + | ||
| 40 | #include "filtermodel.h" | ||
| 41 | #include "utilities/jsonutilities.h" | ||
| 42 | #include "columnencoder.h" | ||
| 43 | --- a/JASP-Desktop/widgets/listmodeltableviewbase.cpp 1970-01-01 01:00:01.000000000 +0100 | ||
| 44 | +++ b/JASP-Desktop/widgets/listmodeltableviewbase.cpp 2021-12-21 10:47:06.104957449 +0100 | ||
| 45 | @@ -16,6 +16,8 @@ | ||
| 46 | // <http://www.gnu.org/licenses/>. | ||
| 47 | // | ||
| 48 | |||
| 49 | +#include <cmath> | ||
| 50 | + | ||
| 51 | #include "log.h" | ||
| 52 | #include <QSize> | ||
| 53 | #include <fstream> | ||
diff --git a/patches/jasp-0.14.0.0-noupdate.patch b/patches/jasp-0.14.0.0-noupdate.patch deleted file mode 100644 index f3d01bf..0000000 --- a/patches/jasp-0.14.0.0-noupdate.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | Disable auto-update and known issues checker. | ||
| 2 | |||
| 3 | --- a/JASP-Desktop/gui/jaspversionchecker.cpp 2020-10-16 13:43:43.215811978 +0200 | ||
| 4 | +++ b/JASP-Desktop/gui/jaspversionchecker.cpp 2020-10-16 13:44:51.777626010 +0200 | ||
| 5 | @@ -31,16 +31,20 @@ | ||
| 6 | |||
| 7 | void JASPVersionChecker::checkForJaspUpdate() | ||
| 8 | { | ||
| 9 | +#if 0 | ||
| 10 | QNetworkRequest request(_urlVersion); | ||
| 11 | _networkReply = _networkManager.get(request); | ||
| 12 | connect(_networkReply, &QNetworkReply::finished, this, &JASPVersionChecker::downloadVersionFinished); | ||
| 13 | +#endif | ||
| 14 | } | ||
| 15 | |||
| 16 | void JASPVersionChecker::downloadKnownIssues() | ||
| 17 | { | ||
| 18 | +#if 0 | ||
| 19 | QNetworkRequest request(_urlKnownIssues); | ||
| 20 | _networkReply = _networkManager.get(request); | ||
| 21 | connect(_networkReply, &QNetworkReply::finished, this, &JASPVersionChecker::downloadIssuesFinished); | ||
| 22 | +#endif | ||
| 23 | } | ||
| 24 | |||
| 25 | void JASPVersionChecker::downloadVersionFinished() | ||
