Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rPackages.immunotation: cache external URLs #303724

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions pkgs/development/r-modules/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1318,6 +1318,36 @@ let
buildInputs = [ cacert ] ++ attrs.buildInputs;
});


immunotation = let
MHC41alleleList = fetchurl {
url = "https://services.healthtech.dtu.dk/services/NetMHCpan-4.1/allele.list";
hash = "sha256-CRZ+0uHzcq5zK5eONucAChXIXO8tnq5sSEAS80Z7jhg=";
};

MHCII40alleleList = fetchurl {
url = "https://services.healthtech.dtu.dk/services/NetMHCIIpan-4.0/alleles_name.list";
hash = "sha256-K4Ic2NUs3P4IkvOODwZ0c4Yh8caex5Ih0uO5jXRHp40=";
};

validGeographics = fetchurl {
url = "http://www.allelefrequencies.net/hla6006a.asp?";
hash = "sha256-QoCWjQOgDSNlrvzWmxJbYcInUBF7dCHJ7WhTrZMtdfg=";
};
in old.immunotation.overrideAttrs (attrs: {
patches = [ ./patches/immunotation.patch ];
postPatch = ''
substituteInPlace "R/external_resources_input.R" --replace-fail \
"nix-NetMHCpan-4.1-allele-list" ${MHC41alleleList}

substituteInPlace "R/external_resources_input.R" --replace-fail \
"nix-NETMHCIIpan-4.0-alleles-name-list" ${MHCII40alleleList}

substituteInPlace "R/AFND_interface.R" --replace-fail \
"nix-valid-geographics" ${validGeographics}
'';
});

rstan = old.rstan.overrideAttrs (attrs: {
env = (attrs.env or { }) // {
NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -DBOOST_PHOENIX_NO_VARIADIC_EXPRESSION";
Expand Down
47 changes: 47 additions & 0 deletions pkgs/development/r-modules/patches/immunotation.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
diff --git a/R/AFND_interface.R b/R/AFND_interface.R
index b62e8e0..0f22d85 100644
--- a/R/AFND_interface.R
+++ b/R/AFND_interface.R
@@ -244,9 +244,9 @@ check_population <- function(hla_population) {
#' @return list of valid countries, regions and ethnic origin
#' @keywords internal
get_valid_geographics <- function() {
- url <- "http://www.allelefrequencies.net/hla6006a.asp?"
- html_input <- getURL(url, read_method = "html")
-
+ # http://www.allelefrequencies.net/hla6006a.asp?
+ html_input <- xml2::read_html("nix-valid-geographics")
+
rvest_tables <- rvest::html_table(html_input, fill = TRUE)

# country
diff --git a/R/external_resources_input.R b/R/external_resources_input.R
index c4b1dc1..8fc5881 100644
--- a/R/external_resources_input.R
+++ b/R/external_resources_input.R
@@ -74,16 +74,17 @@ getURL <- function(URL, N.TRIES=2L,
# MHC I
# netmhcI_input_template is an internal variable containing list of valid
# NetMHCpan input alleles
-netmhcI_input_template <- getURL(
- URL="https://services.healthtech.dtu.dk/services/NetMHCpan-4.1/allele.list",
- read_method = "delim", delim = "\t",
- col_names = c("netmhc_input", "hla_chain_name", "HLA_gene"))
+netmhcI_input_template <- readr::read_delim(
+ # https://services.healthtech.dtu.dk/services/NetMHCpan-4.1/allele.list
+ "nix-NetMHCpan-4.1-allele-list",
+ delim = "\t",
+ skip = 0,
+ col_names = c("netmhc_input", "hla_chain_name", "HLA_gene")
+ )

# MHC II
-lines <- getURL(
- URL = paste0("https://services.healthtech.dtu.dk/services/",
- "NetMHCIIpan-4.0/alleles_name.list"),
- read_method = "lines")
+# https://services.healthtech.dtu.dk/services/NetMHCIIpan-4.0/alleles_name.list
+lines <- readr::read_lines("nix-NETMHCIIpan-4.0-alleles-name-list")
lines_rep <- stringr::str_replace_all(lines, "\t+|\\s\\s+", "\t")
netmhcII_input_template <- suppressWarnings(
suppressMessages(read.delim(textConnection(lines_rep), sep = "\t")))