gnu: pbbam: Update to 1.7.0.

* gnu/packages/bioinformatics.scm (pbbam): Update to 1.7.0.
[arguments]: Remove phase 'find-googletest; add phase 'patch-tests.
[propagated-inputs]: Add pbcopper.

gnu/packages/bioinformatics.scm

@@ -608,40 +608,38 @@ and utilities for PacBio C++ applications.")
 (define-public pbbam
   (package
     (name "pbbam")
-    (version "0.23.0")
+    (version "1.7.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/PacificBiosciences/pbbam")
-                    (commit version)))
+                    (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0h9gkrpf2lrxklxp72xfl5bi3h5zcm5hprrya9gf0hr3xwlbpp0x"))))
+                "1avdm5hwhr5ls79017blyalx1npzbf1aa6dgb6j6lg8sq4nk9yyg"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'find-googletest
+         (add-after 'unpack 'patch-tests
            (lambda* (#:key inputs #:allow-other-keys)
-             ;; It doesn't find gtest_main because there's no pkg-config file
+             ;; Disable this test.  I tried fixing it by including
-             ;; for it.  Find it another way.
+             ;; optional_io.hpp, but there's a type error.
-             (substitute* "tests/meson.build"
+             (substitute* "tests/src/meson.build"
-               (("pbbam_gtest_dep = dependency\\('gtest_main'.*")
+               (("'test_ReadGroupInfo.cpp',") ""))
-                (format #f "cpp = meson.get_compiler('cpp')
+             #;
-pbbam_gtest_dep = cpp.find_library('gtest_main', dirs : '~a')\n"
+             (substitute* "include/pbbam/ReadGroupInfo.h"
-                        (assoc-ref inputs "googletest"))))
+               (("#include <boost/optional.hpp>" m)
-             #t)))
+                (string-append m "\n#include <boost/optional/optional_io.hpp>")))
-       ;; TODO: tests/pbbam_test cannot be linked
+             (substitute* '("tests/scripts/cram/_test.py"
-       ;; ld: tests/59830eb@@pbbam_test@exe/src_test_Accuracy.cpp.o:
+                            "tests/scripts/cram/_main.py")
-       ;;   undefined reference to symbol '_ZTIN7testing4TestE'
+               (("'/bin/sh'")
-       ;; ld: /gnu/store/...-googletest-1.8.0/lib/libgtest.so:
+                (string-append "'" (which "sh") "'"))))))))
-       ;;   error adding symbols: DSO missing from command line
-       #:tests? #f
-       #:configure-flags '("-Dtests=false")))
     ;; These libraries are listed as "Required" in the pkg-config file.
     (propagated-inputs
      `(("htslib" ,htslib)
+       ("pbcopper" ,pbcopper)
        ("zlib" ,zlib)))
     (inputs
      `(("boost" ,boost)