diff --git a/flake.lock b/flake.lock index 824cd52..f90739d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1768802006, - "narHash": "sha256-czGb4RwTBahNNK9S7ySXeTWIrn/jKH+74hN/uIS2XrM=", + "lastModified": 1771133455, + "narHash": "sha256-DvHfkW3DctWV+YnigY4+5Stn9NgI38JqR2IScXDX8z8=", "owner": "dwinkler1", "repo": "fran", - "rev": "a3879317519fd3685f3b7679a1de4c5ae65a7cb9", + "rev": "68b189ab981adae06590ee1929a70c8b86afd2b8", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -55,11 +55,11 @@ "plugins-r": { "flake": false, "locked": { - "lastModified": 1769736135, - "narHash": "sha256-T4QgcBL+LCXvrEiRE2JW4jtUKl8DKzFHk8czGUO1jgY=", + "lastModified": 1770663552, + "narHash": "sha256-vI5XW33cNJdHdVAtLSSbKb5ROdSbeOMb23lXTUbgva8=", "owner": "R-nvim", "repo": "R.nvim", - "rev": "2701ec64f5485e17c0e057081a9ae2058d776464", + "rev": "659dc18aba2d2b799c04efbce66a15ea87bd6ec6", "type": "github" }, "original": { @@ -70,14 +70,18 @@ }, "rixpkgs": { "locked": { - "lastModified": 1768825970, - "narHash": "sha256-m/BI9IO7tMuOSdVNSqr0knQ4V9R6rgSXyGQOp3FovSA=", - "type": "tarball", - "url": "https://github.com/rstats-on-nix/nixpkgs/archive/2026-01-19.tar.gz" + "lastModified": 1770939586, + "narHash": "sha256-rp9f5NCjB4jRlY7Hl/I4OLN3i0wXpyBAyQKZYKZPRH0=", + "owner": "dwinkler1", + "repo": "rixpkgs", + "rev": "e99809ceb6b4d52b970b2fedfb19c92880cef97a", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/rstats-on-nix/nixpkgs/archive/2026-01-19.tar.gz" + "owner": "dwinkler1", + "ref": "nixpkgs", + "repo": "rixpkgs", + "type": "github" } }, "root": { @@ -97,11 +101,11 @@ ] }, "locked": { - "lastModified": 1769745458, - "narHash": "sha256-Fq6THKEiAKx+wWQ4wTg9HvOAyD6i8JkWfHVQDZH7Byo=", + "lastModified": 1771192657, + "narHash": "sha256-Ibv5WEXiwr6gIEOajD4QE93TYpXUhEYv1VZV8sdU3IQ=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "cc5e052dd1e93ae75dc06e3fabf46f0820c272f2", + "rev": "8ba8703b62c2cc7e642f58ff03bd14a2f836e07a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2c7a20b..6632310 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ url = "github:BirdeeHub/nix-wrapper-modules"; inputs.nixpkgs.follows = "nixpkgs"; }; - rixpkgs.url = "https://github.com/rstats-on-nix/nixpkgs/archive/2026-01-19.tar.gz"; + rixpkgs.url = "github:dwinkler1/rixpkgs/nixpkgs"; fran = { url = "github:dwinkler1/fran"; @@ -50,7 +50,7 @@ nix = def true; optional = def false; python = def false; - r = def false; + r = true; }; settings = { @@ -68,6 +68,7 @@ janitor styler tidyverse + pkgs.extraRPackages.synthdid ]; julia = ["DataFramesMeta" "QuackIO"]; diff --git a/overlays/default.nix b/overlays/default.nix index 39910b4..dc7ad92 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -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; diff --git a/overlays/r.nix b/overlays/r.nix index 96f149d..2fb71c8 100644 --- a/overlays/r.nix +++ b/overlays/r.nix @@ -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;}; }