01/02: gnu: sbcl-clsql: Activate postgresql support.

[guix-commits]

glv pushed a commit to branch wip-lisp
in repository guix.

commit 135bc7e31ba92b4a948fbb246ec4ed17a297e1fb
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Sun Sep 13 11:17:51 2020 +0200

    gnu: sbcl-clsql: Activate postgresql support.
    
    * gnu/packages/lisp-xyz.scm (sbcl-clsql)[arguments]: Remove 'clsql-cffi.asd'
      from 'asd-files'. Add 'clsql-postgresql' to 'asd-systems'. Add 'fix-build'
      phase.
---
 gnu/packages/lisp-xyz.scm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 9003381..8a98c9f 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -8743,8 +8743,7 @@ interface for MySQL, PostgreSQL and SQLite.")
        ("uffi" ,sbcl-uffi)
        ("zlib" ,zlib)))
     (arguments
-     `(#:asd-files '("clsql-cffi.asd"
-                     "clsql.asd"
+     `(#:asd-files '("clsql.asd"
                      "clsql-uffi.asd"
                      "clsql-sqlite3.asd"
                      "clsql-postgresql.asd"
@@ -8752,8 +8751,7 @@ interface for MySQL, PostgreSQL and SQLite.")
                      "clsql-mysql.asd")
        #:asd-systems '("clsql"
                        "clsql-sqlite3"
-                       ;; TODO: Find why postgresql-sql.lisp fails to compile.
-                       ;;"clsql-postgresql"
+                       "clsql-postgresql"
                        "clsql-postgresql-socket3"
                        "clsql-mysql")
        #:phases
@@ -8762,6 +8760,15 @@ interface for MySQL, PostgreSQL and SQLite.")
            (lambda _
              (make-file-writable "doc/html.tar.gz")
              #t))
+         (add-after 'unpack 'fix-build
+           (lambda _
+             (substitute* "clsql-uffi.asd"
+               (("\\(:version uffi \"2.0\"\\)")
+                "uffi"))
+             (substitute* "db-postgresql/postgresql-api.lisp"
+               (("\\(data :cstring\\)")
+                "(data :string)"))
+             #t))
          (add-after 'unpack 'fix-paths
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (substitute* "db-sqlite3/sqlite3-loader.lisp"