#:use-module (gnu packages sqlite)
#:use-module (gnu packages tcl)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages web)
#:use-module (gnu packages webkit)
#:use-module (gnu packages xdisorg)
#:use-module (ice-9 match)
(define-public sbcl-ironclad
(package
(name "sbcl-ironclad")
- (version "0.50")
+ (version "0.51")
(source
(origin
(method git-fetch)
(url "https://github.com/sharplispers/ironclad/")
(commit (string-append "v" version))))
(sha256
- (base32 "0k4bib9mbrzalbl9ivkw4a7g4c7bbad1l5jw4pzkifqszy2swkr5"))
+ (base32 "1zxkzbxsfb83bb87rhp4h75cc1h5f6ziyfa5lvaa30zgix9l2d7v"))
(file-name (git-file-name name version))))
(build-system asdf-build-system/sbcl)
(native-inputs
(sbcl-package->cl-source-package sbcl-cffi-uffi-compat))
(define-public sbcl-cl-sqlite
- (let ((commit "c738e66d4266ef63a1debc4ef4a1b871a068c112"))
- (package
- (name "sbcl-cl-sqlite")
- (version (git-version "0.2" "1" commit))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/dmitryvk/cl-sqlite")
- (commit commit)))
- (file-name (git-file-name "cl-sqlite" version))
- (sha256
- (base32
- "1ng45k1hdb84sqjryrfx93g66bsbybmpy301wd0fdybnc5jzr36q"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("iterate" ,sbcl-iterate)
- ("cffi" ,sbcl-cffi)
- ("sqlite" ,sqlite)))
- (native-inputs
- `(("fiveam" ,sbcl-fiveam)
- ("bordeaux-threads" ,sbcl-bordeaux-threads)))
- (arguments
- `(#:tests? #f ; Upstream seems to have issues with tests: https://github.com/dmitryvk/cl-sqlite/issues/7
- #:asd-file "sqlite.asd"
- #:asd-system-name "sqlite"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "sqlite-ffi.lisp"
- (("libsqlite3" all) (string-append
- (assoc-ref inputs "sqlite")"/lib/" all))))))))
- (home-page "https://common-lisp.net/project/cl-sqlite/")
- (synopsis "Common Lisp binding for SQLite")
- (description
- "The @command{cl-sqlite} package is an interface to the SQLite embedded
+ (package
+ (name "sbcl-cl-sqlite")
+ (version "0.2.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dmitryvk/cl-sqlite")
+ (commit version)))
+ (file-name (git-file-name "cl-sqlite" version))
+ (sha256
+ (base32
+ "08iv7b4m0hh7qx2cvq4f510nrgdld0vicnvmqsh9w0fgrcgmyg4k"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("iterate" ,sbcl-iterate)
+ ("cffi" ,sbcl-cffi)
+ ("sqlite" ,sqlite)))
+ (native-inputs
+ `(("fiveam" ,sbcl-fiveam)
+ ("bordeaux-threads" ,sbcl-bordeaux-threads)))
+ (arguments
+ `(#:asd-file "sqlite.asd"
+ #:asd-system-name "sqlite"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "sqlite-ffi.lisp"
+ (("libsqlite3" all) (string-append
+ (assoc-ref inputs "sqlite")"/lib/" all))))))))
+ (home-page "https://common-lisp.net/project/cl-sqlite/")
+ (synopsis "Common Lisp binding for SQLite")
+ (description
+ "The @command{cl-sqlite} package is an interface to the SQLite embedded
relational database engine.")
- (license license:public-domain))))
+ (license license:public-domain)))
(define-public cl-sqlite
(sbcl-package->cl-source-package sbcl-cl-sqlite))
(sbcl-package->cl-source-package sbcl-cl-cffi-gtk))
(define-public sbcl-cl-webkit
- (let ((commit "6c905a5550b58a5b7602da5a087d7dafc5337122"))
+ (let ((commit "dccf9d25de4e9a69f716f8ed9578e58963ead967"))
(package
(name "sbcl-cl-webkit")
- (version (git-version "2.4" "4" commit))
+ (version (git-version "2.4" "5" commit))
(source
(origin
(method git-fetch)
(file-name (git-file-name "cl-webkit" version))
(sha256
(base32
- "0017ijjflqqbgbj5bf7ffkyw5idhxc0ggly2qh5igf3kz886p9rh"))))
+ "0cn43ks2mgqkfnalq1p997z6q5pr1sfvz99gvvr5fp7r1acn7v5w"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("cffi" ,sbcl-cffi)
(sbcl-package->ecl-package sbcl-s-xml-rpc))
(define-public sbcl-trivial-clipboard
- (let ((commit "5af3415d1484e6d69a1b5c178f24680d9fd01796"))
+ (let ((commit "afcd3743b842f5a81fc86dba60f9db59970f49c5"))
(package
(name "sbcl-trivial-clipboard")
- (version (git-version "0.0.0.0" "2" commit))
+ (version (git-version "0.0.0.0" "3" commit))
(source
(origin
(method git-fetch)
(file-name (git-file-name "trivial-clipboard" version))
(sha256
(base32
- "1gb515z5yq6h5548pb1fwhmb0hhq1ssyb78pvxh4alq799xipxs9"))))
+ "1qfbvkzmvkbqpc5s3sx31c5653sy6qlcixafgzd10qpykb843prr"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("xclip" ,xclip)))
(define-public cl-ningle
(sbcl-package->cl-source-package sbcl-ningle))
-(define-public sbcl-clack
- (let ((commit "e3e032843bb1220ab96263c411aa7f2feb4746e0")
+(define-public sbcl-cl-fastcgi
+ (let ((commit "d576d20eeb12f225201074b28934ba395b15781a")
(revision "1"))
(package
- (name "sbcl-clack")
- (version (git-version "2.0.0" revision commit))
- (source
- (origin
+ (name "sbcl-cl-fastcgi")
+ (version (git-version "0.2" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/KDr2/cl-fastcgi/")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "02mvzzyn0k960s38rbxaqqmdkwcfmyhf8dx6ynz8xyxflmp0s5zv"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("usocket" ,sbcl-usocket)
+ ("cffi" ,sbcl-cffi)
+ ("fcgi" ,fcgi)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "cl-fastcgi.lisp"
+ (("\"libfcgi.so\"")
+ (string-append
+ "\""
+ (assoc-ref inputs "fcgi") "/lib/libfcgi.so\""))))))))
+ (home-page "https://kdr2.com/project/cl-fastcgi.html")
+ (synopsis "FastCGI wrapper for Common Lisp")
+ (description
+ "CL-FastCGI is a generic version of SB-FastCGI, targeting to run on
+mostly Common Lisp implementation.")
+ ;; TODO: Upstream on specifies "BSD license":
+ ;; https://github.com/KDr2/cl-fastcgi/issues/4
+ (license license:bsd-2))))
+
+(define-public cl-fastcgi
+ (sbcl-package->cl-source-package sbcl-cl-fastcgi))
+
+(define-public ecl-cl-fastcgi
+ (sbcl-package->ecl-package sbcl-cl-fastcgi))
+
+(define clack-commit "e3e032843bb1220ab96263c411aa7f2feb4746e0")
+(define clack-revision "1")
+
+(define-public sbcl-clack
+ (package
+ (name "sbcl-clack")
+ (version (git-version "2.0.0" clack-revision clack-commit))
+ (source
+ (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/fukamachi/clack")
- (commit commit)))
+ (commit clack-commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1ymzs6qyrwhlj6cgqsnpyn6g5cbp7a3s1vgxwna20y2q7y4iacy0"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("sbcl-lack" ,sbcl-lack)
- ("sbcl-lack-middleware-backtrace" ,sbcl-lack-middleware-backtrace)
- ("sbcl-bordeaux-threads" ,sbcl-bordeaux-threads)))
- (home-page "https://github.com/fukamachi/clack")
- (synopsis "Web Application Environment for Common Lisp")
- (description
- "Clack is a web application environment for Common Lisp inspired by
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("sbcl-lack" ,sbcl-lack)
+ ("sbcl-lack-middleware-backtrace" ,sbcl-lack-middleware-backtrace)
+ ("sbcl-bordeaux-threads" ,sbcl-bordeaux-threads)))
+ (home-page "https://github.com/fukamachi/clack")
+ (synopsis "Web Application Environment for Common Lisp")
+ (description
+ "Clack is a web application environment for Common Lisp inspired by
Python's WSGI and Ruby's Rack.")
- (license license:llgpl))))
+ (license license:llgpl)))
(define-public cl-clack
(sbcl-package->cl-source-package sbcl-clack))
+(define-public sbcl-clack-handler-fcgi
+ (package
+ (inherit sbcl-clack)
+ (name "sbcl-clack-handler-fcgi")
+ (version (git-version "0.3.1" clack-revision clack-commit))
+ (inputs
+ `(("cl-fastcgi" ,sbcl-cl-fastcgi)
+ ("alexandria" ,sbcl-alexandria)
+ ("flexi-streams" ,sbcl-flexi-streams)
+ ("usocket" ,sbcl-usocket)
+ ("quri" ,sbcl-quri)))
+ (synopsis "Web Application Environment for Common Lisp (FastCGI handler)")))
+
+(define-public cl-clack-handler-fcgi
+ (sbcl-package->cl-source-package sbcl-clack-handler-fcgi))
+
+(define sbcl-clack-socket
+ (package
+ (inherit sbcl-clack)
+ (name "sbcl-clack-socket")
+ (version (git-version "0.1" clack-revision clack-commit))))
+
+(define-public sbcl-clack-handler-hunchentoot
+ (package
+ (inherit sbcl-clack)
+ (name "sbcl-clack-handler-hunchentoot")
+ (version (git-version "0.4.0" clack-revision clack-commit))
+ (inputs
+ `(("hunchentoot" ,sbcl-hunchentoot)
+ ("clack-socket" ,sbcl-clack-socket)
+ ("flexi-streams" ,sbcl-flexi-streams)
+ ("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("split-sequence" ,sbcl-split-sequence)
+ ("alexandria" ,sbcl-alexandria)))
+ (synopsis "Web Application Environment for Common Lisp (Hunchentoot handler)")))
+
(define-public sbcl-log4cl
(let ((commit "611e094458504b938d49de904eab141285328c7c")
(revision "1"))
(sbcl-package->cl-source-package sbcl-postmodern))
(define-public sbcl-dbi
- (package
- (name "sbcl-dbi")
- (version "0.9.4")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/fukamachi/cl-dbi")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0m1fsravfaizamdak84adh3jxc4j91maqnrb4m08bfbmb04cdqhs"))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("bordeaux-threads" ,sbcl-bordeaux-threads)
- ("closer-mop" ,sbcl-closer-mop)
- ("split-sequence" ,sbcl-split-sequence)))
- (arguments
- `(#:tests? #f)) ; TODO: Break circular dependency with dbd-*
- (synopsis "Database independent interface for Common Lisp")
- (description
- "@code{dbi} is a Common Lisp library providing a database independent
+ ;; Master includes a breaking change which other packages depend on since
+ ;; Quicklisp decided to follow it:
+ ;; https://github.com/fukamachi/cl-dbi/commit/31c46869722f77fd5292a81b5b101f1347d7fce1
+ (let ((commit "31c46869722f77fd5292a81b5b101f1347d7fce1"))
+ (package
+ (name "sbcl-dbi")
+ (version (git-version "0.9.4" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fukamachi/cl-dbi")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0r3n4rw12qqxad0cryym2ibm4ddl49gbq4ra227afibsr43nw5k3"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("closer-mop" ,sbcl-closer-mop)
+ ("split-sequence" ,sbcl-split-sequence)))
+ (arguments
+ `(#:tests? #f)) ; TODO: Break circular dependency with dbd-*
+ (synopsis "Database independent interface for Common Lisp")
+ (description
+ "@code{dbi} is a Common Lisp library providing a database independent
interface for MySQL, PostgreSQL and SQLite.")
- (home-page "https://github.com/fukamachi/cl-dbi")
- (license license:llgpl)))
+ (home-page "https://github.com/fukamachi/cl-dbi")
+ (license license:llgpl))))
(define-public cl-dbi
(sbcl-package->cl-source-package sbcl-dbi))
("swank" ,cl-slime-swank)
("zpb-ttf" ,cl-zpb-ttf))))))
+(define-public sbcl-mcclim-test-util
+ (package
+ (inherit sbcl-clim-lisp)
+ (name "sbcl-mcclim-test-util")
+ (inputs
+ `(("fiveam" ,sbcl-fiveam)
+ ("mcclim" ,sbcl-mcclim)
+ ("swank" ,cl-slime-swank))) ; For drei-mcclim
+ (arguments
+ '(#:asd-file "mcclim.asd"
+ #:asd-system-name "mcclim/test-util"))))
+
+(define-public sbcl-mcclim-raster-image
+ (package
+ (inherit sbcl-clim-lisp)
+ (name "sbcl-mcclim-raster-image")
+ (native-inputs
+ `(("fiveam" ,sbcl-fiveam)
+ ("mcclim-test-util" ,sbcl-mcclim-test-util)))
+ (inputs
+ `(("clim-basic" ,sbcl-clim-basic)
+ ("mcclim-backend-common" ,sbcl-mcclim-backend-common)
+ ("mcclim-render" ,sbcl-mcclim-render)
+ ("swank" ,cl-slime-swank))) ; For drei-mcclim
+ (arguments
+ '(#:asd-file "Backends/RasterImage/mcclim-raster-image.asd"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-asd-system-names
+ (lambda _
+ (substitute* "Backends/RasterImage/mcclim-raster-image.asd"
+ (("mcclim/test-util")
+ "mcclim-test-util"))
+ #t)))))))
+
+(define-public sbcl-clim-examples
+ (package
+ (inherit sbcl-clim-lisp)
+ (name "sbcl-clim-examples")
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("closer-mop" ,sbcl-closer-mop)
+ ("mcclim" ,sbcl-mcclim)
+ ("mcclim-bezier" ,sbcl-mcclim-bezier)
+ ("mcclim-layouts-tab" ,sbcl-mcclim-layouts-tab)
+ ("mcclim-raster-image" ,sbcl-mcclim-raster-image)
+ ("swank" ,cl-slime-swank))) ; For drei-mcclim
+ (arguments
+ '(#:asd-file "Examples/clim-examples.asd"
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-asd-system-names
+ (lambda _
+ (substitute* "Examples/clim-examples.asd"
+ (("mcclim-layouts/tab")
+ "mcclim-layouts-tab"))
+ #t)))))))
+
(define-public sbcl-cl-inflector
(let ((commit "f1ab16919ccce3bd82a0042677d9616dde2034fe")
(revision "1"))
(add-after 'unpack 'remove-non-functional-tests
(lambda _
(substitute* "mito-test.asd"
- ;; (("\\(:test-file \"migration/mysql\"\\)") "")
(("\\(:test-file \"db/mysql\"\\)") "")
(("\\(:test-file \"db/postgres\"\\)") "")
(("\\(:test-file \"dao\"\\)") "")
(for-each delete-file
'("README.v1.markdown" "caveman.asd" "caveman-test.asd")))))
;; TODO: Tests fail with:
- ;; writing /gnu/store/j4l1k28yq47qbg074b4yf1b7wnccg8j1-sbcl-caveman-2.4.0-1.faa5f7e/share/common-lisp/sbcl-source/caveman2/v2/t/tmp/myapp573/tests/myapp573.lisp
+ ;; writing /gnu/store/...-sbcl-caveman-2.4.0-1.faa5f7e/share/common-lisp/sbcl-source/caveman2/v2/t/tmp/myapp573/tests/myapp573.lisp
;; While evaluating the form starting at line 38, column 0
;; of #P"/tmp/guix-build-sbcl-caveman-2.4.0-1.faa5f7e.drv-0/source/v2/t/caveman.lisp":
;; Unhandled ASDF/FIND-COMPONENT:MISSING-COMPONENT in thread #<SB-THREAD:THREAD "main thread" RUNNING
HCoop / jackhill / guix / guix.git / blobdiff