From fe5868d574d2adfdd11bea12f92970ab8589a62a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 19 Jan 2026 05:02:40 +0000 Subject: [PATCH 01/22] Initial plan From c46bc7dea507a764db46f0b3d7bc95deb7d51808 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Mon, 9 Feb 2026 16:51:27 +1100 Subject: [PATCH 02/22] added jgd --- flake.nix | 25 +++++++++++++++++++++++++ packages/default.nix | 26 +++++++++++++++----------- packages/j/jgd.nix | 25 +++++++++++++++++++++++++ test/test.R | 10 +++++++--- versions/default.nix | 1 + versions/jgd.json | 6 ++++++ 6 files changed, 79 insertions(+), 14 deletions(-) create mode 100644 packages/j/jgd.nix create mode 100644 versions/jgd.json diff --git a/flake.nix b/flake.nix index 880b358..48a3f86 100644 --- a/flake.nix +++ b/flake.nix @@ -78,9 +78,34 @@ franUpdate ]; }; + newpkg = pkgs.mkShell { + nativeBuildInputs = [ + pkgs.nix-prefetch-github + ]; + }; + } + ); + + checks = forAllSystems ( + system: let + pkgs = import nixpkgs { + inherit system; + overlays = [self.overlays.default]; + }; + rEnv = mkR { + inherit pkgs; + packages = builtins.attrValues pkgs.extraRPackages; + }; + in { + test-script = pkgs.runCommand "test-script" {} '' + mkdir -p $out + cp ${./test/test.R} test.R + ${rEnv}/bin/Rscript test.R > $out/result.log + ''; } ); }; + nixConfig = { extra-substituters = [ "https://rstats-on-nix.cachix.org" diff --git a/packages/default.nix b/packages/default.nix index be7a47e..cc02591 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,33 +1,37 @@ { final, prev, -}: -let +}: let # Shared helper function to fetch from GitHub using JSON version files fetchfromGitHubJSONFile = path: prev.fetchFromGitHub (builtins.fromJSON (builtins.readFile path)); - + # Reference to the versions directory at the repo root versionsDir = ../versions; - + # Common arguments passed to package modules that don't need 'final' baseArgs = { inherit prev fetchfromGitHubJSONFile versionsDir; }; - + # Arguments for packages that need access to 'final' (for cross-package dependencies) - argsWithFinal = baseArgs // { - inherit final; - }; + argsWithFinal = + baseArgs + // { + inherit final; + }; in { ## F fwildclusterboot = import ./f/fwildclusterboot.nix argsWithFinal; - + ## H httpgd = import ./h/httpgd.nix baseArgs; - + + ## J + jgd = import ./j/jgd.nix (baseArgs // {lib = prev.lib;}); + ## M musicMetadata = import ./m/musicMetadata.nix baseArgs; - + ## S summclust = import ./s/summclust.nix baseArgs; synthdid = import ./s/synthdid.nix baseArgs; diff --git a/packages/j/jgd.nix b/packages/j/jgd.nix new file mode 100644 index 0000000..46b2dcd --- /dev/null +++ b/packages/j/jgd.nix @@ -0,0 +1,25 @@ +{ + lib, + prev, + fetchfromGitHubJSONFile, + versionsDir, +}: let + repoSrc = fetchfromGitHubJSONFile "${versionsDir}/jgd.json"; + + rPkgSrc = lib.cleanSourceWith { + src = repoSrc; + filter = path: type: let + p = toString path; + in + # keep r-pkg/ and everything under it + (lib.hasPrefix (toString repoSrc + "/r-pkg") p); + }; +in + prev.rPackages.buildRPackage { + name = "jgd"; + src = rPkgSrc; + sourceRoot = "source/r-pkg"; + nativeBuildInputs = [ + prev.pkg-config + ]; + } diff --git a/test/test.R b/test/test.R index 77c0a61..864884d 100644 --- a/test/test.R +++ b/test/test.R @@ -1,13 +1,17 @@ cat("Testing\n") +cat("\n============================================================ jgd =========================================================================\n") +library(jgd) +jgd() + cat("\n============================================================ fwildclusterboot ============================================================\n") library(fwildclusterboot) data(voters) lm_fit <- lm( - proposition_vote ~ treatment + ideology1 + log_income + Q1_immigration , + proposition_vote ~ treatment + ideology1 + log_income + Q1_immigration , data = voters ) boot_lm <- boottest( - lm_fit, + lm_fit, clustid = "group_id1", param = "treatment", B = 999 @@ -21,7 +25,7 @@ boot_lmjl <- boottest( ) #setBoottest_engine("WildBootTests.jl") boot_lmjl2 <- boottest( - lm_fit, + lm_fit, clustid = "group_id1", param = "treatment", B = 999 diff --git a/versions/default.nix b/versions/default.nix index faa6d1a..62fc86a 100644 --- a/versions/default.nix +++ b/versions/default.nix @@ -1,5 +1,6 @@ pkgs: '' pg=${pkgs.nix-prefetch-github}/bin/nix-prefetch-github + $pg --json grantmcdermott jgd > versions/jgd.json $pg --json hannesdatta musicMetadata > versions/musicMetadata.json $pg --json nx10 httpgd > versions/httpgd.json $pg --json s3alfisc fwildclusterboot > versions/fwildclusterboot.json diff --git a/versions/jgd.json b/versions/jgd.json new file mode 100644 index 0000000..9ac93b2 --- /dev/null +++ b/versions/jgd.json @@ -0,0 +1,6 @@ +{ + "owner": "grantmcdermott", + "repo": "jgd", + "rev": "ec39bb7f9cf56727d4c47990bca02cd3256efcfc", + "hash": "sha256-ceJUPVRPZMwIeth7gfv8ULXAEzeQ2KRoqEhtp5rIGrw=" +} From a10f4dee0ee2020e91a8b845deabb21d17f5b76c Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 9 Feb 2026 16:57:58 +1100 Subject: [PATCH 03/22] Update rixpkgs URL to use dynamic version --- versions/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/versions/default.nix b/versions/default.nix index 62fc86a..ed6d9f7 100644 --- a/versions/default.nix +++ b/versions/default.nix @@ -6,4 +6,6 @@ pkgs: '' $pg --json s3alfisc fwildclusterboot > versions/fwildclusterboot.json $pg --json s3alfisc summclust > versions/summclust.json $pg --json synth-inference synthdid > versions/synthdid.json + RVER=$( wget -qO- 'https://raw.githubusercontent.com/ropensci/rix/refs/heads/main/inst/extdata/available_df.csv' | tail -n 1 | head -n 1 | cut -d',' -f4 | tr -d '"' ) + pkgs.sed -i "s|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\";|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/$RVER\";|" ../flake.nix '' From 08bd0188f9bec64bb97fb92bdc34031cacb1850f Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 9 Feb 2026 17:00:47 +1100 Subject: [PATCH 04/22] Update default.nix --- versions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/default.nix b/versions/default.nix index ed6d9f7..598ef49 100644 --- a/versions/default.nix +++ b/versions/default.nix @@ -7,5 +7,5 @@ pkgs: '' $pg --json s3alfisc summclust > versions/summclust.json $pg --json synth-inference synthdid > versions/synthdid.json RVER=$( wget -qO- 'https://raw.githubusercontent.com/ropensci/rix/refs/heads/main/inst/extdata/available_df.csv' | tail -n 1 | head -n 1 | cut -d',' -f4 | tr -d '"' ) - pkgs.sed -i "s|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\";|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/$RVER\";|" ../flake.nix + ${pkgs.sed}/bin/sed -i "s|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\";|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/$RVER\";|" ../flake.nix '' From 07f6d703c788b253e13b062784bb244e468bee44 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 9 Feb 2026 17:12:18 +1100 Subject: [PATCH 05/22] Fix sed command syntax for URL update --- versions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/default.nix b/versions/default.nix index 598ef49..cec52ce 100644 --- a/versions/default.nix +++ b/versions/default.nix @@ -7,5 +7,5 @@ pkgs: '' $pg --json s3alfisc summclust > versions/summclust.json $pg --json synth-inference synthdid > versions/synthdid.json RVER=$( wget -qO- 'https://raw.githubusercontent.com/ropensci/rix/refs/heads/main/inst/extdata/available_df.csv' | tail -n 1 | head -n 1 | cut -d',' -f4 | tr -d '"' ) - ${pkgs.sed}/bin/sed -i "s|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\";|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/$RVER\";|" ../flake.nix + sed -i "s|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\";|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/$RVER\";|" ../flake.nix '' From 0a17a7c87daaf9b272602489a0e32dfd462f3d5f Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 9 Feb 2026 17:19:14 +1100 Subject: [PATCH 06/22] Update sed command to use pkgs.gnused --- versions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/default.nix b/versions/default.nix index cec52ce..fb3bade 100644 --- a/versions/default.nix +++ b/versions/default.nix @@ -7,5 +7,5 @@ pkgs: '' $pg --json s3alfisc summclust > versions/summclust.json $pg --json synth-inference synthdid > versions/synthdid.json RVER=$( wget -qO- 'https://raw.githubusercontent.com/ropensci/rix/refs/heads/main/inst/extdata/available_df.csv' | tail -n 1 | head -n 1 | cut -d',' -f4 | tr -d '"' ) - sed -i "s|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\";|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/$RVER\";|" ../flake.nix + ${pkgs.gnused}/bin/sed -i "s|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\";|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/$RVER\";|" ../flake.nix '' From aad022233657bf8c90e10eb0bc9c31320c5ee5e1 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 9 Feb 2026 17:24:08 +1100 Subject: [PATCH 07/22] Fix sed command path in default.nix --- versions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/default.nix b/versions/default.nix index fb3bade..35d028b 100644 --- a/versions/default.nix +++ b/versions/default.nix @@ -7,5 +7,5 @@ pkgs: '' $pg --json s3alfisc summclust > versions/summclust.json $pg --json synth-inference synthdid > versions/synthdid.json RVER=$( wget -qO- 'https://raw.githubusercontent.com/ropensci/rix/refs/heads/main/inst/extdata/available_df.csv' | tail -n 1 | head -n 1 | cut -d',' -f4 | tr -d '"' ) - ${pkgs.gnused}/bin/sed -i "s|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\";|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/$RVER\";|" ../flake.nix + ${pkgs.gnused}/bin/sed -i "s|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\";|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/$RVER\";|" flake.nix '' From 50f453458965f1b7d66818928cb600846e8be8f4 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 9 Feb 2026 17:27:50 +1100 Subject: [PATCH 08/22] Update URL pattern for nixpkgs in default.nix --- versions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/default.nix b/versions/default.nix index 35d028b..3fcc8ea 100644 --- a/versions/default.nix +++ b/versions/default.nix @@ -7,5 +7,5 @@ pkgs: '' $pg --json s3alfisc summclust > versions/summclust.json $pg --json synth-inference synthdid > versions/synthdid.json RVER=$( wget -qO- 'https://raw.githubusercontent.com/ropensci/rix/refs/heads/main/inst/extdata/available_df.csv' | tail -n 1 | head -n 1 | cut -d',' -f4 | tr -d '"' ) - ${pkgs.gnused}/bin/sed -i "s|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\";|rixpkgs.url = \"github:rstats-on-nix/nixpkgs/$RVER\";|" flake.nix + ${pkgs.gnused}/bin/sed -i "s|nixpkgs.url = \"github:rstats-on-nix/nixpkgs/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\";|nixpkgs.url = \"github:rstats-on-nix/nixpkgs/$RVER\";|" flake.nix '' From 1ca4fd632d37c392eb88b076e084dea7116f5725 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 9 Feb 2026 06:29:41 +0000 Subject: [PATCH 09/22] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:rstats-on-nix/nixpkgs/b37b595' (2025-11-10) → 'github:rstats-on-nix/nixpkgs/0d3fe7a' (2026-02-02) --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index e70081d..58d0832 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1762778295, - "narHash": "sha256-5Ogu11rMpc3ytcfBLwO3O1l1MJl0pTT+uCz/OJixmVo=", + "lastModified": 1770035835, + "narHash": "sha256-Pi8f3LPTFmG7SZeAJEAamOWly1SZhEofT92uBqS4atY=", "owner": "rstats-on-nix", "repo": "nixpkgs", - "rev": "b37b5950aa970ed7abe27144f2ca62e6029215e5", + "rev": "0d3fe7afce51d2126fdccf0b717d8048b90e4781", "type": "github" }, "original": { "owner": "rstats-on-nix", - "ref": "2025-11-10", + "ref": "2026-02-02", "repo": "nixpkgs", "type": "github" } From 82019305591d8eaa1726571006f9ac030d9a99a2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 9 Feb 2026 06:29:41 +0000 Subject: [PATCH 10/22] [create-pull-request] automated change --- flake.nix | 2 +- versions/jgd.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 48a3f86..c51b947 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "FRAN - The Flakey R Archiving Network"; inputs = { - nixpkgs.url = "github:rstats-on-nix/nixpkgs/2025-11-10"; + nixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-02-02"; }; outputs = { diff --git a/versions/jgd.json b/versions/jgd.json index 9ac93b2..ddf26fa 100644 --- a/versions/jgd.json +++ b/versions/jgd.json @@ -1,6 +1,6 @@ { "owner": "grantmcdermott", "repo": "jgd", - "rev": "ec39bb7f9cf56727d4c47990bca02cd3256efcfc", - "hash": "sha256-ceJUPVRPZMwIeth7gfv8ULXAEzeQ2KRoqEhtp5rIGrw=" + "rev": "4c341e074be50b253b055f57d5bff3b25ab4c80a", + "hash": "sha256-t2R4TCvrpxpdrS4mfmmwS6vkLMQIU/kyThCSYlcBHfQ=" } From cd137a6bf870cbe74fb3aa83fa8111843d0abe08 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 10 Feb 2026 05:05:20 +0000 Subject: [PATCH 11/22] [create-pull-request] automated change --- versions/jgd.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/jgd.json b/versions/jgd.json index ddf26fa..76ec545 100644 --- a/versions/jgd.json +++ b/versions/jgd.json @@ -1,6 +1,6 @@ { "owner": "grantmcdermott", "repo": "jgd", - "rev": "4c341e074be50b253b055f57d5bff3b25ab4c80a", - "hash": "sha256-t2R4TCvrpxpdrS4mfmmwS6vkLMQIU/kyThCSYlcBHfQ=" + "rev": "00edbde05ffba229c8eefd22da43ae973cbf6cf3", + "hash": "sha256-e2ejR9Qf8Jb7N6oQEfL1IhNb3r9Yp8bbTbC6Prvs5I0=" } From 2cd2f13dca00a6a22d758d69a9aa55542c920146 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 15 Feb 2026 04:55:25 +0000 Subject: [PATCH 12/22] [create-pull-request] automated change --- versions/jgd.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/jgd.json b/versions/jgd.json index 76ec545..5657417 100644 --- a/versions/jgd.json +++ b/versions/jgd.json @@ -1,6 +1,6 @@ { "owner": "grantmcdermott", "repo": "jgd", - "rev": "00edbde05ffba229c8eefd22da43ae973cbf6cf3", - "hash": "sha256-e2ejR9Qf8Jb7N6oQEfL1IhNb3r9Yp8bbTbC6Prvs5I0=" + "rev": "f4ec174c689cae0683fafbb685af5a47eb49a403", + "hash": "sha256-GVVr9MpYIq2+87xtUo+GnC1+Zzw+zOGPaLu/vLfpTUU=" } From f727b934898641abe0fd5f3732ef5b50c8410fff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 18 Feb 2026 04:55:41 +0000 Subject: [PATCH 13/22] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:rstats-on-nix/nixpkgs/0d3fe7a' (2026-02-02) → 'github:rstats-on-nix/nixpkgs/b56df64' (2026-02-16) --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 58d0832..82d8765 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1770035835, - "narHash": "sha256-Pi8f3LPTFmG7SZeAJEAamOWly1SZhEofT92uBqS4atY=", + "lastModified": 1771246459, + "narHash": "sha256-r93GMW+p1/jjgaDU9Dadvo2lOcj6a8oza6QayP5ojYk=", "owner": "rstats-on-nix", "repo": "nixpkgs", - "rev": "0d3fe7afce51d2126fdccf0b717d8048b90e4781", + "rev": "b56df64c453105d8e4ebaa0cefd7acd357685fb0", "type": "github" }, "original": { "owner": "rstats-on-nix", - "ref": "2026-02-02", + "ref": "2026-02-16", "repo": "nixpkgs", "type": "github" } From 0be58feb00431b2a7853a74198ecd1b956aa3b3e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 18 Feb 2026 04:55:42 +0000 Subject: [PATCH 14/22] [create-pull-request] automated change --- flake.nix | 2 +- versions/httpgd.json | 4 ++-- versions/jgd.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index c51b947..caa84d8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "FRAN - The Flakey R Archiving Network"; inputs = { - nixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-02-02"; + nixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-02-16"; }; outputs = { diff --git a/versions/httpgd.json b/versions/httpgd.json index ad2940b..e363b12 100644 --- a/versions/httpgd.json +++ b/versions/httpgd.json @@ -1,6 +1,6 @@ { "owner": "nx10", "repo": "httpgd", - "rev": "dd6ed3a687a2d7327bb28ca46725a0a203eb2a19", - "hash": "sha256-vs6MTdVJXhTdzPXKqQR+qu1KbhF+vfyzZXIrFsuKMtU=" + "rev": "41a0372b35d18c9f40694be2a0a1ea6c64bab06f", + "hash": "sha256-IYkIO28WDfNtUUJqK8vwo8Qd34W5OAD+7AUSzojTBXY=" } diff --git a/versions/jgd.json b/versions/jgd.json index 5657417..3a7dbf6 100644 --- a/versions/jgd.json +++ b/versions/jgd.json @@ -1,6 +1,6 @@ { "owner": "grantmcdermott", "repo": "jgd", - "rev": "f4ec174c689cae0683fafbb685af5a47eb49a403", - "hash": "sha256-GVVr9MpYIq2+87xtUo+GnC1+Zzw+zOGPaLu/vLfpTUU=" + "rev": "e51385ed656618ed3d2611c0ccc1feff22bf4e11", + "hash": "sha256-rWn8DVvH7JapCs1i0jQQQsWm00JPNUolVygcfDsSV1k=" } From 66042039169900bac676dba71b00881981e3e722 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 19 Feb 2026 11:50:27 +1100 Subject: [PATCH 15/22] Remove httpgd import from default.nix Removed the import of httpgd from default.nix. https://github.com/nx10/httpgd/issues/218 --- packages/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/default.nix b/packages/default.nix index cc02591..2e170f5 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -23,9 +23,6 @@ in { ## F fwildclusterboot = import ./f/fwildclusterboot.nix argsWithFinal; - ## H - httpgd = import ./h/httpgd.nix baseArgs; - ## J jgd = import ./j/jgd.nix (baseArgs // {lib = prev.lib;}); From 1c9f2ad30598a5bdcfe34cd91782bb8e5191bdb2 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 19 Feb 2026 11:50:44 +1100 Subject: [PATCH 16/22] Delete packages/h/httpgd.nix --- packages/h/httpgd.nix | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 packages/h/httpgd.nix diff --git a/packages/h/httpgd.nix b/packages/h/httpgd.nix deleted file mode 100644 index 75e9f6f..0000000 --- a/packages/h/httpgd.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - prev, - fetchfromGitHubJSONFile, - versionsDir, -}: -prev.rPackages.buildRPackage { - name = "httpgd"; - src = fetchfromGitHubJSONFile "${versionsDir}/httpgd.json"; - propagatedBuildInputs = builtins.attrValues { - inherit - (prev.rPackages) - unigd - cpp11 - AsioHeaders - ; - }; -} From 28c3c6f7c3ff3e21c9698b984e7cbd1d18d6a4bc Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 19 Feb 2026 11:51:01 +1100 Subject: [PATCH 17/22] Delete versions/httpgd.json --- versions/httpgd.json | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 versions/httpgd.json diff --git a/versions/httpgd.json b/versions/httpgd.json deleted file mode 100644 index e363b12..0000000 --- a/versions/httpgd.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "owner": "nx10", - "repo": "httpgd", - "rev": "41a0372b35d18c9f40694be2a0a1ea6c64bab06f", - "hash": "sha256-IYkIO28WDfNtUUJqK8vwo8Qd34W5OAD+7AUSzojTBXY=" -} From fcd953634a56f322288612231f8ee98f9d3d2a44 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 19 Feb 2026 11:51:45 +1100 Subject: [PATCH 18/22] Remove httpgd library and associated calls Removed httpgd library usage and related code. --- test/test.R | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/test.R b/test/test.R index 864884d..d91e0df 100644 --- a/test/test.R +++ b/test/test.R @@ -34,10 +34,6 @@ summary(boot_lm) summary(boot_lmjl) summary(boot_lmjl2) -cat("\n============================================================ httpgd ============================================================\n") -library(httpgd) -hgd() - cat("\n============================================================ musicMetadata ============================================================\n") library(musicMetadata) print(classify_labels('Interscope')) From 7b8fbbcd0c55df98795a9e34621e6224b6713b5b Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 19 Feb 2026 11:52:31 +1100 Subject: [PATCH 19/22] Update nixpkgs input URL in flake.nix --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index caa84d8..92df630 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "FRAN - The Flakey R Archiving Network"; inputs = { - nixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-02-16"; + nixpkgs.url = "github:dwinkler1/rixpkgs/nixpkgs"; }; outputs = { From c59cb699e9547bca045a9ffbd777a212aaea084b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Mar 2026 13:46:54 +0000 Subject: [PATCH 20/22] Bump cachix/cachix-action from 16 to 17 Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 16 to 17. - [Release notes](https://github.com/cachix/cachix-action/releases) - [Commits](https://github.com/cachix/cachix-action/compare/v16...v17) --- updated-dependencies: - dependency-name: cachix/cachix-action dependency-version: '17' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 585d168..fdba51e 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -23,7 +23,7 @@ jobs: - uses: DeterminateSystems/nix-installer-action@main with: github-token: ${{ secrets.GITHUB_TOKEN }} - - uses: cachix/cachix-action@v16 + - uses: cachix/cachix-action@v17 with: name: rde authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' From c58da190e5612b826f9ad5ca4f52c3ecd80faa61 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 2 Apr 2026 05:04:45 +0000 Subject: [PATCH 21/22] [create-pull-request] automated change --- flake.lock | 16 ++++++++-------- versions/httpgd.json | 6 ++++++ versions/jgd.json | 4 ++-- 3 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 versions/httpgd.json diff --git a/flake.lock b/flake.lock index 82d8765..5621db6 100644 --- a/flake.lock +++ b/flake.lock @@ -2,17 +2,17 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1771246459, - "narHash": "sha256-r93GMW+p1/jjgaDU9Dadvo2lOcj6a8oza6QayP5ojYk=", - "owner": "rstats-on-nix", - "repo": "nixpkgs", - "rev": "b56df64c453105d8e4ebaa0cefd7acd357685fb0", + "lastModified": 1771303851, + "narHash": "sha256-tgveHozOJ2D/mi3LxVy/FcmLFDlM5XKZxsNB2XpvzaM=", + "owner": "dwinkler1", + "repo": "rixpkgs", + "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e", "type": "github" }, "original": { - "owner": "rstats-on-nix", - "ref": "2026-02-16", - "repo": "nixpkgs", + "owner": "dwinkler1", + "ref": "nixpkgs", + "repo": "rixpkgs", "type": "github" } }, diff --git a/versions/httpgd.json b/versions/httpgd.json new file mode 100644 index 0000000..7157733 --- /dev/null +++ b/versions/httpgd.json @@ -0,0 +1,6 @@ +{ + "owner": "nx10", + "repo": "httpgd", + "rev": "087ebf5bbf46ddc52e107d6a8bb26381177d2e7f", + "hash": "sha256-aEhrcWmDaqZn+fBHX/9/9VyJhYeHQKSSLaxeMQhzApA=" +} diff --git a/versions/jgd.json b/versions/jgd.json index 3a7dbf6..6281601 100644 --- a/versions/jgd.json +++ b/versions/jgd.json @@ -1,6 +1,6 @@ { "owner": "grantmcdermott", "repo": "jgd", - "rev": "e51385ed656618ed3d2611c0ccc1feff22bf4e11", - "hash": "sha256-rWn8DVvH7JapCs1i0jQQQsWm00JPNUolVygcfDsSV1k=" + "rev": "6a7b81cf22361366960f619fbbf46f893ab7583b", + "hash": "sha256-OXamYYwyr2RHwsPmXlWr4tMxsLIbaGG/sl7QNpDZTnQ=" } From da09626e4dd8f0f57078b3a04e0443a8c20defa1 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 17 Apr 2026 18:13:04 +1000 Subject: [PATCH 22/22] Refactor R package dependencies in flake.nix --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 92df630..d71b0de 100644 --- a/flake.nix +++ b/flake.nix @@ -37,10 +37,10 @@ # The overlay that exposes custom R packages overlay = final: prev: { - extraRPackageDeps = { + franPackageDeps = { julia-fwildclusterboot = prev.julia-bin.withPackages ["WildBootTests" "StableRNGs"]; }; - extraRPackages = import ./packages {inherit final prev;}; + franPackages = import ./packages {inherit final prev;}; }; in { # Helper to install R with system dependencies if required