From c56c1481e02f3564f5f1e4e513f3cac746185c58 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Fri, 31 May 2024 10:31:23 +1000 Subject: [PATCH] rPackages.Rhisat2: remove backport and disable parallel building --- pkgs/development/r-modules/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index a71b9900b78e..532f904553ea 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1334,15 +1334,8 @@ let ''; }); - # backported patch from 1.9 - Rhisat2= old.Rhisat2.overrideAttrs (attrs: { - patches = [ (pkgs.fetchpatch { - url = "https://github.com/fmicompbio/Rhisat2/commit/a0f27b018831b39f080f99e6db8a4b876fd56fc3.patch"; - sha256 = "sha256-FbYkP/WFmbfQmxArkHgushgVgY0XSypbK8Z5ivQK8k4="; - }) ]; - env = (attrs.env or { }) // { - NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -w"; - }; + Rhisat2 = old.Rhisat2.overrideAttrs (attrs: { + enableParallelBuilding = false; }); s2 = old.s2.overrideAttrs (attrs: {