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

Browse source 
Rix packages repo is now an overlay to nixpkgs-unstable
This commit is contained in:
Daniel Winkler 2025-05-31 13:52:12 +02:00
commit b9c8fd1e8c
No known key found for this signature in database
3 changed files with 60 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

30
templates/r/flake.lock generated
View file

@ -39,14 +39,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1746525332, "lastModified": 1748506378,
"narHash": "sha256-hnr+j3EeNt0An/+2N+7p7/UAfR3jWTaHSwHdr7K86aU=", "owner": "nixos",
"type": "tarball", "repo": "nixpkgs",
"url": "https://github.com/rstats-on-nix/nixpkgs/archive/2025-05-05.tar.gz" "rev": "3866ad91cfc172f08a6839def503d8fc2923c603",
"type": "github"
}, },
"original": { "original": {
"type": "tarball", "owner": "nixos",
"url": "https://github.com/rstats-on-nix/nixpkgs/archive/2025-05-05.tar.gz" "ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"plugins-r": { "plugins-r": {
@ -77,10 +80,23 @@
"url": "https://github.com/rstats-on-nix/nixpkgs/archive/2025-04-29.tar.gz" "url": "https://github.com/rstats-on-nix/nixpkgs/archive/2025-04-29.tar.gz"
} }
}, },
"rixpkgs_2": {
"locked": {
"lastModified": 1747664360,
"narHash": "sha256-DskCWKtHNGApsP3PI/HB+fETs3qXpwul3PtSgTb++N4=",
"type": "tarball",
"url": "https://github.com/rstats-on-nix/nixpkgs/archive/2025-05-19.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/rstats-on-nix/nixpkgs/archive/2025-05-19.tar.gz"
}
},
"root": { "root": {
"inputs": { "inputs": {
"nCats": "nCats", "nCats": "nCats",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"rixpkgs": "rixpkgs_2"
} }
} }
}, },

8
templates/r/flake.nix
View file

@ -1,9 +1,8 @@
{ {
description = "Project Template"; description = "Project Template";
inputs = { inputs = {
nixpkgs = { rixpkgs.url = "https://github.com/rstats-on-nix/nixpkgs/archive/2025-05-19.tar.gz";
url = "https://github.com/rstats-on-nix/nixpkgs/archive/2025-05-05.tar.gz"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
};
nCats.url = "github:dwinkler1/nixCatsConfig"; nCats.url = "github:dwinkler1/nixCatsConfig";
nCats.inputs.nixpkgs.follows = "nixpkgs"; nCats.inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -23,6 +22,9 @@
prev.dependencyOverlays prev.dependencyOverlays
++ [ ++ [
(utils.standardPluginOverlay inputs) (utils.standardPluginOverlay inputs)
(final: prev: {
rpkgs = import inputs.rixpkgs {inherit system;};
})
(import ./rpkgs.nix) (import ./rpkgs.nix)
]; ];
categoryDefinitions = utils.mergeCatDefs prev.categoryDefinitions ( categoryDefinitions = utils.mergeCatDefs prev.categoryDefinitions (

27
templates/r/rpkgs.nix
View file

@ -1,24 +1,25 @@
final: prev: { final: prev: let
rWrapper = prev.rWrapper.override { reqPkgs = with prev.rpkgs.rPackages; [
packages = with prev.rPackages; [ Hmisc
languageserver broom
fixest data_table
dplyr dplyr
ggplot2 ggplot2
gt
janitor janitor
psych
tidyr tidyr
WeightIt languageserver
broom
(buildRPackage { (buildRPackage {
name = "nvimcom"; name = "nvimcom";
src = prev.fetchFromGitHub { src = prev.rpkgs.fetchFromGitHub {
owner = "R-nvim"; owner = "R-nvim";
repo = "R.nvim"; repo = "R.nvim";
rev = "f30c3b2be9ca1a3c277c5e66f5612774cc3fbcf4"; rev = "382858fcf23aabbf47ff06279baf69d52260b939";
sha256 = "sha256-X5ZfbrG7FtGJpnMJ2b7FMY/OM9rIIliFSqnbtudZCZg="; sha256 = "sha256-j2rXXO7246Nh8U6XyX43nNTbrire9ta9Ono9Yr+Eh9M=";
}; };
sourceRoot = "source/nvimcom"; sourceRoot = "source/nvimcom";
buildInputs = with prev; [ buildInputs = with prev.rpkgs; [
R R
stdenv.cc.cc stdenv.cc.cc
gnumake gnumake
@ -26,5 +27,7 @@ final: prev: {
propagatedBuildInputs = []; propagatedBuildInputs = [];
}) })
]; ];
}; in {
rWrapper = prev.rpkgs.rWrapper.override {packages = reqPkgs;};
quarto = prev.rpkgs.quarto.override {extraRPackages = reqPkgs;};
} }