jasp-desktop: 0.19.3 -> 0.95.0; librdata: init at 0-unstable-2023-10-03 (#431507)

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

@@ -1,5 +1,34 @@
+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,35 +90,26 @@ 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)
  
 -find_package_path(RCPP_PATH       ${R_CPP_INCLUDES_LIBRARY} "Rcpp")

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

@@ -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;
   };
 

pkgs/by-name/li/librdata/gettext-fix.patch

@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index 19bd5be..d12a927 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,7 +14,6 @@ AC_ARG_ENABLE([sanitizers], AS_HELP_STRING([--enable-sanitizers], [Enable addres
+     [SANITIZERS="-fsanitize=address,bool,float-cast-overflow,integer-divide-by-zero,return,returns-nonnull-attribute,shift-exponent,signed-integer-overflow,unreachable,vla-bound -fsanitize-coverage=trace-pc-guard,indirect-calls,trace-cmp"], [SANITIZERS=""])
+ AC_SUBST([SANITIZERS])
+ 
+-AM_ICONV
+ 
+ AC_CANONICAL_HOST
+ AS_CASE([$host],

pkgs/by-name/li/librdata/package.nix

@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+}:
+
+stdenv.mkDerivation {
+  pname = "librdata";
+  version = "0-unstable-2023-10-03";
+
+  src = fetchFromGitHub {
+    owner = "WizardMac";
+    repo = "librdata";
+    rev = "33bd276ecb0bbcd8997ccc71a544149b3da0d940";
+    hash = "sha256-njTlKK++v7IbaRWJw8hWpE4tXh8MjPRijacqor7Rwes=";
+  };
+
+  patches = [ ./gettext-fix.patch ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = {
+    description = "Read and write R data frames from C";
+    homepage = "https://github.com/WizardMac/librdata";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tomasajt ];
+    platforms = lib.platforms.all;
+  };
+}