dwinkl/np
1
0
Fork 0
mirror of https://github.com/dwinkler1/np.git synced 2026-02-19 22:40:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Refactor of rix package import

Browse source
This commit is contained in:
Daniel Winkler 2025-05-31 14:08:52 +02:00
commit 03fd95179e
No known key found for this signature in database
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
templates/r/flake.nix
View file

@ -23,9 +23,12 @@
++ [ ++ [
(utils.standardPluginOverlay inputs) (utils.standardPluginOverlay inputs)
(final: prev: { (final: prev: {
rpkgs = import inputs.rixpkgs {inherit system;}; rpkgs = inputs.rixpkgs.legacyPackages.${system};
}) })
(import ./rpkgs.nix) (import (builtins.path {
path = ./rpkgs.nix;
name = "my-rpackages";
}))
]; ];
categoryDefinitions = utils.mergeCatDefs prev.categoryDefinitions ( categoryDefinitions = utils.mergeCatDefs prev.categoryDefinitions (
{ {
@ -36,9 +39,7 @@
extra, extra,
mkPlugin, mkPlugin,
... ...
} @ packageDef: let } @ packageDef: {
rpkgs = import ./rpkgs.nix pkgs;
in {
lspsAndRuntimeDeps.rdev = with pkgs; [ lspsAndRuntimeDeps.rdev = with pkgs; [
rWrapper rWrapper
just just
@ -64,7 +65,6 @@
}; };
}); });
in in
# and
utils.mkAllWithDefault finalPackage utils.mkAllWithDefault finalPackage
); );
}; };

3
templates/r/rpkgs.nix
View file

@ -28,6 +28,7 @@ final: prev: let
}) })
]; ];
in { in {
rWrapper = prev.rpkgs.rWrapper.override {packages = reqPkgs;};
quarto = prev.rpkgs.quarto.override {extraRPackages = reqPkgs;}; quarto = prev.rpkgs.quarto.override {extraRPackages = reqPkgs;};
rWrapper = prev.rpkgs.rWrapper.override {packages = reqPkgs;};
radianWrapper = prev.rpkgs.radianWrapper.override {packages = reqPkgs;};
} }