hopefully R fix

This commit is contained in:
Daniel Winkler 2026-05-23 23:38:18 +10:00
commit d218b05d48
2 changed files with 15 additions and 8 deletions

View file

@ -7,6 +7,11 @@
let
maybe = cat: pkgsList:
lib.optionals (config.cats.${cat} or false) pkgsList;
rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r;
quartoPkg =
if config.cats.r or false
then pkgs.rpkgs.quarto.override { extraRPackages = rPackages; }
else pkgs.quarto;
in
{
options.catPkgs = lib.mkOption {
@ -35,7 +40,7 @@ in
markdown = maybe "markdown" (with pkgs; [
python313Packages.pylatexenc
quarto
quartoPkg
zk
]);
@ -87,16 +92,14 @@ in
uv
]);
r = maybe "r" (let
r_packages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r;
in [
(pkgs.rpkgs.rWrapper.override { packages = r_packages; })
r = maybe "r" [
(pkgs.rpkgs.rWrapper.override { packages = rPackages; })
pkgs.rpkgs.radianWrapper
(pkgs.rpkgs.quarto.override { extraRPackages = r_packages; })
quartoPkg
pkgs.air-formatter
pkgs.yaml-language-server
pkgs.rnvimserver
]);
];
# cats without packages get empty lists
general = [ ];