Skip to content

Commit

Permalink
daily update
Browse files Browse the repository at this point in the history
  • Loading branch information
b-rodrigues committed Mar 10, 2025
1 parent d0fabf4 commit 5a2ae0a
Show file tree
Hide file tree
Showing 7 changed files with 8,105 additions and 5,489 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/update-cachix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: "Update cachix cache for bleeding edge"

on:
push:
branches:
- r-daily

jobs:
r-update-cachix:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v27
with:
nix_path: nixpkgs=channel:nixos-unstable

- uses: cachix/cachix-action@v15
with:
name: rstats-on-nix
# If you chose signing key for write access
# signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
# If you chose API tokens for write access OR if you have a private cache
authToken: '${{ secrets.CACHIX_AUTH }}'

- run: |
if [ "$RUNNER_OS" == "Linux" ]; then
nix-build --keep-going --max-jobs 1 --cores 2 --argstr system x86_64-linux cachix.nix
nix-build --keep-going --max-jobs 1 --cores 2 --argstr system aarch64-linux cachix.nix
else
nix-build --keep-going --max-jobs 1 --cores 2 cachix.nix
fi
- run: nix-store -qR --include-outputs $(nix-instantiate cachix.nix) | cachix push rstats-on-nix
- run: nix-shell cachix.nix --run "echo OK"
19 changes: 19 additions & 0 deletions bioc_devel.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R
index 57f55a6eb65b..10905dd10d4b 100755
--- a/pkgs/development/r-modules/generate-r-packages.R
+++ b/pkgs/development/r-modules/generate-r-packages.R
@@ -14,12 +14,8 @@ library(jsonlite)
locale <- Sys.setlocale(locale = "C")

biocVersion <- BiocManager:::.version_map()
-biocVersion <- biocVersion[biocVersion$R == getRversion()[, 1:2],c("Bioc", "BiocStatus")]
-if ("release" %in% biocVersion$BiocStatus) {
- biocVersion <- as.character(biocVersion[biocVersion$BiocStatus == "release", "Bioc"])
-} else {
- biocVersion <- max(as.character(biocVersion$Bioc))
-}
+
+biocVersion <- subset(biocVersion, BiocStatus == "devel")$Bioc

mirrorUrls <- list( bioc=paste0("http://bioconductor.org/packages/", biocVersion, "/bioc/src/contrib/")
, "bioc-annotation"=paste0("http://bioconductor.org/packages/", biocVersion, "/data/annotation/src/contrib/")
71 changes: 71 additions & 0 deletions cachix.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
let
pkgs = import (fetchTarball "https://github.com/rstats-on-nix/nixpkgs/archive/refs/heads/r-daily.tar.gz") {};
system_packages = builtins.attrValues {
inherit (pkgs) R quarto glibcLocalesUtf8 nix;
};
r_packages = builtins.attrValues {
inherit (pkgs.rPackages)
ALDEx2
Boom
cubature
FlexReg
OpenMx
VariantAnnotation
arrow
cbq
data_table
duckdb
glmmrBase
mlpack
multinma
networkscaleup
pema
psBayesborrow
qeML
rJava
readxl
rts2
s2
seqtrie
tidyverse
Rcpp
blavaan
codetools
collapse
devtools
fixest
fledge
geos
gpboost
httr
igraph
jsonlite
knitr
mikropml
quarto
rmarkdown
rstanarm
sf
stars
stringi
sys
terra
testthat
vapour;
};
wrapped_pkgs = pkgs.rstudioWrapper.override {
packages = [ r_packages ];
};
in
pkgs.mkShell {
LOCALE_ARCHIVE = if pkgs.system == "x86_64-linux" then "${pkgs.glibcLocalesUtf8}/lib/locale/locale-archive" else "";
LANG = "en_US.UTF-8";
LC_ALL = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";

buildInputs = [ system_packages r_packages wrapped_pkgs ];

}
4 changes: 2 additions & 2 deletions pkgs/applications/science/math/R/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);

stdenv.mkDerivation (finalAttrs: {
pname = "R";
version = "4.4.2";
version = "4.4.3";

src = let
inherit (finalAttrs) pname version;
in fetchurl {
url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
sha256 = "sha256-FXjNYD6NhmtYdD5J2L+ZxWnoEHm2pgzzPN973/64F+w=";
sha256 = "sha256-DZPSJEQt6iU8KwhvCI220NPP2bWSzVSW6MshQ+kPyeg=";
};

outputs = [ "out" "tex" ];
Expand Down
36 changes: 18 additions & 18 deletions pkgs/development/r-modules/bioc-experiment-packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -749,9 +749,9 @@
},
"MetaScope": {
"name": "MetaScope",
"version": "1.5.4",
"sha256": "1f69bkm7qb027pl1c1w9vlvbcw0sxi0da5az21a8i8xrz42aab57",
"depends": ["BiocFileCache", "Biostrings", "Matrix", "MultiAssayExperiment", "Rbowtie2", "Rsamtools", "S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "ggplot2", "magrittr", "readr", "rlang", "stringr", "tibble", "tidyr"]
"version": "1.6.0",
"sha256": "1f7w4dfv6sizpp97vjwm034ha4pcq93b3j0gg1l75s6ans8s89aw",
"depends": ["BiocFileCache", "Biostrings", "Matrix", "MultiAssayExperiment", "Rbowtie2", "Rsamtools", "S4Vectors", "SummarizedExperiment", "data_table", "dplyr", "ggplot2", "magrittr", "readr", "rlang", "stringr", "taxize", "tibble", "tidyr"]
},
"MethylAidData": {
"name": "MethylAidData",
Expand Down Expand Up @@ -1139,8 +1139,8 @@
},
"STexampleData": {
"name": "STexampleData",
"version": "1.14.0",
"sha256": "1n2cq1ia7vi7a2gma9mhwv34dwy0fyxmap5fycy3f8f2bnm373kw",
"version": "1.14.1",
"sha256": "14xdinp0ix55lgs0adcxwnjascrpx4s39kghrhbcpjl0ainrdhk3",
"depends": ["ExperimentHub", "SingleCellExperiment", "SpatialExperiment"]
},
"SVM2CRMdata": {
Expand Down Expand Up @@ -1319,9 +1319,9 @@
},
"TumourMethData": {
"name": "TumourMethData",
"version": "1.3.0",
"sha256": "01xbsi6x4bafkp0m5xi4l2w62067xnfqnlkaz59ng1hf2ld2p690",
"depends": ["ExperimentHub", "GenomicRanges", "HDF5Array", "R_utils", "SummarizedExperiment", "rhdf5"]
"version": "1.4.0",
"sha256": "14y58qa4khi4jdymilxrb6x57br1gjclw2q3n9mivjrj6z3r3nmw",
"depends": ["BSgenome_Hsapiens_UCSC_hg19", "ExperimentHub", "ExperimentHubData", "GenomicRanges", "HDF5Array", "R_utils", "SummarizedExperiment", "TCGAutils", "dplyr", "knitr", "methrix", "openxlsx", "readr", "rhdf5", "rmarkdown", "stringr", "tibble", "usethis", "xlsx"]
},
"VariantToolsData": {
"name": "VariantToolsData",
Expand Down Expand Up @@ -1739,9 +1739,9 @@
},
"etec16s": {
"name": "etec16s",
"version": "1.33.0",
"sha256": "1xbj8z68006riah51lpk0bh8hq240wl9n1inlss84yj6kn4y5m0w",
"depends": ["Biobase"]
"version": "1.34.0",
"sha256": "114jmrnjm2xpfzx1m10bn73fy1am209c70ws4jwfggrbavg6xp8j",
"depends": ["Biobase", "metagenomeSeq"]
},
"ewceData": {
"name": "ewceData",
Expand Down Expand Up @@ -1817,8 +1817,8 @@
},
"gDRtestData": {
"name": "gDRtestData",
"version": "1.4.0",
"sha256": "1qqk9x8i2g5284p60hxznl95b6sp80qksx4qq724ycmknayg3kxb",
"version": "1.4.1",
"sha256": "0ybp2zrkjivrfl62zz7jljs1inlnx3iybwazyh0rxb255r9cg9ns",
"depends": ["checkmate", "data_table"]
},
"gageData": {
Expand Down Expand Up @@ -2117,9 +2117,9 @@
},
"msd16s": {
"name": "msd16s",
"version": "1.25.0",
"sha256": "0lzcpwf9rhr8i80hn3dab0fpgx7qmy0q9l8j7fkrazq2paiiikj7",
"depends": ["Biobase"]
"version": "1.26.0",
"sha256": "0wg705d0232d4916d3b84q62pdrzmf8v3k9apyh4fsmg4pk2xw6p",
"depends": ["Biobase", "metagenomeSeq"]
},
"msdata": {
"name": "msdata",
Expand Down Expand Up @@ -2207,8 +2207,8 @@
},
"pRolocdata": {
"name": "pRolocdata",
"version": "1.44.0",
"sha256": "0dh5zgwr248gnlygja7ly66dyhh4b4xf72n9ycp0xa02xdl0mwi3",
"version": "1.44.1",
"sha256": "01n9p4a02lq96rhz97skzs79mvnki3vqyn3b4b89vhrp8idgmli0",
"depends": ["Biobase", "MSnbase"]
},
"parathyroidSE": {
Expand Down
Loading

0 comments on commit 5a2ae0a

Please sign in to comment.