From 92d249ab8ba421fc226b652ce7ef33561fffb31d Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Fri, 12 Sep 2025 18:07:06 +1000 Subject: [PATCH] Separate out julia dependency --- flake.nix | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index 0d28ab4..8f7cfe9 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,9 @@ # The overlay that exposes custom R packages overlay = final: prev: { + extraRPackageDeps = { + julia-fwildclusterboot = prev.julia-bin.withPackages ["WildBootTests" "StableRNGs"]; + }; extraRPackages = let fetchfromGitHubJSONFile = path: prev.fetchFromGitHub (builtins.fromJSON (builtins.readFile path)); in { @@ -31,26 +34,24 @@ fwildclusterboot = prev.rPackages.buildRPackage { name = "fwildclusterboot"; src = fetchfromGitHubJSONFile ./versions/fwildclusterboot.json; - propagatedBuildInputs = - builtins.attrValues { - inherit - (prev.rPackages) - collapse - dqrng - dreamerr - Formula - generics - gtools - JuliaConnectoR - Matrix - Rcpp - rlang - summclust - RcppArmadillo - RcppEigen - ; - } - ++ [(prev.julia-bin.withPackages ["WildBootTests"])]; + propagatedBuildInputs = builtins.attrValues { + inherit + (prev.rPackages) + collapse + dqrng + dreamerr + Formula + generics + gtools + JuliaConnectoR + Matrix + Rcpp + rlang + summclust + RcppArmadillo + RcppEigen + ; + }; }; ## H @@ -120,6 +121,7 @@ default = pkgs.mkShell { packages = with self.packages."${system}"; [ default + pkgs.extraRPackageDeps.julia-fwildclusterboot franUpdate ]; };