diff --git a/flake.lock b/flake.lock index 5621db6..82d8765 100644 --- a/flake.lock +++ b/flake.lock @@ -2,17 +2,17 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1771303851, - "narHash": "sha256-tgveHozOJ2D/mi3LxVy/FcmLFDlM5XKZxsNB2XpvzaM=", - "owner": "dwinkler1", - "repo": "rixpkgs", - "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e", + "lastModified": 1771246459, + "narHash": "sha256-r93GMW+p1/jjgaDU9Dadvo2lOcj6a8oza6QayP5ojYk=", + "owner": "rstats-on-nix", + "repo": "nixpkgs", + "rev": "b56df64c453105d8e4ebaa0cefd7acd357685fb0", "type": "github" }, "original": { - "owner": "dwinkler1", - "ref": "nixpkgs", - "repo": "rixpkgs", + "owner": "rstats-on-nix", + "ref": "2026-02-16", + "repo": "nixpkgs", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 92df630..caa84d8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "FRAN - The Flakey R Archiving Network"; inputs = { - nixpkgs.url = "github:dwinkler1/rixpkgs/nixpkgs"; + nixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-02-16"; }; outputs = { diff --git a/packages/default.nix b/packages/default.nix index 2e170f5..cc02591 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -23,6 +23,9 @@ 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;}); diff --git a/packages/h/httpgd.nix b/packages/h/httpgd.nix new file mode 100644 index 0000000..75e9f6f --- /dev/null +++ b/packages/h/httpgd.nix @@ -0,0 +1,17 @@ +{ + prev, + fetchfromGitHubJSONFile, + versionsDir, +}: +prev.rPackages.buildRPackage { + name = "httpgd"; + src = fetchfromGitHubJSONFile "${versionsDir}/httpgd.json"; + propagatedBuildInputs = builtins.attrValues { + inherit + (prev.rPackages) + unigd + cpp11 + AsioHeaders + ; + }; +} diff --git a/test/test.R b/test/test.R index d91e0df..864884d 100644 --- a/test/test.R +++ b/test/test.R @@ -34,6 +34,10 @@ 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')) diff --git a/versions/httpgd.json b/versions/httpgd.json index 9ab3a41..e363b12 100644 --- a/versions/httpgd.json +++ b/versions/httpgd.json @@ -1,6 +1,6 @@ { "owner": "nx10", "repo": "httpgd", - "rev": "44ed9b5f2d3abce9095122361d31d630a550022a", - "hash": "sha256-GBxhxoF329IbFcGGfsUUGm3Y+DvM0PVWvJzc3eJgaNU=" + "rev": "41a0372b35d18c9f40694be2a0a1ea6c64bab06f", + "hash": "sha256-IYkIO28WDfNtUUJqK8vwo8Qd34W5OAD+7AUSzojTBXY=" }