From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: Re: Update mafft to 7.245. Date: Thu, 17 Dec 2015 23:29:47 +0100 Message-ID: <87poy4lndw.fsf@elephly.net> References: <5641E082.90801@uq.edu.au> <20151110151207.6c5e4693@debian-netbook> <56426E2B.10405@uq.edu.au> <567001F0.7060206@uq.edu.au> <567314B7.7070605@uq.edu.au> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9h3i-0007ki-1m for guix-devel@gnu.org; Thu, 17 Dec 2015 17:30:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9h3d-0001uN-2Z for guix-devel@gnu.org; Thu, 17 Dec 2015 17:30:01 -0500 Received: from sender163-mail.zoho.com ([74.201.84.163]:25918) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9h3c-0001sj-Qw for guix-devel@gnu.org; Thu, 17 Dec 2015 17:29:57 -0500 In-reply-to: <567314B7.7070605@uq.edu.au> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ben Woodcroft Cc: "guix-devel@gnu.org" Ben Woodcroft writes: > On 17/12/15 22:47, Ricardo Wurmus wrote: >> Ben Woodcroft writes: >> >>>> What do you think? >>> I think you are quite valiant. As I say, I cannot be confident in my >>> testing (even those in the readme). The diff looked mostly fine by eye, >>> but there was some issues near the end which mangled things somewhat >> What was mangled? > Original: > > tmpawk=`which nawk 2>/dev/null | awk '{print $1}'` > if [ -x "$tmpawk" ]; then > prog="$tmpawk" > fi > > tmpawk=`which gawk 2>/dev/null | awk '{print $1}'` > if [ -x "$tmpawk" ]; then > prog="$tmpawk" > fi > > > After your patch: > > tmp/gnu/store/k8qgvgwn5anbfy8r70h938kxgd46cyxx-gawk-4.1.3/bin/awk=`which > n/gnu/store/k8qgvgwn5anbfy8r70h938kxgd46cyxx-gawk-4.1.3/bin/awk > 2>/dev/null | /gnu/store/k8qgvgwn5anbfy8r70h938kxgd46cyxx-gawk-4.1.3/bin/aw > if [ -x > "$tmp/gnu/store/k8qgvgwn5anbfy8r70h938kxgd46cyxx-gawk-4.1.3/bin/awk" ]; then > prog="$tmp/gnu/store/k8qgvgwn5anbfy8r70h938kxgd46cyxx-gawk-4.1.3/bin/awk" > fi > > tmp/gnu/store/k8qgvgwn5anbfy8r70h938kxgd46cyxx-gawk-4.1.3/bin/awk=`which > g/gnu/store/k8qgvgwn5anbfy8r70h938kxgd46cyxx-gawk-4.1.3/bin/awk > 2>/dev/null | /gnu/store/k8qgvgwn5anbfy8r70h938kxgd46cyxx-gawk-4.1.3/bin/aw > if [ -x > "$tmp/gnu/store/k8qgvgwn5anbfy8r70h938kxgd46cyxx-gawk-4.1.3/bin/awk" ]; then > prog="$tmp/gnu/store/k8qgvgwn5anbfy8r70h938kxgd46cyxx-gawk-4.1.3/bin/awk" > fi Oh, yes, that’s terrible. Thanks for catching this! (I don’t see why my regex would do that, but I’m too tired to check this now.) > The most recent patch: > > tmpawk=`which nawk 2>/dev/null | > /gnu/store/k8qgvgwn5anbfy8r70h938kxgd46cyxx-gawk-4.1.3/bin/awk '{print $1}'` > if [ -x "$tmpawk" ]; then > prog="$tmpawk" > fi > > tmpawk=`which gawk 2>/dev/null | > /gnu/store/k8qgvgwn5anbfy8r70h938kxgd46cyxx-gawk-4.1.3/bin/awk '{print $1}'` > if [ -x "$tmpawk" ]; then > prog="$tmpawk" > fi Nice! >> Other than that the patch does look fine. If you confirm that this is >> what you intended then I’ll push it as is. > Thanks, if you are happy. This was just supposed to be a simple update.. Sorry for the delay! It just never feels good to me to propagate inputs. If ever this can be avoided with a bit of patching I’d like to try that first. > I tried adding a check procedure but this didn't work: mafft refused to > run, when it runs just fine from the store. I was loath to debug that. > Instead, I was wondering if there was a way to test after installation? > If these tests could be run in a container that excluded native-inputs > (but perhaps some extra test-specific dependencies if required), then I > think such a procedure could be generally quite useful. It would catch > the errors I made in the original patch, for instance. You could reorder the phases such that the check phase runs after installation. We do this for some Python packages as well. It’s just a matter of (delete 'check) (add-after 'install 'check (lambda ...)) Do you want to give this a try or shall I just apply the latest patch you sent, leaving this for some time later? Thank you for your patience! ~~ Ricardo