jasp-desktop: 0.19.3 -> 0.95.0 (2fe30ea1) · Commits · nix / nixpkgs

pkgs/by-name/ja/jasp-desktop/cmake.patch

+65 −21

Original line number	Diff line number	Diff line
		diff --git a/Tools/CMake/Install.cmake b/Tools/CMake/Install.cmake
		index edd96b0..1fbdb3c 100644
		--- a/Tools/CMake/Install.cmake
		+++ b/Tools/CMake/Install.cmake
		@@ -229,24 +229,10 @@ if(LINUX)
		install(DIRECTORY ${CMAKE_SOURCE_DIR}/Resources/
		DESTINATION ${JASP_INSTALL_RESOURCEDIR})

		- install(
		- DIRECTORY ${MODULES_BINARY_PATH}/binary_pkgs ${MODULES_BINARY_PATH}/manifests ${MODULES_BINARY_PATH}/module_libs ${MODULES_BINARY_PATH}/Tools
		- DESTINATION ${JASP_INSTALL_MODULEDIR}
		- REGEX ${FILES_EXCLUDE_PATTERN} EXCLUDE
		- REGEX ${FOLDERS_EXCLUDE_PATTERN} EXCLUDE)
		-
		install(
		FILES ${MODULES_BINARY_PATH}/modules-settings.json
		DESTINATION ${JASP_INSTALL_MODULEDIR}
		)
		- # we do not need renv-root in an install
		- #install(DIRECTORY ${MODULES_RENV_ROOT_PATH}/
		- # DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-root)
		-
		-if(NOT FLATPAK_USED) #because flatpak already puts renv-cache in /app/lib64 anyway
		- install(DIRECTORY ${MODULES_RENV_CACHE_PATH}/
		- DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-cache)
		-endif()

		#Flatpak wrapper that sets some environment variables that JASP needs
		install(PROGRAMS ${CMAKE_SOURCE_DIR}/Tools/flatpak/org.jaspstats.JASP
		diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake
		index a95ef78..6ee84cd 100644
		index a6673d9..a079021 100644
		--- a/Tools/CMake/Libraries.cmake
		+++ b/Tools/CMake/Libraries.cmake
		@@ -67,7 +67,7 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32))
		@@ -20,8 +49,32 @@ index a95ef78..6ee84cd 100644
		HINTS ${LIBREADSTAT_LIBRARY_DIRS} REQUIRED)

		if(EXISTS ${LIBREADSTAT_LIBRARIES})
		diff --git a/Tools/CMake/Modules.cmake b/Tools/CMake/Modules.cmake
		index ca8e040..875db1f 100644
		--- a/Tools/CMake/Modules.cmake
		+++ b/Tools/CMake/Modules.cmake
		@@ -13,19 +13,6 @@ configure_file(${PROJECT_SOURCE_DIR}/Modules/modules-settings.json
		configure_file(${PROJECT_SOURCE_DIR}/Modules/install-modules.R.in
		${SCRIPT_DIRECTORY}/install-modules.R @ONLY)

		-#create modules install target
		-add_custom_target(
		- Modules
		- USES_TERMINAL
		- WORKING_DIRECTORY ${R_HOME_PATH}
		- DEPENDS ${JASP_MODULE_BUNDLE_MANAGER_LIBRARY}/jaspModuleBundleManager
		- DEPENDS ${SCRIPT_DIRECTORY}/install-modules.R
		- COMMAND ${CMAKE_COMMAND} -E env "JASP_R_HOME=${R_HOME_PATH}" ${R_EXECUTABLE} --slave --no-restore --no-save
		- --file=${SCRIPT_DIRECTORY}/install-modules.R
		- BYPRODUCTS ${MODULES_BINARY_PATH}/bundles-downloaded.txt
		- BYPRODUCTS ${MODULES_BINARY_PATH}/bundles-installed.txt
		- COMMENT "------ Installing Modules"
		-)



		diff --git a/Tools/CMake/Programs.cmake b/Tools/CMake/Programs.cmake
		index bfdc8dc..af5ac03 100644
		index 4e7c052..abb5b48 100644
		--- a/Tools/CMake/Programs.cmake
		+++ b/Tools/CMake/Programs.cmake
		@@ -38,8 +38,9 @@ if(NOT WIN32)
		@@ -37,34 +90,25 @@ index bfdc8dc..af5ac03 100644
		message(CHECK_START "Looking for 'gfortran'")
		find_program(
		diff --git a/Tools/CMake/R.cmake b/Tools/CMake/R.cmake
		index 9ae27d4..64fd96a 100644
		index 42e7b88..405b434 100644
		--- a/Tools/CMake/R.cmake
		+++ b/Tools/CMake/R.cmake
		@@ -841,11 +841,6 @@ message(STATUS "R_CPP_INCLUDES_LIBRARY = ${R_CPP_INCLUDES_LIBRARY}")
		configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_renv.R.in
		${SCRIPT_DIRECTORY}/setup_renv.R @ONLY)
		@@ -867,14 +867,6 @@ else()
		configure_file(${PROJECT_SOURCE_DIR}/Modules/install-renv.R.in
		${SCRIPT_DIRECTORY}/install-renv.R @ONLY)

		-
		-execute_process(
		- COMMAND_ECHO STDOUT
		- #ERROR_QUIET OUTPUT_QUIET
		- WORKING_DIRECTORY ${R_HOME_PATH}
		- COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_renv.R)
		- COMMAND
		- ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/install-renv.R
		-)

		if(APPLE)
		# Patch renv
		@@ -867,11 +862,6 @@ endif()
		configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_rcpp_rinside.R.in
		${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R @ONLY)

		-execute_process(
		- COMMAND_ECHO STDOUT
		- #ERROR_QUIET OUTPUT_QUIET
		- WORKING_DIRECTORY ${R_HOME_PATH}
		- COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R)

		if(APPLE)
		# Patch RInside and RCpp
		@@ -892,8 +882,8 @@ endif()
		@@ -937,8 +929,8 @@ execute_process(

		include(FindRPackagePath)

pkgs/by-name/ja/jasp-desktop/modules.nix

+726 −503

Original line number	Diff line number	Diff line
		@@ -7,19 +7,18 @@

		with rPackages;
		let
		jaspColumnEncoder-src = fetchFromGitHub {
		owner = "jasp-stats";
		repo = "jaspColumnEncoder";
		rev = "c54987bb25de8963866ae69ad3a6ae5a9a9f1240";
		hash = "sha256-aWfRG7DXO1MYFvmMLkX/xtHvGeIhFRcRDrVBrhkvYuI=";
		};
		buildRPackage' = args: buildRPackage ({ name = "${args.pname}-${args.version}"; } // args);

		jaspGraphs = buildRPackage {
		name = "jaspGraphs-${jasp-version}";
		version = jasp-version;
		jaspGraphs = buildRPackage' {
		pname = "jaspGraphs";
		version = "0.19.2-unstable-2025-07-25";

		src = jasp-src;
		sourceRoot = "${jasp-src.name}/Engine/jaspGraphs";
		src = fetchFromGitHub {
		owner = "jasp-stats";
		repo = "jaspGraphs";
		rev = "e721a631c8357d42c1371a978db7cb5765bc7044";
		hash = "sha256-DOOKHBVTF9bVhAa/LZCH1J7A821H4mGEfy6KAEtDBNk=";
		};

		propagatedBuildInputs = [
		ggplot2
		@@ -35,8 +34,15 @@ let
		];
		};

		jaspBase = buildRPackage {
		name = "jaspBase-${jasp-version}";
		jaspColumnEncoder-src = fetchFromGitHub {
		owner = "jasp-stats";
		repo = "jaspColumnEncoder";
		rev = "32c53153da95087feb109c0f5f69534ffa3f32b7";
		hash = "sha256-VOMcoXpLH24auQfZCWW6hQ10u6n2GxuEQHMaXrvGTnI=";
		};

		jaspBase = buildRPackage' {
		pname = "jaspBase";
		version = jasp-version;

		src = jasp-src;
		@@ -44,9 +50,6 @@ let

		env.INCLUDE_DIR = "../inst/include/jaspColumnEncoder";

		# necessary for R 4.4.0
		hardeningDisable = [ "format" ];

		postPatch = ''
		mkdir -p inst/include
		cp -r --no-preserve=all ${jaspColumnEncoder-src} inst/include/jaspColumnEncoder
		@@ -79,14 +82,17 @@ let
		];
		};

		stanova = buildRPackage {
		name = "stanova";
		stanova = buildRPackage' {
		pname = "stanova";
		version = "0.3-unstable-2021-06-06";

		src = fetchFromGitHub {
		owner = "bayesstuff";
		repo = "stanova";
		rev = "988ad8e07cda1674b881570a85502be7795fbd4e";
		hash = "sha256-tAeHqTHao2KVRNFBDWmuF++H31aNN6O1ss1Io500QBY=";
		};

		propagatedBuildInputs = [
		emmeans
		lme4
		@@ -96,14 +102,17 @@ let
		];
		};

		bstats = buildRPackage {
		name = "bstats";
		bstats = buildRPackage' {
		pname = "bstats";
		version = "0.0.0.9004-unstable-2023-09-08";

		src = fetchFromGitHub {
		owner = "AlexanderLyNL";
		repo = "bstats";
		rev = "42d34c18df08d233825bae34fdc0dfa0cd70ce8c";
		hash = "sha256-N2KmbTPbyvzsZTWBRE2x7bteccnzokUWDOB4mOWUdJk=";
		};

		propagatedBuildInputs = [
		hypergeo
		purrr
		@@ -111,14 +120,17 @@ let
		];
		};

		flexplot = buildRPackage {
		name = "flexplot";
		flexplot = buildRPackage' {
		pname = "flexplot";
		version = "0.25.5";

		src = fetchFromGitHub {
		owner = "dustinfife";
		repo = "flexplot";
		rev = "303a03968f677e71c99a5e22f6352c0811b7b2fb";
		hash = "sha256-iT5CdtNk0Oi8gga76L6YtyWGACAwpN8A/yTBy7JJERc=";
		rev = "9a39de871d48364dd5f096b2380a4c9907adf4c3";
		hash = "sha256-yf5wbhfffztT5iF6h/JSg4NSbuaexk+9JEOfT5Is1vE=";
		};

		propagatedBuildInputs = [
		cowplot
		MASS
		@@ -141,14 +153,17 @@ let
		};

		# conting has been removed from CRAN
		conting' = buildRPackage {
		name = "conting";
		conting' = buildRPackage' {
		pname = "conting";
		version = "1.7.9999";

		src = fetchFromGitHub {
		owner = "vandenman";
		repo = "conting";
		rev = "03a4eb9a687e015d602022a01d4e638324c110c8";
		hash = "sha256-Sp09YZz1WGyefn31Zy1qGufoKjtuEEZHO+wJvoLArf0=";
		};

		propagatedBuildInputs = [
		mvtnorm
		gtools
		@@ -158,14 +173,22 @@ let
		};

		buildJaspModule =
		name: deps:
		buildRPackage {
		name = "${name}-${jasp-version}";
		version = jasp-version;
		src = jasp-src;
		sourceRoot = "${jasp-src.name}/Modules/${name}";
		{
		pname,
		version,
		hash,
		deps,
		}:
		buildRPackage' {
		inherit pname version;
		src = fetchFromGitHub {
		name = "${pname}-${version}-source";
		owner = "jasp-stats";
		repo = pname;
		tag = "v${version}";
		inherit hash;
		};
		propagatedBuildInputs = deps;

		# some packages have a .Rprofile that tries to activate renv
		# we disable this by removing .Rprofile
		postPatch = ''
		@@ -174,12 +197,14 @@ let
		};
		in
		{
		engine = {
		inherit jaspBase jaspGraphs;
		};
		inherit jaspBase;

		modules = rec {
		jaspAcceptanceSampling = buildJaspModule "jaspAcceptanceSampling" [
		jaspAcceptanceSampling = buildJaspModule {
		pname = "jaspAcceptanceSampling";
		version = "0.95.0";
		hash = "sha256-MzuijLBrCd/aIACzyEWWbQoyuYl/c7iMplsIpScbqK4=";
		deps = [
		abtest
		BayesFactor
		conting'
		@@ -192,7 +217,12 @@ in
		vcdExtra
		AcceptanceSampling
		];
		jaspAnova = buildJaspModule "jaspAnova" [
		};
		jaspAnova = buildJaspModule {
		pname = "jaspAnova";
		version = "0.95.0";
		hash = "sha256-elunqlNy7krnoL31aeS4B7SkpKCD42S8Z8HsPeFTjEM=";
		deps = [
		afex
		BayesFactor
		boot
		@@ -216,7 +246,12 @@ in
		stringr
		restriktor
		];
		jaspAudit = buildJaspModule "jaspAudit" [
		};
		jaspAudit = buildJaspModule {
		pname = "jaspAudit";
		version = "0.95.0";
		hash = "sha256-CqrjrNm7DEyzOTg69TzksYczGBSCvhHfdfZ/HaNkhcI=";
		deps = [
		bstats
		extraDistr
		ggplot2
		@@ -225,7 +260,12 @@ in
		jaspGraphs
		jfa
		];
		jaspBain = buildJaspModule "jaspBain" [
		};
		jaspBain = buildJaspModule {
		pname = "jaspBain";
		version = "0.95.0";
		hash = "sha256-E6j7dH6jbXWhR03QVQjY30/pylrMHU6PNX13gr5KvV4=";
		deps = [
		bain
		lavaan
		ggplot2
		@@ -235,12 +275,22 @@ in
		jaspGraphs
		jaspSem
		];
		jaspBFF = buildJaspModule "jaspBFF" [
		};
		jaspBFF = buildJaspModule {
		pname = "jaspBFF";
		version = "0.95.0";
		hash = "sha256-fgAUdzgSNt34WL/U3/0ac1kTB5PYAvmpXeQUuNEUhuE=";
		deps = [
		BFF
		jaspBase
		jaspGraphs
		];
		jaspBfpack = buildJaspModule "jaspBfpack" [
		};
		jaspBfpack = buildJaspModule {
		pname = "jaspBfpack";
		version = "0.95.0";
		hash = "sha256-4c7ORf0epHSdv6AB1UVMwiSEwCfVHAg0jzifBdHInoc=";
		deps = [
		BFpack
		bain
		ggplot2
		@@ -249,7 +299,12 @@ in
		jaspBase
		jaspGraphs
		];
		jaspBsts = buildJaspModule "jaspBsts" [
		};
		jaspBsts = buildJaspModule {
		pname = "jaspBsts";
		version = "0.95.0";
		hash = "sha256-pClbOuA255mHJSy7/TpQE+oaYQbxJut9AqZRMqm8Rhg=";
		deps = [
		Boom
		bsts
		ggplot2
		@@ -258,19 +313,34 @@ in
		matrixStats
		reshape2
		];
		jaspCircular = buildJaspModule "jaspCircular" [
		};
		jaspCircular = buildJaspModule {
		pname = "jaspCircular";
		version = "0.95.0";
		hash = "sha256-Sx63VGtOZvwHF1jIjnd6aPmN1WtHHf35iQ0dzCWs1eU=";
		deps = [
		jaspBase
		jaspGraphs
		circular
		ggplot2
		];
		jaspCochrane = buildJaspModule "jaspCochrane" [
		};
		jaspCochrane = buildJaspModule {
		pname = "jaspCochrane";
		version = "0.95.0";
		hash = "sha256-ZYMe1BJ0+HKKyHVY5riEcGE+6vZsAurWzHmPF5I7nk8=";
		deps = [
		jaspBase
		jaspGraphs
		jaspDescriptives
		jaspMetaAnalysis
		];
		jaspDescriptives = buildJaspModule "jaspDescriptives" [
		};
		jaspDescriptives = buildJaspModule {
		pname = "jaspDescriptives";
		version = "0.95.0";
		hash = "sha256-gaGgSSv1D0GB8Rmzg9TYl460TjWHkK0abHDm5DHhOJg=";
		deps = [
		ggplot2
		ggrepel
		jaspBase
		@@ -282,8 +352,18 @@ in
		ggpp
		ggtext
		dplyr
		tidyplots
		ggpubr
		forcats
		patchwork
		];
		jaspDistributions = buildJaspModule "jaspDistributions" [
		};

		jaspDistributions = buildJaspModule {
		pname = "jaspDistributions";
		version = "0.95.0";
		hash = "sha256-jtPYx2wOAY7ItrkPqyMsKp7sTrL9M1TtTmR0IjxU1nw=";
		deps = [
		car
		fitdistrplus
		ggplot2
		@@ -292,10 +372,16 @@ in
		jaspBase
		jaspGraphs
		MASS
		nortest
		sgt
		sn
		];
		jaspEquivalenceTTests = buildJaspModule "jaspEquivalenceTTests" [
		};
		jaspEquivalenceTTests = buildJaspModule {
		pname = "jaspEquivalenceTTests";
		version = "0.95.0";
		hash = "sha256-b/I6lb6I8rzOyyRgmsQTBMfHXfJDkrZPdwe5Kh2IVnc=";
		deps = [
		BayesFactor
		ggplot2
		jaspBase
		@@ -304,7 +390,25 @@ in
		TOSTER
		jaspTTests
		];
		jaspFactor = buildJaspModule "jaspFactor" [
		};
		jaspEsci = buildJaspModule {
		pname = "jaspEsci";
		version = "0.95.0";
		hash = "sha256-0YBC54VdVNuGdkfjWEIJnW3n/Wbch4E6tkauVm45/9c=";
		deps = [
		jaspBase
		jaspGraphs
		esci
		glue
		vdiffr
		legendry
		];
		};
		jaspFactor = buildJaspModule {
		pname = "jaspFactor";
		version = "0.95.0";
		hash = "sha256-gK4GdwADrPt2UB/UUx+2Kx5IOlFolYjNArrYpTGK9ic=";
		deps = [
		ggplot2
		jaspBase
		jaspGraphs
		@@ -318,7 +422,12 @@ in
		Rcsdp
		semTools
		];
		jaspFrequencies = buildJaspModule "jaspFrequencies" [
		};
		jaspFrequencies = buildJaspModule {
		pname = "jaspFrequencies";
		version = "0.95.0";
		hash = "sha256-aK4t+q6NRHGiszJa6rWx1bQddxzwynM9TOckxofdgsw";
		deps = [
		abtest
		BayesFactor
		bridgesampling
		@@ -333,7 +442,12 @@ in
		vcd
		vcdExtra
		];
		jaspJags = buildJaspModule "jaspJags" [
		};
		jaspJags = buildJaspModule {
		pname = "jaspJags";
		version = "0.95.0";
		hash = "sha256-DxLy3NgqvLIROBut30ne3hCUd67rCRutgM7zGvwkKNU=";
		deps = [
		coda
		ggplot2
		ggtext
		@@ -345,7 +459,12 @@ in
		scales
		stringr
		];
		jaspLearnBayes = buildJaspModule "jaspLearnBayes" [
		};
		jaspLearnBayes = buildJaspModule {
		pname = "jaspLearnBayes";
		version = "0.95.0";
		hash = "sha256-mka93YglICKxPXNO85Kv/gzSRAMuTkWcnAlwIExDpi0=";
		deps = [
		extraDistr
		ggplot2
		HDInterval
		@@ -363,7 +482,12 @@ in
		png
		posterior
		];
		jaspLearnStats = buildJaspModule "jaspLearnStats" [
		};
		jaspLearnStats = buildJaspModule {
		pname = "jaspLearnStats";
		version = "0.95.0";
		hash = "sha256-AcdSmAGr1ITZV/OXNpyOz0wwBlho76lvEGgt5FUHnsg=";
		deps = [
		extraDistr
		ggplot2
		jaspBase
		@@ -377,7 +501,12 @@ in
		HDInterval
		metafor
		];
		jaspMachineLearning = buildJaspModule "jaspMachineLearning" [
		};
		jaspMachineLearning = buildJaspModule {
		pname = "jaspMachineLearning";
		version = "0.95.0";
		hash = "sha256-oCsXrcEAteFGfFHU65FV3jm1majA1q1w+TYCwAsvf70=";
		deps = [
		kknn
		AUC
		cluster
		@@ -411,14 +540,21 @@ in
		signal
		VGAM
		];
		jaspMetaAnalysis = buildJaspModule "jaspMetaAnalysis" [
		};
		jaspMetaAnalysis = buildJaspModule {
		pname = "jaspMetaAnalysis";
		version = "0.95.0";
		hash = "sha256-5zmLCx6HuM/oBxfaAgo4y7/CYJJkiJEP9RvAsc1h/5w=";
		deps = [
		dplyr
		ggplot2
		jaspBase
		jaspGraphs
		jaspSem
		MASS
		metaBMA
		metafor
		metaSEM
		psych
		purrr
		rstan
		@@ -438,7 +574,12 @@ in
		nleqslv
		patchwork
		];
		jaspMixedModels = buildJaspModule "jaspMixedModels" [
		};
		jaspMixedModels = buildJaspModule {
		pname = "jaspMixedModels";
		version = "0.95.0";
		hash = "sha256-EbB7rwlfRiGPI+QIi8/SygxJgsU5nOpZ2ZEg+mETX5Y=";
		deps = [
		afex
		emmeans
		ggplot2
		@@ -453,9 +594,14 @@ in
		stanova
		withr
		];
		jaspNetwork = buildJaspModule "jaspNetwork" [
		};
		jaspNetwork = buildJaspModule {
		pname = "jaspNetwork";
		version = "0.95.0";
		hash = "sha256-1RDkKRgNV6cToM2pVdHwIDE41UpFV0snIU54BEesVJw=";
		deps = [
		bootnet
		BDgraph
		easybgm
		corpcor
		dplyr
		foreach
		@@ -472,12 +618,22 @@ in
		snow
		stringr
		];
		jaspPower = buildJaspModule "jaspPower" [
		};
		jaspPower = buildJaspModule {
		pname = "jaspPower";
		version = "0.95.0";
		hash = "sha256-sLLJ6yqKbFlXrHPlm2G7NuHp+/kBl+kPRvi6vAy32Ds=";
		deps = [
		pwr
		jaspBase
		jaspGraphs
		];
		jaspPredictiveAnalytics = buildJaspModule "jaspPredictiveAnalytics" [
		};
		jaspPredictiveAnalytics = buildJaspModule {
		pname = "jaspPredictiveAnalytics";
		version = "0.95.0";
		hash = "sha256-850PruQnCGab0g3Vdlh1LSqWYLFJUCbGNt3gWjEWP34=";
		deps = [
		jaspBase
		jaspGraphs
		bsts
		@@ -493,7 +649,12 @@ in
		scoringRules
		scoringutils
		];
		jaspProcess = buildJaspModule "jaspProcess" [
		};
		jaspProcess = buildJaspModule {
		pname = "jaspProcess";
		version = "0.95.0";
		hash = "sha256-LUlk9Iy538Zenzy+W1oJiCr7dcrBQVrl4gzflwnJVyc=";
		deps = [
		blavaan
		dagitty
		ggplot2
		@@ -503,7 +664,12 @@ in
		jaspJags
		runjags
		];
		jaspProphet = buildJaspModule "jaspProphet" [
		};
		jaspProphet = buildJaspModule {
		pname = "jaspProphet";
		version = "0.95.0";
		hash = "sha256-lCgqH3CfZxRImq5VndZepiy/JaXJHHh1Haj+7XhZUSE=";
		deps = [
		rstan
		ggplot2
		jaspBase
		@@ -511,7 +677,12 @@ in
		prophet
		scales
		];
		jaspQualityControl = buildJaspModule "jaspQualityControl" [
		};
		jaspQualityControl = buildJaspModule {
		pname = "jaspQualityControl";
		version = "0.95.0";
		hash = "sha256-6SvLe++9ipvHfX0Hi1xeBeoQeq+PdG9YTE5sewhqUHA=";
		deps = [
		car
		cowplot
		daewr
		@@ -539,7 +710,12 @@ in
		vipor
		weibullness
		];
		jaspRegression = buildJaspModule "jaspRegression" [
		};
		jaspRegression = buildJaspModule {
		pname = "jaspRegression";
		version = "0.95.0";
		hash = "sha256-9Q5Ei9vjFaDte//1seCj9++ftbDctkHzP8ZpGVETXH0=";
		deps = [
		BAS
		boot
		bstats
		@@ -564,7 +740,12 @@ in
		statmod
		VGAM
		];
		jaspReliability = buildJaspModule "jaspReliability" [
		};
		jaspReliability = buildJaspModule {
		pname = "jaspReliability";
		version = "0.95.0";
		hash = "sha256-wxx1ECm7QKDvLLKQZbEVYTHfyn3ieks69HSP/cg5dDQ=";
		deps = [
		Bayesrel
		coda
		ggplot2
		@@ -578,13 +759,23 @@ in
		psych
		mirt
		];
		jaspRobustTTests = buildJaspModule "jaspRobustTTests" [
		};
		jaspRobustTTests = buildJaspModule {
		pname = "jaspRobustTTests";
		version = "0.95.0";
		hash = "sha256-nw+7eZycdJ+DHlLaTSBWdHocnaZk95PBqYj8sVFlPSg=";
		deps = [
		RoBTT
		ggplot2
		jaspBase
		jaspGraphs
		];
		jaspSem = buildJaspModule "jaspSem" [
		};
		jaspSem = buildJaspModule {
		pname = "jaspSem";
		version = "0.95.0";
		hash = "sha256-+cgP6KqSK4tXQ+Dg6OTEoXfzEJFNdnwAat6tyWyzSkU=";
		deps = [
		forcats
		ggplot2
		lavaan
		@@ -599,7 +790,12 @@ in
		tidyr
		SEMsens
		];
		jaspSummaryStatistics = buildJaspModule "jaspSummaryStatistics" [
		};
		jaspSummaryStatistics = buildJaspModule {
		pname = "jaspSummaryStatistics";
		version = "0.95.0";
		hash = "sha256-VuBDJtkDifDeatY3eX5RBd5ix6fB0QnJ1ZoM7am9SOA=";
		deps = [
		BayesFactor
		bstats
		jaspBase
		@@ -612,13 +808,24 @@ in
		SuppDists
		bayesplay
		];
		jaspSurvival = buildJaspModule "jaspSurvival" [
		};
		jaspSurvival = buildJaspModule {
		pname = "jaspSurvival";
		version = "0.95.0";
		hash = "sha256-IVN3Tcd+OgD4pancwyNomQMOfOvUnKIWG/nxKdjNxcw=";
		deps = [
		survival
		ggsurvfit
		flexsurv
		jaspBase
		jaspGraphs
		];
		jaspTTests = buildJaspModule "jaspTTests" [
		};
		jaspTTests = buildJaspModule {
		pname = "jaspTTests";
		version = "0.95.0";
		hash = "sha256-CLrfa5X/q2Ruc+y3ruHnT/NhYQ4ESvxtJCH2JM/hf4o=";
		deps = [
		BayesFactor
		car
		ggplot2
		@@ -628,23 +835,39 @@ in
		plotrix
		plyr
		];
		jaspTestModule = buildJaspModule "jaspTestModule" [
		};
		jaspTestModule = buildJaspModule {
		pname = "jaspTestModule";
		version = "0.95.0";
		hash = "sha256-r+VzUxfvWYl/Fppq/TxCw1jI8F3dohsvb6qwlQHlFDA=";
		deps = [
		jaspBase
		jaspGraphs
		svglite
		stringi
		];
		jaspTimeSeries = buildJaspModule "jaspTimeSeries" [
		};
		jaspTimeSeries = buildJaspModule {
		pname = "jaspTimeSeries";
		version = "0.95.0";
		hash = "sha256-hQh9p6mX3NlkToh4uQRbPtwpNLlVwsILxH+9D2caZXk=";
		deps = [
		jaspBase
		jaspGraphs
		jaspDescriptives
		forecast
		];
		jaspVisualModeling = buildJaspModule "jaspVisualModeling" [
		};
		jaspVisualModeling = buildJaspModule {
		pname = "jaspVisualModeling";
		version = "0.95.0";
		hash = "sha256-MX3NvfVoFPp2NLWYIYIoCdWKHxpcRhfyMCWj3VdIBC0=";
		deps = [
		flexplot
		jaspBase
		jaspGraphs
		jaspDescriptives
		];
		};
		};
		}

pkgs/by-name/ja/jasp-desktop/package.nix

+9 −10

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		boost,
		freexl,
		libarchive,
		librdata,
		qt6,
		R,
		readstat,
		@@ -21,14 +22,14 @@
		}:

		let
		version = "0.19.3";
		version = "0.95.0";

		src = fetchFromGitHub {
		owner = "jasp-stats";
		repo = "jasp-desktop";
		tag = "v${version}";
		fetchSubmodules = true;
		hash = "sha256-p489Q3jMQ7UWOCdAGskRF9KSLoRSatUwGVfj0/g4aPo=";
		hash = "sha256-RR7rJJb0qKqZs7K3zP6GxlDXpmSNnGQ3WDExUgm9pKQ=";
		};

		moduleSet = import ./modules.nix {
		@@ -37,7 +38,7 @@ let
		jasp-version = version;
		};

		inherit (moduleSet) engine modules;
		inherit (moduleSet) jaspBase modules;

		# Merges ${R}/lib/R with all used R packages (even propagated ones)
		customREnv = buildEnv {
		@@ -45,12 +46,12 @@ let
		paths = [
		"${R}/lib/R"
		rPackages.RInside
		engine.jaspBase # Should already be propagated from modules, but include it again, just in case
		jaspBase # Should already be propagated from modules, but include it again, just in case
		]
		++ lib.attrValues modules;
		};

		modulesDir = linkFarm "jasp-${version}-modules" (
		moduleLibs = linkFarm "jasp-${version}-module-libs" (
		lib.mapAttrsToList (name: drv: {
		name = name;
		path = "${drv}/library";
		@@ -89,6 +90,7 @@ stdenv.mkDerivation {
		customREnv
		freexl
		libarchive
		librdata
		readstat

		qt6.qtbase
		@@ -102,20 +104,17 @@ stdenv.mkDerivation {
		env.NIX_LDFLAGS = "-L${rPackages.RInside}/library/RInside/lib";

		postInstall = ''
		# Remove unused cache locations
		rm -r $out/lib64 $out/Modules

		# Remove flatpak proxy script
		rm $out/bin/org.jaspstats.JASP
		substituteInPlace $out/share/applications/org.jaspstats.JASP.desktop \
		--replace-fail "Exec=org.jaspstats.JASP" "Exec=JASP"

		# symlink modules from the store
		ln -s ${modulesDir} $out/Modules
		ln -s ${moduleLibs} $out/Modules/module_libs
		'';

		passthru = {
		inherit modules engine;
		inherit jaspBase modules;
		env = customREnv;
		};

Admin message