diff --git a/flake.lock b/flake.lock index 5621db6..da93fed 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1771303851, - "narHash": "sha256-tgveHozOJ2D/mi3LxVy/FcmLFDlM5XKZxsNB2XpvzaM=", + "lastModified": 1781025891, + "narHash": "sha256-oV1qBl0NhiTxPusYWSzSC99v3TEcqBCdf+FpIBiuxIY=", "owner": "dwinkler1", "repo": "rixpkgs", - "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e", + "rev": "41517d15d154037edeaeaf9d930909526356af4a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d71b0de..f0a03f3 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,7 @@ in { default = mkR { inherit pkgs; - packages = builtins.attrValues pkgs.extraRPackages; + packages = builtins.attrValues pkgs.franPackages; }; franUpdate = pkgs.writeShellScriptBin "fran-update" (import ./versions pkgs); } @@ -94,7 +94,7 @@ }; rEnv = mkR { inherit pkgs; - packages = builtins.attrValues pkgs.extraRPackages; + packages = builtins.attrValues pkgs.franPackages; }; in { test-script = pkgs.runCommand "test-script" {} '' diff --git a/packages/f/fwildclusterboot.nix b/packages/f/fwildclusterboot.nix index cb0cdbd..7987a0f 100644 --- a/packages/f/fwildclusterboot.nix +++ b/packages/f/fwildclusterboot.nix @@ -23,7 +23,7 @@ RcppArmadillo RcppEigen ; - inherit (final.extraRPackages) summclust; + inherit (final.franPackages) summclust; }; }).overrideAttrs (old: { passthru = (old.passthru or {}) // {juliaPackages = ["WildBootTests" "StableRNGs"];}; diff --git a/versions/jgd.json b/versions/jgd.json index 6281601..65f2347 100644 --- a/versions/jgd.json +++ b/versions/jgd.json @@ -1,6 +1,6 @@ { "owner": "grantmcdermott", "repo": "jgd", - "rev": "6a7b81cf22361366960f619fbbf46f893ab7583b", - "hash": "sha256-OXamYYwyr2RHwsPmXlWr4tMxsLIbaGG/sl7QNpDZTnQ=" + "rev": "ae3283b94ed5ad5b9f77fa28187959e84d04461a", + "hash": "sha256-MSWDnlUxb/4hKMT/PMGvBUJmhJ0qfZqmGHNyIZzwHho=" }