From aae51697be9fa00dbf2acef28b82efbb2287f01b Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 20 Oct 2023 17:06:09 +0900 Subject: [PATCH 1/3] bowtie2: refactor --- .../science/biology/bowtie2/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index e5c9c2864225..3e902e607db8 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -1,13 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, cmake, tbb, zlib, python3, perl }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, perl +, python3 +, tbb +, zlib +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bowtie2"; version = "2.5.2"; src = fetchFromGitHub { owner = "BenLangmead"; - repo = pname; - rev = "v${version}"; + repo = "bowtie2"; + rev = "refs/tags/v${finalAttrs.version}"; sha256 = "sha256-Bem4SHY/74suZPDbw/rwKMLBn3bRq5ooHbBoVnKuYk0="; }; @@ -17,10 +25,12 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; - license = licenses.gpl3; + license = licenses.gpl3Plus; homepage = "http://bowtie-bio.sf.net/bowtie2"; + changelog = "https://github.com/BenLangmead/bowtie2/releases/tag/${finalAttrs.src.rev}"; maintainers = with maintainers; [ rybern ]; platforms = platforms.all; broken = stdenv.isAarch64; # only x86 is supported + mainProgram = "bowtie2"; }; -} +}) From 13fe1effaf0b3aded4939568b6b0115392e4e2ae Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 20 Oct 2023 17:07:39 +0900 Subject: [PATCH 2/3] bowtie2: fix build on aarch64 --- .../science/biology/bowtie2/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 3e902e607db8..268775fc0b34 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -16,13 +16,24 @@ stdenv.mkDerivation (finalAttrs: { owner = "BenLangmead"; repo = "bowtie2"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-Bem4SHY/74suZPDbw/rwKMLBn3bRq5ooHbBoVnKuYk0="; + fetchSubmodules = true; + hash = "sha256-rWeopeYuCk9ZhJX2SFCcxZWcjXjjTiVRiwkzLQcIgd0="; }; + # because of this flag, gcc on aarch64 cannot find the Threads + # Could NOT find Threads (missing: Threads_FOUND) + # TODO: check with other distros and report upstream + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "-m64" "" + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ tbb zlib python3 perl ]; + cmakeFlags = lib.optional (!stdenv.hostPlatform.isx86) ["-DCMAKE_CXX_FLAGS=-I${finalAttrs.src}/third_party"]; + meta = with lib; { description = "An ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; license = licenses.gpl3Plus; @@ -30,7 +41,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/BenLangmead/bowtie2/releases/tag/${finalAttrs.src.rev}"; maintainers = with maintainers; [ rybern ]; platforms = platforms.all; - broken = stdenv.isAarch64; # only x86 is supported mainProgram = "bowtie2"; }; }) From 056f9e21c08d2573a39d7ba3777bc968cb88ded5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 20 Oct 2023 17:08:20 +0900 Subject: [PATCH 3/3] bowtie2: enable tests --- .../science/biology/bowtie2/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 268775fc0b34..356e90555f8d 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -6,6 +6,8 @@ , python3 , tbb , zlib +, runCommand +, bowtie2 }: stdenv.mkDerivation (finalAttrs: { @@ -34,6 +36,20 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = lib.optional (!stdenv.hostPlatform.isx86) ["-DCMAKE_CXX_FLAGS=-I${finalAttrs.src}/third_party"]; + # ctest fails because of missing dependencies between tests + doCheck = false; + + passthru.tests = { + ctest = runCommand "${finalAttrs.pname}-test" { } '' + mkdir $out + ${lib.getExe bowtie2} -x ${finalAttrs.src}/example/index/lambda_virus ${finalAttrs.src}/example/reads/longreads.fq -u 10 + ${bowtie2}/bin/bowtie2-build-s -c GGGCGGCGACCTCGCGGGTTTTCGCTA $out/small + ${bowtie2}/bin/bowtie2-inspect-s $out/small + ${bowtie2}/bin/bowtie2-build-l -c GGGCGGCGACCTCGCGGGTTTTCGCTA $out/large + ${bowtie2}/bin/bowtie2-inspect-l $out/large + ''; + }; + meta = with lib; { description = "An ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; license = licenses.gpl3Plus;