Merge pull request #202395 from thyol/muscle

muscle: 3.8.31 -> 5.1.0

authored by

Jonas Heinrich and committed by
GitHub
20193b6d b7a9466d

+14 -44
+14 -23
pkgs/applications/science/biology/muscle/default.nix
··· 1 - { lib, stdenv, fetchurl }: 1 + { lib, stdenv, fetchFromGitHub }: 2 2 3 3 stdenv.mkDerivation rec { 4 - _name = "muscle"; 5 - name = "${_name}-${version}"; 6 - version = "3.8.31"; 4 + name = "muscle"; 5 + version = "5.1.0"; 7 6 8 - src = fetchurl { 9 - url = "https://www.drive5.com/muscle/downloads${version}/${_name}${version}_src.tar.gz"; 10 - sha256 = "1b89z0x7h098g99g00nqadgjnb2r5wpi9s11b7ddffqkh9m9dia3"; 7 + 8 + src = fetchFromGitHub { 9 + owner = "rcedgar"; 10 + repo = "${name}"; 11 + rev = "${version}"; 12 + hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk="; 11 13 }; 12 14 13 - patches = [ 14 - ./muscle-3.8.31-no-static.patch 15 - ]; 16 - 17 - preBuild = '' 18 - cd ./src/ 19 - patchShebangs mk 20 - ''; 15 + sourceRoot = "source/src"; 21 16 22 17 installPhase = '' 23 - install -vD muscle $out/bin/muscle 18 + install -m755 -D Linux/muscle $out/bin/muscle 24 19 ''; 25 20 26 21 meta = with lib; { 27 - broken = (stdenv.isLinux && stdenv.isAarch64); 28 - description = "A multiple sequence alignment method with reduced time and space complexity"; 29 - license = licenses.publicDomain; 22 + description = "Multiple sequence alignment with top benchmark scores scalable to thousands of sequences"; 23 + license = licenses.gpl3Plus; 30 24 homepage = "https://www.drive5.com/muscle/"; 31 - maintainers = [ maintainers.unode ]; 32 - # NOTE: Supposed to be compatible with darwin/intel & PPC but currently fails. 33 - # Anyone with access to these platforms is welcome to give it a try 34 - platforms = lib.platforms.linux; 25 + maintainers = with maintainers; [ unode thyol ]; 35 26 }; 36 27 }
-21
pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch
··· 1 - --- a/src/mk 2010-05-02 01:15:42.000000000 +0200 2 - +++ b/src/mk 2018-01-27 17:07:23.539092748 +0100 3 - @@ -5,14 +5,14 @@ 4 - rm -f *.o muscle.make.stdout.txt muscle.make.stderr.txt 5 - for CPPName in $CPPNames 6 - do 7 - - echo $CPPName >> /dev/tty 8 - + echo $CPPName 9 - 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 10 - done 11 - 12 - LINK_OPTS= 13 - -if [ `uname -s` == Linux ] ; then 14 - - LINK_OPTS=-static 15 - -fi 16 - +#if [ `uname -s` == Linux ] ; then 17 - +# LINK_OPTS=-static 18 - +#fi 19 - g++ $LINK_OPTS $ENV_LINK_OPTS -g -o muscle $ObjNames >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt 20 - tail muscle.make.stderr.txt 21 -