Compare commits

..

24 commits

Author SHA1 Message Date
7b8fbbcd0c
Update nixpkgs input URL in flake.nix 2026-02-19 11:52:31 +11:00
fcd953634a
Remove httpgd library and associated calls
Removed httpgd library usage and related code.
2026-02-19 11:51:45 +11:00
28c3c6f7c3
Delete versions/httpgd.json 2026-02-19 11:51:01 +11:00
1c9f2ad305
Delete packages/h/httpgd.nix 2026-02-19 11:50:44 +11:00
6604203916
Remove httpgd import from default.nix
Removed the import of httpgd from default.nix.

https://github.com/nx10/httpgd/issues/218
2026-02-19 11:50:27 +11:00
7823af6051
Merge pull request #30 from dwinkler1/update_fran
Update FRAN flake.lock
2026-02-18 18:35:06 +11:00
github-actions[bot]
0be58feb00 [create-pull-request] automated change 2026-02-18 04:55:42 +00:00
github-actions[bot]
f727b93489 flake.lock: Update
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)
2026-02-18 04:55:41 +00:00
68b189ab98
Merge pull request #29 from dwinkler1/update_fran 2026-02-15 16:30:55 +11:00
github-actions[bot]
2cd2f13dca [create-pull-request] automated change 2026-02-15 04:55:25 +00:00
c5c7f360c7
Merge pull request #28 from dwinkler1/update_fran
Update FRAN flake.lock
2026-02-11 07:02:16 +11:00
github-actions[bot]
cd137a6bf8 [create-pull-request] automated change 2026-02-10 05:05:20 +00:00
48088fc1f3
Merge pull request #27 from dwinkler1/update_fran
Update FRAN flake.lock
2026-02-09 18:08:40 +11:00
github-actions[bot]
8201930559 [create-pull-request] automated change 2026-02-09 06:29:41 +00:00
github-actions[bot]
1ca4fd632d flake.lock: Update
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)
2026-02-09 06:29:41 +00:00
50f4534589
Update URL pattern for nixpkgs in default.nix 2026-02-09 17:27:50 +11:00
aad0222336
Fix sed command path in default.nix 2026-02-09 17:24:08 +11:00
0a17a7c87d
Update sed command to use pkgs.gnused 2026-02-09 17:19:14 +11:00
07f6d703c7
Fix sed command syntax for URL update 2026-02-09 17:12:18 +11:00
08bd0188f9
Update default.nix 2026-02-09 17:00:47 +11:00
a10f4dee0e
Update rixpkgs URL to use dynamic version 2026-02-09 16:57:58 +11:00
c46bc7dea5 added jgd 2026-02-09 16:52:44 +11:00
copilot-swe-agent[bot]
fe5868d574 Initial plan 2026-02-09 16:52:44 +11:00
a387931751
Merge pull request #26 from dwinkler1/copilot/refactor-package-modules-structure
Refactor R packages into modular structure with alphabetic subdirectories
2026-01-19 16:53:26 +11:00
9 changed files with 85 additions and 48 deletions

8
flake.lock generated
View file

@ -2,16 +2,16 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1762778295,
"narHash": "sha256-5Ogu11rMpc3ytcfBLwO3O1l1MJl0pTT+uCz/OJixmVo=",
"lastModified": 1771246459,
"narHash": "sha256-r93GMW+p1/jjgaDU9Dadvo2lOcj6a8oza6QayP5ojYk=",
"owner": "rstats-on-nix",
"repo": "nixpkgs",
"rev": "b37b5950aa970ed7abe27144f2ca62e6029215e5",
"rev": "b56df64c453105d8e4ebaa0cefd7acd357685fb0",
"type": "github"
},
"original": {
"owner": "rstats-on-nix",
"ref": "2025-11-10",
"ref": "2026-02-16",
"repo": "nixpkgs",
"type": "github"
}

View file

@ -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:dwinkler1/rixpkgs/nixpkgs";
};
outputs = {
@ -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"

View file

@ -1,8 +1,7 @@
{
final,
prev,
}:
let
}: let
# Shared helper function to fetch from GitHub using JSON version files
fetchfromGitHubJSONFile = path: prev.fetchFromGitHub (builtins.fromJSON (builtins.readFile path));
@ -15,15 +14,17 @@ let
};
# Arguments for packages that need access to 'final' (for cross-package dependencies)
argsWithFinal = baseArgs // {
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;

View file

@ -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
;
};
}

25
packages/j/jgd.nix Normal file
View file

@ -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
];
}

View file

@ -1,4 +1,8 @@
cat("Testing\n")
cat("\n============================================================ jgd =========================================================================\n")
library(jgd)
jgd()
cat("\n============================================================ fwildclusterboot ============================================================\n")
library(fwildclusterboot)
data(voters)
@ -30,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'))

View file

@ -1,8 +1,11 @@
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
$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|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
''

View file

@ -1,6 +0,0 @@
{
"owner": "nx10",
"repo": "httpgd",
"rev": "dd6ed3a687a2d7327bb28ca46725a0a203eb2a19",
"hash": "sha256-vs6MTdVJXhTdzPXKqQR+qu1KbhF+vfyzZXIrFsuKMtU="
}

6
versions/jgd.json Normal file
View file

@ -0,0 +1,6 @@
{
"owner": "grantmcdermott",
"repo": "jgd",
"rev": "e51385ed656618ed3d2611c0ccc1feff22bf4e11",
"hash": "sha256-rWn8DVvH7JapCs1i0jQQQsWm00JPNUolVygcfDsSV1k="
}