01/01: gnu: Fix build failures caused by commit d10092b849153dc27cfed0a9601fde6c7bdec918.

[Kei Kebreau]

kkebreau pushed a commit to branch master
in repository guix.

commit 4561498e1f207e83ecc4a9fe1a08935c2807160f
Author: Kei Kebreau <address@hidden>
Date:   Thu Sep 7 09:36:28 2017 -0400

    gnu: Fix build failures caused by commit
    d10092b849153dc27cfed0a9601fde6c7bdec918.
    
    * gnu/packages/bioinformatics.scm (seek)[arguments]: Restore previous phase
    order.
    * gnu/packages/ci.scm (cuirass)[arguments]: Add patch-/bin/sh phase.
---
 gnu/packages/bioinformatics.scm | 2 +-
 gnu/packages/ci.scm             | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index bf8eb2e..8a9abf7 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4486,7 +4486,7 @@ distribution, coverage uniformity, strand specificity, 
etc.")
                        "Data2DB"
                        "PCL2Bin")))
            (modify-phases %standard-phases
-             (add-after 'unpack 'bootstrap
+             (add-before 'configure 'bootstrap
                (lambda _
                  (zero? (system* "bash" "gen_auto"))))
              (add-after 'build 'build-additional-tools
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm
index c449754..f3259bf 100644
--- a/gnu/packages/ci.scm
+++ b/gnu/packages/ci.scm
@@ -216,7 +216,12 @@ their dependencies.")
                (substitute* "Makefile.am"
                  (("tests/repo.scm \\\\") "\\"))
                #t))
-           (add-after 'disable-repo-tests 'bootstrap
+           (add-after 'disable-repo-tests 'patch-/bin/sh
+             (lambda _
+               (substitute* "build-aux/git-version-gen"
+                 (("#!/bin/sh") (string-append "#!" (which "sh"))))
+               #t))
+           (add-after 'patch-/bin/sh 'bootstrap
              (lambda _ (zero? (system* "sh" "bootstrap"))))
            (add-after 'install 'wrap-program
              (lambda* (#:key inputs outputs #:allow-other-keys)