mirror of
https://github.com/dwinkler1/nvimConfig.git
synced 2026-02-19 14:30:58 -05:00
trying new import strategy
This commit is contained in:
parent
8f5c05252e
commit
705ff17e56
4 changed files with 36 additions and 25 deletions
|
|
@ -2,7 +2,7 @@
|
|||
let
|
||||
lib = nixpkgs.lib;
|
||||
|
||||
rOverlay = import ./r.nix inputs;
|
||||
rOverlay = import ./r.nix {inherit inputs;};
|
||||
franOverlay = inputs.fran.overlays.default;
|
||||
pythonOverlay = import ./python.nix inputs;
|
||||
pluginsOverlay = import ./plugins.nix inputs;
|
||||
|
|
|
|||
|
|
@ -23,13 +23,19 @@
|
|||
#
|
||||
# Update the R snapshot date in flake.nix inputs section:
|
||||
# rixpkgs.url = "github:rstats-on-nix/nixpkgs/YYYY-MM-DD"
|
||||
{rixpkgs, ...}: final: prev: let
|
||||
{
|
||||
inputs,
|
||||
...
|
||||
}: final: prev: let
|
||||
# R packages from rstats-on-nix for the current system
|
||||
rpkgs = rixpkgs.legacyPackages.${prev.stdenv.hostPlatform.system};
|
||||
rpkgs = import inputs.rixpkgs {
|
||||
system = prev.stdenv.hostPlatform.system;
|
||||
overlays = [inputs.fran.overlays.default];
|
||||
}; # rixpkgs.legacyPackages.${prev.stdenv.hostPlatform.system};
|
||||
|
||||
# Standard R packages used by default in rWrapper and quarto
|
||||
reqPkgs = with rpkgs.rPackages; [
|
||||
# languageserver
|
||||
# languageserver
|
||||
];
|
||||
in {
|
||||
inherit rpkgs;
|
||||
|
|
@ -42,5 +48,5 @@ in {
|
|||
quarto = rpkgs.quarto.override {extraRPackages = reqPkgs;};
|
||||
|
||||
# Update helper for rix
|
||||
updateR = import ../scripts/updater.nix { pkgs = final; };
|
||||
updateR = import ../scripts/updater.nix {pkgs = final;};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue