hopefully R fix

This commit is contained in:
Daniel Winkler 2026-05-23 23:44:56 +10:00
commit 458332a141
4 changed files with 4 additions and 4 deletions

View file

@ -201,7 +201,7 @@ projectSettings = {
Add Python/R/Julia libraries that get appended to the module defaults. The built-in defaults are: Add Python/R/Julia libraries that get appended to the module defaults. The built-in defaults are:
- Python: `duckdb`, `polars` - Python: `duckdb`, `polars`
- R: `arrow`, `broom`, `data_table`, `janitor`, `styler`, `nvimcom` - R: `arrow`, `broom`, `data_table`, `janitor`, `styler`
- Julia: `DataFramesMeta`, `QuackIO` - Julia: `DataFramesMeta`, `QuackIO`
```nix ```nix

View file

@ -8,6 +8,7 @@ let
maybe = cat: pkgsList: maybe = cat: pkgsList:
lib.optionals (config.cats.${cat} or false) pkgsList; lib.optionals (config.cats.${cat} or false) pkgsList;
rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r; rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r;
rWrapperPackages = rPackages ++ [pkgs.nvimcom];
quartoPkg = quartoPkg =
if config.cats.r or false if config.cats.r or false
then pkgs.rpkgs.quarto.override { extraRPackages = rPackages; } then pkgs.rpkgs.quarto.override { extraRPackages = rPackages; }
@ -93,7 +94,7 @@ in
]); ]);
r = maybe "r" [ r = maybe "r" [
(pkgs.rpkgs.rWrapper.override { packages = rPackages; }) (pkgs.rpkgs.rWrapper.override { packages = rWrapperPackages; })
pkgs.rpkgs.radianWrapper pkgs.rpkgs.radianWrapper
quartoPkg quartoPkg
pkgs.air-formatter pkgs.air-formatter

View file

@ -6,7 +6,7 @@
}: }:
let let
rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r; rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r;
rWrapperPkg = pkgs.rpkgs.rWrapper.override { packages = rPackages; }; rWrapperPkg = pkgs.rpkgs.rWrapper.override { packages = rPackages ++ [pkgs.nvimcom]; };
in in
{ {
config.hosts = lib.mkMerge [ config.hosts = lib.mkMerge [

View file

@ -45,7 +45,6 @@
janitor janitor
styler styler
]) ])
++ [pkgs.nvimcom]
); );
julia = lib.mkDefault [ julia = lib.mkDefault [
"DataFramesMeta" "DataFramesMeta"