diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 585ddfc411b2..889aa2bfdf80 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11835,6 +11835,12 @@ github = "james-atkins"; githubId = 9221409; }; + jamespeapen = { + name = "James Eapen"; + email = "james.eapen@vai.org"; + github = "jamespeapen"; + githubId = 39574560; + }; jamesward = { email = "james@jamesward.com"; name = "James Ward"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index bb000aa7676d..bad67fd029fe 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -686,6 +686,7 @@ with lib.maintainers; members = [ b-rodrigues bcdarwin + jamespeapen jbedo kupac ]; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index fb5bc3e25fc1..1c47c74d4ecb 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -385,6 +385,7 @@ let data_table = [ jbedo ]; BiocManager = [ jbedo ]; ggplot2 = [ jbedo ]; + iscream = [ jamespeapen ]; svaNUMT = [ jbedo ]; svaRetro = [ jbedo ]; StructuralVariantAnnotation = [ jbedo ]; @@ -3136,19 +3137,13 @@ let ''; }); - iscream = - let - # https://huishenlab.github.io/iscream/articles/htslib.html - htslib-deflate = pkgs.htslib.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ pkgs.libdeflate ]; - }); - in - old.iscream.overrideAttrs (attrs: { - # Rhtslib (in LinkingTo) is not needed if we provide a proper htslib - propagatedBuildInputs = - builtins.filter (el: el != pkgs.rPackages.Rhtslib) attrs.propagatedBuildInputs - ++ [ htslib-deflate ]; - }); + iscream = old.iscream.overrideAttrs (attrs: { + # https://huishenlab.github.io/iscream/articles/htslib.html + # Rhtslib (in LinkingTo) is not needed if we provide a proper htslib + propagatedBuildInputs = + builtins.filter (el: el != pkgs.rPackages.Rhtslib) attrs.propagatedBuildInputs + ++ [ pkgs.htslib ]; + }); torch = old.torch.overrideAttrs (attrs: { preConfigure = ''