tojo-tokyo: Fix sbcl-clog-1.7 package definition.

1 files changed, 72 insertions, 3 deletions

diff --git a/tojo-tokyo/packages/lisp-xyz.scm b/tojo-tokyo/packages/lisp-xyz.scm
index e19bbfc..2c7372d 100644
--- a/tojo-tokyo/packages/lisp-xyz.scm
+++ b/tojo-tokyo/packages/lisp-xyz.scm
@@ -22,14 +22,81 @@
   #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system asdf)
   #:use-module (gnu packages)
   #:use-module (gnu packages lisp)
   #:use-module (gnu packages lisp-xyz))
 
+(define-public sbcl-clack-next
+  (let ((commit "488cfb36381a4f4c56ad7f1184ea64b6ebcc2cee")
+        (revision "1"))
+    (package
+      (inherit sbcl-clack)
+      (version (git-version "2.1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/fukamachi/clack")
+               (commit commit)))
+         (file-name (git-file-name "cl-clack" version))
+         (sha256
+          (base32 "1xvxgzzd8jv0ig2hwq4yaxsshs5j55v144c34wqyva3c56j3640i"))))
+      (inputs
+       `(("alexandria" ,sbcl-alexandria)
+         ("bordeaux-threads" ,sbcl-bordeaux-threads)
+         ("cl-fastcgi" ,sbcl-cl-fastcgi)
+         ("flexi-streams" ,sbcl-flexi-streams)
+         ("hunchentoot" ,sbcl-hunchentoot)
+         ("lack" ,sbcl-lack-next)
+         ("split-sequence" ,sbcl-split-sequence)
+         ("usocket" ,sbcl-usocket)
+         ("quri" ,sbcl-quri)
+         ("sbcl-slime-swank" ,sbcl-slime-swank)))
+      (license license:x11))))
+
+(define-public sbcl-lack-next
+  (let ((commit "c2edb842247ced0071dc21987f97629575667fe8")
+        (revision "1"))
+    (package
+      (inherit sbcl-lack)
+      (name "sbcl-lack")
+      (version (git-version "0.2.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/fukamachi/lack")
+               (commit commit)))
+         (file-name (git-file-name "lack" version))
+         (sha256
+          (base32 "0dad6gb9vai3rhw3xsn1ks82xmd1gmpy457ik30vyv5b6c38c5xz"))))
+      (arguments
+       '(#:asd-systems '("lack"
+                         "lack-request"
+                         "lack-response"
+                         "lack-component"
+                         "lack-util"
+                         "lack-util-writer-stream"
+                         "lack-middleware-backtrace"
+                         "lack-middleware-static")
+         ;; XXX: Component :CLACK not found
+         #:tests? #f))
+      (inputs
+       `(("circular-streams" ,sbcl-circular-streams)
+         ("http-body" ,sbcl-http-body)
+         ("ironclad" ,sbcl-ironclad)
+         ("local-time" ,sbcl-local-time)
+         ("quri" ,sbcl-quri)
+         ("trivial-mimes" ,sbcl-trivial-mimes)
+         ("sbcl-cl-isaac" ,sbcl-cl-isaac)
+         ("sbcl-trivial-rfc-1123" ,sbcl-trivial-rfc-1123)))
+      (license license:x11))))
+
 (define-public sbcl-clog-1.7
   (package
     (inherit sbcl-clog)
-    (name "sbcl-clog")
     (version "1.7")
     (source
      (origin
@@ -40,6 +107,8 @@
        (file-name (git-file-name "cl-clog" version))
        (sha256
         (base32 "19sf25nhsmjbc21qwp2qlp1hr03l7kc4kppzwhrbqv8rxd73zs9l"))))
+    (arguments
+     '(#:asd-systems '("clog" "clog/docs")))
     (inputs
      (list sbcl-3bmd
            sbcl-alexandria
@@ -50,12 +119,12 @@
            sbcl-cl-ppcre
            sbcl-cl-sqlite
            sbcl-cl-template
-           sbcl-clack
+           sbcl-clack-next
            sbcl-closer-mop
            sbcl-colorize
            sbcl-dbi
            sbcl-hunchentoot
-           sbcl-lack
+           sbcl-lack-next
            sbcl-mgl-pax
            sbcl-parse-float
            sbcl-quri