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/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 = { 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;}); 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 - ; - }; -} 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')) diff --git a/versions/httpgd.json b/versions/httpgd.json index e363b12..9ab3a41 100644 --- a/versions/httpgd.json +++ b/versions/httpgd.json @@ -1,6 +1,6 @@ { "owner": "nx10", "repo": "httpgd", - "rev": "41a0372b35d18c9f40694be2a0a1ea6c64bab06f", - "hash": "sha256-IYkIO28WDfNtUUJqK8vwo8Qd34W5OAD+7AUSzojTBXY=" + "rev": "44ed9b5f2d3abce9095122361d31d630a550022a", + "hash": "sha256-GBxhxoF329IbFcGGfsUUGm3Y+DvM0PVWvJzc3eJgaNU=" }