Unverified Commit b3de6e58 authored by TomaSajt's avatar TomaSajt
Browse files

jasp-desktop: 0.18.3 -> 0.19.0

parent 5a280614

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

+20 −3
Original line number Diff line number Diff line 
{

  R,

  rPackages,

  fetchFromGitHub,

  jasp-src,
@@ -117,8 +116,8 @@ let 
    src = fetchFromGitHub {

      owner = "dustinfife";

      repo = "flexplot";

      rev = "4223ad5fb56028018b964d6f9f5aa5bac8710821";

      hash = "sha256-L+Ed2bIWjq3ZIAGookp8dAjDSeldEbcwynwFVVZ9IcU=";

      rev = "303a03968f677e71c99a5e22f6352c0811b7b2fb";

      hash = "sha256-iT5CdtNk0Oi8gga76L6YtyWGACAwpN8A/yTBy7JJERc=";

    };

    propagatedBuildInputs = [

      cowplot
@@ -194,6 +193,7 @@ in 
      car

      colorspace

      emmeans

      effectsize

      ggplot2

      jaspBase

      jaspDescriptives
@@ -202,6 +202,8 @@ in 
      KernSmooth

      matrixStats

      multcomp

      multcompView

      mvShapiroTest

      onewaytests

      plyr

      stringi
@@ -253,6 +255,13 @@ in 
      ggrepel

      jaspBase

      jaspGraphs

      jaspTTests

      forecast

      flexplot

      ggrain

      ggpp

      ggtext

      dplyr

    ];

    jaspDistributions = buildJaspModule "jaspDistributions" [

      car
@@ -292,6 +301,7 @@ in 
    jaspFrequencies = buildJaspModule "jaspFrequencies" [

      abtest

      BayesFactor

      bridgesampling

      conting'

      multibridge

      ggplot2
@@ -310,6 +320,7 @@ in 
      jaspBase

      jaspGraphs

      rjags

      runjags

      scales

      stringr

    ];
@@ -325,6 +336,7 @@ in 
      scales

      ggalluvial

      ragg

      rjags

      runjags

      ggdist

      png
@@ -449,11 +461,14 @@ in 
      imputeTS

    ];

    jaspProcess = buildJaspModule "jaspProcess" [

      blavaan

      dagitty

      ggplot2

      ggraph

      jaspBase

      jaspGraphs

      jaspJags

      runjags

    ];

    jaspProphet = buildJaspModule "jaspProphet" [

      rstan
@@ -581,12 +596,14 @@ in 
    jaspTimeSeries = buildJaspModule "jaspTimeSeries" [

      jaspBase

      jaspGraphs

      jaspDescriptives

      forecast

    ];

    jaspVisualModeling = buildJaspModule "jaspVisualModeling" [

      flexplot

      jaspBase

      jaspGraphs

      jaspDescriptives

    ];

  };

}

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

+21 −29
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  callPackage,

  buildEnv,

  linkFarm,

  substituteAll,
@@ -18,24 +17,23 @@ 
}:



let

  version = "0.18.3";

  version = "0.19.0";



  src = fetchFromGitHub {

    owner = "jasp-stats";

    repo = "jasp-desktop";

    rev = "v${version}";

    hash = "sha256-eKBxCIamNhUig+0vUEqXYbPjiaOsZk6QnOw8cnpjKFY=";

    hash = "sha256-G84bmR+40W9RV+OIXYuMmwdEFE0iPMp/wEOcRHYUoj8=";

    fetchSubmodules = true;

  };



  inherit

    (callPackage ./modules.nix {

  moduleSet = import ./modules.nix {

    inherit fetchFromGitHub rPackages;

    jasp-src = src;

    jasp-version = version;

    })

    engine

    modules

    ;

  };



  inherit (moduleSet) engine modules;



  # Merges ${R}/lib/R with all used R packages (even propagated ones)

  customREnv = buildEnv {
@@ -75,9 +73,6 @@ stdenv.mkDerivation { 
    "-DCUSTOM_R_PATH=${customREnv}"

  ];



  # necessary for R 4.4.0

  hardeningDisable = [ "format" ];



  nativeBuildInputs = [

    cmake

    ninja
@@ -85,20 +80,17 @@ stdenv.mkDerivation { 
    qt6.wrapQtAppsHook

  ];



  buildInputs =

    [

  buildInputs = [

    customREnv

    boost

    libarchive

    readstat

    ]

    ++ (with qt6; [

      qtbase

      qtdeclarative

      qtwebengine

      qtsvg

      qt5compat

    ]);

    qt6.qtbase

    qt6.qtdeclarative

    qt6.qtwebengine

    qt6.qtsvg

    qt6.qt5compat

  ];



  env.NIX_LDFLAGS = "-L${rPackages.RInside}/library/RInside/lib";
@@ -109,7 +101,7 @@ stdenv.mkDerivation { 
    # Remove flatpak proxy script

    rm $out/bin/org.jaspstats.JASP

    substituteInPlace $out/share/applications/org.jaspstats.JASP.desktop \

        --replace "Exec=org.jaspstats.JASP" "Exec=JASP"

        --replace-fail "Exec=org.jaspstats.JASP" "Exec=JASP"



    # symlink modules from the store

    ln -s ${modulesDir} $out/Modules