From 43b72ba4c5964b6f1e8c40da2e73d5d1a4494eed Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Fri, 10 Nov 2017 16:40:19 +0100 Subject: [PATCH 1/2] Add Renato Alves (unode) to maintainers --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ba5ee757a7cd..87799ab1874b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -698,6 +698,7 @@ tvorog = "Marsel Zaripov "; tweber = "Thorsten Weber "; twey = "James ‘Twey’ Kay "; + unode = "Renato Alves "; uralbash = "Svintsov Dmitry "; utdemir = "Utku Demir "; #urkud = "Yury G. Kudryashov "; inactive since 2012 From b22e4976cbd64f868fc1e2fbd93de309b6d224e6 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Sat, 27 Jan 2018 17:14:39 +0100 Subject: [PATCH 2/2] muscle: init at 3.8.31 --- .../science/biology/muscle/default.nix | 35 +++++++++++++++++++ .../muscle/muscle-3.8.31-no-static.patch | 21 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 58 insertions(+) create mode 100644 pkgs/applications/science/biology/muscle/default.nix create mode 100644 pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix new file mode 100644 index 000000000000..9cbabc7ab37e --- /dev/null +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + _name = "muscle"; + name = "${_name}-${version}"; + version = "3.8.31"; + + src = fetchurl { + url = "https://www.drive5.com/muscle/downloads${version}/${_name}${version}_src.tar.gz"; + sha256 = "1b89z0x7h098g99g00nqadgjnb2r5wpi9s11b7ddffqkh9m9dia3"; + }; + + patches = [ + ./muscle-3.8.31-no-static.patch + ]; + + preBuild = '' + cd ./src/ + patchShebangs mk + ''; + + installPhase = '' + install -vD muscle $out/bin/muscle + ''; + + meta = with stdenv.lib; { + description = "A multiple sequence alignment method with reduced time and space complexity"; + license = licenses.publicDomain; + homepage = https://www.drive5.com/muscle/; + maintainers = [ maintainers.unode ]; + # NOTE: Supposed to be compatible with darwin/intel & PPC but currently fails. + # Anyone with access to these platforms is welcome to give it a try + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch b/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch new file mode 100644 index 000000000000..7f4b2129518d --- /dev/null +++ b/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch @@ -0,0 +1,21 @@ +--- a/src/mk 2010-05-02 01:15:42.000000000 +0200 ++++ b/src/mk 2018-01-27 17:07:23.539092748 +0100 +@@ -5,14 +5,14 @@ + rm -f *.o muscle.make.stdout.txt muscle.make.stderr.txt + for CPPName in $CPPNames + do +- echo $CPPName >> /dev/tty ++ echo $CPPName + g++ $ENV_GCC_OPTS -c -O3 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt + done + + LINK_OPTS= +-if [ `uname -s` == Linux ] ; then +- LINK_OPTS=-static +-fi ++#if [ `uname -s` == Linux ] ; then ++# LINK_OPTS=-static ++#fi + g++ $LINK_OPTS $ENV_LINK_OPTS -g -o muscle $ObjNames >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt + tail muscle.make.stderr.txt + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0db748b4d2b..31d2f02be7a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18962,6 +18962,8 @@ with pkgs; kallisto = callPackage ../applications/science/biology/kallisto { }; + muscle = callPackage ../applications/science/biology/muscle/default.nix { }; + neuron = callPackage ../applications/science/biology/neuron { python = null; };