gnu: fann: Update to 2.2.0-2.1783cbf.

* gnu/packages/machine-learning.scm (fann): Update to 2.2.0-2.1783cbf.
[version]: Modernize.
[source]: Modernize, delete bundled googletest.
[arguments]: Use G-Expressions.
<#:phases>: Remove remove-googletest, modernize check.
[native-inputs]: Add googletest.
[home-page]: Update.

Change-Id: If3b2fa1e28633129dfeba87630ddc5478dd77291
Signed-off-by: Danny Milosavljevic <dannym@friendly-machines.com>

gnu/packages/machine-learning.scm

@@ -302,30 +302,41 @@ distributions.")
     (license license:asl2.0)))
 
 (define-public fann
-  ;; The last release is >100 commits behind, so we package from git.
+  ;; The last release is 14 years old.
-  (let ((commit "d71d54788bee56ba4cf7522801270152da5209d7"))
+  (let ((commit "1783cbf6239a597c4d29f694e227e22b8d4f4bf6")
+        (revision "2"))
     (package
       (name "fann")
-      (version (string-append "2.2.0-1." (string-take commit 8)))
+      (version (git-version "2.2.0" revision commit))
-      (source (origin
+      (source
+       (origin
          (method git-fetch)
          (uri (git-reference
                 (url "https://github.com/libfann/fann")
                 (commit commit)))
-                (file-name (string-append name "-" version "-checkout"))
+         (modules '((guix build utils)))
+         (snippet #~(delete-file-recursively "lib/googletest"))
+         (file-name (git-file-name name version))
          (sha256
           (base32
-                  "0ibwpfrjs6q2lijs8slxjgzb2llcl6rk3v2ski4r6215g5jjhg3x"))))
+           "0jlcxl0czlr3982mak3935mb08i2f368f0jsxca91ppgfd596ldr"))))
       (build-system cmake-build-system)
       (arguments
-       `(#:phases
+       (list
-         (modify-phases %standard-phases
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'remove-googletest
+              (lambda _
+                (substitute* "CMakeLists.txt"
+                  (("ADD_SUBDIRECTORY\\( lib/googletest \\)")
+                   ""))))
             (replace 'check
-             (lambda* (#:key outputs #:allow-other-keys)
+              (lambda* (#:key tests? #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out")))
+                (when tests?
-                 (with-directory-excursion (string-append (getcwd) "/tests")
+                  (with-directory-excursion "tests"
                     (invoke "./fann_tests"))))))))
-      (home-page "http://leenissen.dk/fann/wp/")
+      (native-inputs (list googletest))
+      (home-page "https://leenissen.dk/")
       (synopsis "Fast Artificial Neural Network")
       (description
        "FANN is a neural network library, which implements multilayer