Compare commits

...

5 commits

Author SHA1 Message Date
github-actions[bot]
c6ab3eb3dd [create-pull-request] automated change 2026-06-13 07:00:19 +00:00
github-actions[bot]
5cec2c64f4 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:dwinkler1/rixpkgs/af2dd3f' (2026-02-17)
  → 'github:dwinkler1/rixpkgs/41517d1' (2026-06-09)
2026-06-13 07:00:18 +00:00
22db18beaa
Change inheritance of summclust to franPackages 2026-06-13 09:23:33 +10:00
88cff8c2f6
Update flake.nix 2026-06-13 09:22:06 +10:00
161328eeda
Change R packages reference in flake.nix 2026-06-13 09:20:42 +10:00
4 changed files with 8 additions and 8 deletions

6
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1771303851, "lastModified": 1781025891,
"narHash": "sha256-tgveHozOJ2D/mi3LxVy/FcmLFDlM5XKZxsNB2XpvzaM=", "narHash": "sha256-oV1qBl0NhiTxPusYWSzSC99v3TEcqBCdf+FpIBiuxIY=",
"owner": "dwinkler1", "owner": "dwinkler1",
"repo": "rixpkgs", "repo": "rixpkgs",
"rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e", "rev": "41517d15d154037edeaeaf9d930909526356af4a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -59,7 +59,7 @@
in { in {
default = mkR { default = mkR {
inherit pkgs; inherit pkgs;
packages = builtins.attrValues pkgs.extraRPackages; packages = builtins.attrValues pkgs.franPackages;
}; };
franUpdate = pkgs.writeShellScriptBin "fran-update" (import ./versions pkgs); franUpdate = pkgs.writeShellScriptBin "fran-update" (import ./versions pkgs);
} }
@ -94,7 +94,7 @@
}; };
rEnv = mkR { rEnv = mkR {
inherit pkgs; inherit pkgs;
packages = builtins.attrValues pkgs.extraRPackages; packages = builtins.attrValues pkgs.franPackages;
}; };
in { in {
test-script = pkgs.runCommand "test-script" {} '' test-script = pkgs.runCommand "test-script" {} ''

View file

@ -23,7 +23,7 @@
RcppArmadillo RcppArmadillo
RcppEigen RcppEigen
; ;
inherit (final.extraRPackages) summclust; inherit (final.franPackages) summclust;
}; };
}).overrideAttrs (old: { }).overrideAttrs (old: {
passthru = (old.passthru or {}) // {juliaPackages = ["WildBootTests" "StableRNGs"];}; passthru = (old.passthru or {}) // {juliaPackages = ["WildBootTests" "StableRNGs"];};

View file

@ -1,6 +1,6 @@
{ {
"owner": "grantmcdermott", "owner": "grantmcdermott",
"repo": "jgd", "repo": "jgd",
"rev": "6a7b81cf22361366960f619fbbf46f893ab7583b", "rev": "ae3283b94ed5ad5b9f77fa28187959e84d04461a",
"hash": "sha256-OXamYYwyr2RHwsPmXlWr4tMxsLIbaGG/sl7QNpDZTnQ=" "hash": "sha256-MSWDnlUxb/4hKMT/PMGvBUJmhJ0qfZqmGHNyIZzwHho="
} }