diff options
Diffstat (limited to 'gnu/packages/lisp-xyz.scm')
| -rw-r--r-- | gnu/packages/lisp-xyz.scm | 284 |
1 files changed, 173 insertions, 111 deletions
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0aaa3c8446..1c7957c3d7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1247,8 +1247,8 @@ and Gopher website hosting.") (delete 'build-program)))))))) (define-public sbcl-trivial-timeout - (let ((commit "feb869357f40f5e109570fb40abad215fb370c6c") - (revision "1")) + (let ((commit "e70d9b4f7caeab83ea6ac50d724470fe49561e66") + (revision "2")) (package (name "sbcl-trivial-timeout") (version (git-version "0.1.5" revision commit)) @@ -1256,19 +1256,15 @@ and Gopher website hosting.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/trivial-timeout/") + (url "https://github.com/hraban/trivial-timeout") (commit commit))) (file-name (git-file-name "trivial-timeout" version)) (sha256 - (base32 "1kninxwvvih9nhh7a9y8lfgi7pdr76675y1clw4ss17vz8fbim5p")))) + (base32 "0s8z9aj6b3kv21yiyk13cjylzf5zlnw9v86vcff477m1gk9yddjs")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-lift)) - (arguments - ;; NOTE: (Sharlatan-20210202T231437+0000): Due to the age of this library - ;; tests use some deprecated functionality and keep failing. - `(#:tests? #f)) - (home-page "https://github.com/gwkkwg/trivial-timeout/") + (home-page "https://github.com/hraban/trivial-timeout") (synopsis "Timeout library for Common Lisp") (description "This library provides an OS and implementation independent access to @@ -2260,8 +2256,9 @@ antialiased TrueType font rendering using CLX and XRender extension.") (sbcl-package->ecl-package sbcl-clx-truetype)) (define-public sbcl-slynk - (let ((commit "df62abae73bd511885c9c7ec0ea7ea1469a00923") - (revision "8")) + ;; Update together with emacs-sly. + (let ((commit "9c43bf65b967e12cef1996f1af5f0671d8aecbf4") + (revision "9")) (package (name "sbcl-slynk") (version (git-version "1.0.43" revision commit)) @@ -2273,7 +2270,7 @@ antialiased TrueType font rendering using CLX and XRender extension.") (url "https://github.com/joaotavora/sly") (commit commit))) (sha256 - (base32 "1nxijv52bja6la2i3asq7kklpj5li25454n52sgsc6xnnfvakbsv")) + (base32 "15nyr02ykkws4q79jcmxcawddg8sgq9v5l8k7jv7gg3hnpzxjlb2")) (file-name (git-file-name "cl-slynk" version)))) (build-system asdf-build-system/sbcl) (outputs '("out" "image")) @@ -2708,8 +2705,8 @@ arbitrary Lisp data.") (sbcl-package->ecl-package sbcl-cl-dot)) (define-public sbcl-cl-graph - (let ((commit "3cb786797b24883d784b7350e7372e8b1e743508") - (revision "1")) + (let ((commit "c617de35390cb02db88bc5b5febffafdb8947ae8") + (revision "2")) (package (name "sbcl-cl-graph") (version (git-version "0.10.2" revision commit)) @@ -2717,11 +2714,11 @@ arbitrary Lisp data.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/cl-graph") + (url "https://github.com/hraban/cl-graph") (commit commit))) (file-name (git-file-name "cl-graph" version)) (sha256 - (base32 "1748rj52f2jmd5jvsy9jwhn0zf73sjzjhwhnljvq6yi2kdqr30kl")))) + (base32 "0g1abkph9zb0m9zz6q2471ml9q9acdhwyapk8ra3bisqpwlxvpyf")))) (build-system asdf-build-system/sbcl) (arguments ;; TODO: (Sharlatan-20221118T215839+0000): Tests failed @@ -3610,8 +3607,8 @@ writing code that contains string literals that contain code themselves.") (sbcl-package->ecl-package sbcl-pythonic-string-reader)) (define-public sbcl-slime-swank - (let ((commit "0cc2e736112a0bc2a048ef6efd11dd67e3fbf7ad") - (revision "0")) + (let ((commit "735258a26bb97e85d25f39e4bef83c1f80c12f5d") + (revision "1")) (package (name "sbcl-slime-swank") (version (git-version "2.28" revision commit)) @@ -3623,7 +3620,7 @@ writing code that contains string literals that contain code themselves.") (url "https://github.com/slime/slime/") (commit commit))) (sha256 - (base32 "0iq9r4007rrnabj290y79i926x2m4j20j6b0x701pkywz926sn02")) + (base32 "0prskgzfqjmn8sc7p9nklnd0n1plwcvh40slgh23km31raplmzk7")) (modules '((guix build utils))) (snippet ;; The doc folder drags `gawk' into the closure. Doc is already @@ -5044,7 +5041,7 @@ is a library for creating graphical user interfaces.") (define-public sbcl-cl-webkit (package (name "sbcl-cl-webkit") - (version "3.5.9") + (version "3.5.10") (source (origin (method git-fetch) @@ -5054,7 +5051,7 @@ is a library for creating graphical user interfaces.") (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "00h61p5mrvvbycp703isy0wvgqlfb7k0cidw4vg75y7s29m3k6k0")))) + "0bn8idvbi58kg0g76lanvjzkgnkcy41yn9vbp7f80q9fa7w892rq")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) @@ -5601,8 +5598,8 @@ client and server.") (sbcl-package->ecl-package sbcl-trivial-clipboard)) (define-public sbcl-trivial-backtrace - (let ((commit "6eb65bde7229413040c81d42ea22f0e4c9c8cfc9") - (revision "1")) + (let ((commit "7f90b4a4144775cca0728791e4b92ac2557b07a1") + (revision "2")) (package (name "sbcl-trivial-backtrace") (version (git-version "1.1.0" revision commit)) @@ -5610,11 +5607,11 @@ client and server.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/trivial-backtrace") + (url "https://github.com/hraban/trivial-backtrace") (commit commit))) (file-name (git-file-name "trivial-backtrace" version)) (sha256 - (base32 "1mbaqiwj5034iw6jzw30jyhwzp1pvhnz1zcy0lns0z5j2h9ldapw")))) + (base32 "11j0p3vgmnn5q84xw7sacr5p3cvff2hfhsh2is8xpm2iwxc723kn")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-lift)) @@ -7730,8 +7727,8 @@ CPython implementation of Python) and Common Lisp.") (sbcl-package->ecl-package sbcl-burgled-batteries3)) (define-public sbcl-metabang-bind - (let ((commit "c93b7f7e1c18c954c2283efd6a7fdab36746ab5e") - (revision "1")) + (let ((commit "08196426cb099db0623e6cae2aeca566e0b788b2") + (revision "2")) (package (name "sbcl-metabang-bind") (version (git-version "0.8.0" revision commit)) @@ -7739,12 +7736,12 @@ CPython implementation of Python) and Common Lisp.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/metabang-bind") + (url "https://github.com/hraban/metabang-bind") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0hd0kr91795v77akpbcyqiss9p0p7ypa9dznrllincnmgvsxlmf0")))) + "14g7k3zhm8cd6bssc5mm5h6iq1dv5lfhiq33aimcmj5a6vbiq47d")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-lift)) @@ -9220,8 +9217,8 @@ discontiguous ranges of time.") (sbcl-package->ecl-package sbcl-periods)) (define-public sbcl-metatilities-base - (let ((commit "6eaa9e3ff0939a93a92109dd0fcd218de85417d5") - (revision "1")) + (let ((commit "ef04337759972fd622c9b27b53149f3d594a841f") + (revision "2")) (package (name "sbcl-metatilities-base") (version (git-version "0.6.6" revision commit)) @@ -9229,12 +9226,12 @@ discontiguous ranges of time.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/metatilities-base") + (url "https://github.com/hraban/metatilities-base") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0xpa86pdzlnf4v5g64j3ifaplx71sx2ha8b7vvakswi652679ma0")))) + "069rk5ncwvjnnzvvky6xiriynl72yzvjpnzl6jw9jf3b8na14zrk")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-lift)) @@ -9252,8 +9249,8 @@ which implements a set of utilities.") (sbcl-package->ecl-package sbcl-metatilities-base)) (define-public sbcl-cl-containers - (let ((commit "3d1df53c22403121bffb5d553cf7acb1503850e7") - (revision "3")) + (let ((commit "781ebfe0888bae46f07c018f7d473898b1bd4f5f") + (revision "4")) (package (name "sbcl-cl-containers") (version (git-version "0.12.1" revision commit)) @@ -9261,12 +9258,12 @@ which implements a set of utilities.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/cl-containers") + (url "https://github.com/hraban/cl-containers") (commit commit))) (file-name (git-file-name "cl-containers" version)) (sha256 (base32 - "18s6jfq11n8nv9k4biz32pm1s7y9zl054ry1gmdbcf39nisy377y")))) + "1nrql8s1j123v5gscy99lxvhlzp0ijig9x94w30v3lwfa58hf90l")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-lift)) @@ -12135,6 +12132,50 @@ for reading and writing JPEG image files.") (define-public ecl-cl-jpeg (sbcl-package->ecl-package sbcl-cl-jpeg)) +(define-public sbcl-jpeg-turbo + (let ((commit "f79c646cc266c107bdace53572a31664754c6e0c") + (revision "1")) + (package + (name "sbcl-jpeg-turbo") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shamazmazum/jpeg-turbo/") + (commit commit))) + (file-name (git-file-name "cl-jpeg-turbo" version)) + (sha256 + (base32 "1andd1ibbk3224idnpsnrn96flr5d1wm9ja3di57fs04wn577sag")))) + (build-system asdf-build-system/sbcl) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-lib-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/jpeg-turbo.lisp" + (("\"libturbojpeg\\.so\\.0\"") + (string-append "\"" + (search-input-file inputs + "/lib/libturbojpeg.so") + "\"")))))))) + (native-inputs + (list sbcl-fiveam)) + (inputs + (list libjpeg-turbo sbcl-cffi)) + (synopsis "Common Lisp wrapper for libjpeg-turbo") + (description + "This is a Common Lisp wrapper for libjpeg-turbo library which provides +TurboJPEG API for compressing and decompressing JPEG images.") + (home-page "https://github.com/shamazmazum/jpeg-turbo/") + (license license:bsd-2)))) + +(define-public cl-jpeg-turbo + (sbcl-package->cl-source-package sbcl-jpeg-turbo)) + +(define-public ecl-cl-jpeg-turbo + (sbcl-package->ecl-package sbcl-jpeg-turbo)) + (define-public sbcl-png (let ((commit "11b965fe378fd0561abe3616b18ff03af5179648") (revision "1")) @@ -17097,12 +17138,21 @@ not so easy to copy (ssyntax, argument destructuring, etc.).") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/trivial-shell") + (url "https://github.com/hraban/trivial-shell") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 "08mpkl5ij5sjfsyn8pq2kvsvpvyvr7ha1r8g1224fa667b8k2q85")))) (build-system asdf-build-system/sbcl) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda _ + (substitute* "dev/definitions.lisp" + (("/bin/sh") + (which "sh")))))))) (native-inputs (list sbcl-lift)) (home-page "https://common-lisp.net/project/trivial-shell/") @@ -17687,31 +17737,34 @@ It aims to be implementation-agnostic and to climb the syntax trees.") (sbcl-package->ecl-package sbcl-agnostic-lizard)) (define-public sbcl-dynamic-classes - (package - (name "sbcl-dynamic-classes") - (version "1.0.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gwkkwg/dynamic-classes") - (commit (string-append "version-" version)))) - (file-name (git-file-name "dynamic-classes" version)) - (sha256 - (base32 "1z3ag6w4ff0v6715xa9zhvwjqnp4i6zrjfmxdz8m115sklbwgm6c")))) - (build-system asdf-build-system/sbcl) - (inputs - `(("metatilities-base" ,sbcl-metatilities-base))) - (arguments - ;; NOTE: (Sharlatan-20210106222900+0000) Circular dependencies and failing - ;; test suites. lift-standard.config contains referances to deprecated - ;; functionality. - `(#:tests? #f)) - (home-page "https://common-lisp.net/project/dynamic-classes/") - (synopsis "Dynamic class definition for Common Lisp") - (description "Dynamic-Classes helps to ease the prototyping process by + (let ((commit "ebd7405603f67b16e8f2bc08ce8e2bcfcf439501") + (revision "0")) + (package + (name "sbcl-dynamic-classes") + (version (git-version "1.0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hraban/dynamic-classes") + (commit commit))) + (file-name (git-file-name "dynamic-classes" version)) + (sha256 + (base32 "1k9lkchwyi2xhygp2v8ifq3kg1l3wcnihhzgr06jrivjxgdqpc1a")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("metatilities-base" ,sbcl-metatilities-base))) + (arguments + ;; NOTE: (Sharlatan-20210106222900+0000) Circular dependencies and failing + ;; test suites. lift-standard.config contains referances to deprecated + ;; functionality. + ;; See https://github.com/hraban/dynamic-classes/issues/2 + `(#:tests? #f)) + (home-page "https://common-lisp.net/project/dynamic-classes/") + (synopsis "Dynamic class definition for Common Lisp") + (description "Dynamic-Classes helps to ease the prototyping process by bringing dynamism to class definition.") - (license license:expat))) + (license license:expat)))) (define-public ecl-dynamic-classes (sbcl-package->ecl-package sbcl-dynamic-classes)) @@ -17720,41 +17773,47 @@ bringing dynamism to class definition.") (sbcl-package->cl-source-package sbcl-dynamic-classes)) (define-public sbcl-cl-markdown - ;; NOTE: (Sharlatan-20210106214629+0000) latest version tag - ;; "version-0.10.6_version-0.10.6" is failing to build due to missing system - ;; #:container-dynamic-classes - (package - (name "sbcl-cl-markdown") - (version "0.10.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gwkkwg/cl-markdown") - (commit (string-append "version-" version)))) - (file-name (git-file-name "cl-markdown" version)) - (sha256 - (base32 "1wdjbdd1zyskxf7zlilcp6fmwkivybj0wjp64vvzb265d5xi7p8p")))) - (build-system asdf-build-system/sbcl) - (inputs - `(("anaphora" ,sbcl-anaphora) - ("cl-containers" ,sbcl-cl-containers) - ("cl-ppcre" ,sbcl-cl-ppcre) - ("dynamic-classes" ,sbcl-dynamic-classes) - ("metabang-bind" ,sbcl-metabang-bind) - ("metatilities-base" ,sbcl-metatilities-base))) - (arguments - ;; NOTE: (Sharlatan-20210107213629+0000) Tests depend on too many not - ;; available systems, which themself are abandoned. - `(#:tests? #f)) - (home-page "https://common-lisp.net/project/cl-markdown/") - (synopsis "Common Lisp rewrite of Markdown") - (description - "This is an implementation of a Markdown parser in Common Lisp.") - (license license:expat))) + ;; The latest changes with fixes are not released yet, see + ;; https://github.com/hraban/cl-markdown/issues/9 + (let ((commit "3788802199228b49d0e06c3feb80c1c22af05cfc") + (revision "0")) + (package + (name "sbcl-cl-markdown") + (version (git-version "0.10.6" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hraban/cl-markdown") + (commit commit))) + (file-name (git-file-name "cl-markdown" version)) + (sha256 + (base32 "1algqwmafipyf194cx9wfhg0pdx1ppx6s444p1pm8yaycbsyla1v")))) + (build-system asdf-build-system/sbcl) + (native-inputs + (list sbcl-lift sbcl-trivial-shell)) + (inputs + (list sbcl-anaphora + sbcl-cl-containers + sbcl-cl-ppcre + sbcl-dynamic-classes + sbcl-metabang-bind + sbcl-metatilities-base)) + (home-page "https://common-lisp.net/project/cl-markdown/") + (synopsis "Common Lisp rewrite of Markdown") + (description + "This is an implementation of a Markdown parser in Common Lisp.") + (license license:expat)))) (define-public ecl-cl-markdown - (sbcl-package->ecl-package sbcl-cl-markdown)) + (let ((pkg (sbcl-package->ecl-package sbcl-cl-markdown))) + (package + (inherit pkg) + (arguments + ;; XXX: Tests fail with "The function LIFT::GET-BACKTRACE-AS-STRING is + ;; undefined" on ECL. + ;; See https://github.com/hraban/cl-markdown/issues/11 + '(#:tests? #f))))) (define-public cl-markdown (sbcl-package->cl-source-package sbcl-cl-markdown)) @@ -18832,7 +18891,7 @@ HTML documents.") (sbcl-package->cl-source-package sbcl-cl-html-diff)) (define-public sbcl-tooter - (let ((commit "2e1b22f0993419c1e7e6d10ead45d7bcafb5b6cb") + (let ((commit "2dcc2facddcacd79d0cce545a8c4b73c35826fc1") (revision "4")) (package (name "sbcl-tooter") @@ -18845,10 +18904,13 @@ HTML documents.") (commit commit))) (file-name (git-file-name "cl-tooter" version)) (sha256 - (base32 "02ys58gzasvk7r84jmz6k522qcw2hkbgv8p0ax5i8dggjhr04cz2")))) + (base32 "1zisrmslj4rnibm02vxh7hbas2cfsjh6iizs2nfdg3a3pn7bhf6h")))) (build-system asdf-build-system/sbcl) (inputs - (list sbcl-cl-ppcre sbcl-documentation-utils sbcl-drakma + (list sbcl-alexandria + sbcl-cl-ppcre + sbcl-documentation-utils + sbcl-drakma sbcl-yason)) (synopsis "Common Lisp client library for Mastodon instances") (description @@ -18866,7 +18928,7 @@ protocol for Mastodon.") (define-public sbcl-croatoan (package (name "sbcl-croatoan") - (version "0.1") + (version "0.2") (source (origin (method git-fetch) @@ -18875,7 +18937,7 @@ protocol for Mastodon.") (commit (string-append "v" version)))) (file-name (git-file-name "cl-croatoan" version)) (sha256 - (base32 "1whbvwc4df7zz0002xy3aczrpf4s3vk6kmyh9wydgwl112h060pd")))) + (base32 "0x2rlckyn8kn5mqy0fib8piggz694g3naarz2dvha1hsy4jhb1wg")))) (build-system asdf-build-system/sbcl) (arguments '(#:phases @@ -19481,7 +19543,7 @@ immediately loaded.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/cl-mathstats") + (url "https://github.com/hraban/cl-mathstats") (commit commit))) (file-name (git-file-name "cl-mathstats" version)) (sha256 @@ -19491,7 +19553,7 @@ immediately loaded.") (list sbcl-lift)) (inputs (list sbcl-cl-containers sbcl-metatilities-base)) - (home-page "https://github.com/gwkkwg/cl-mathstats") + (home-page "https://github.com/hraban/cl-mathstats") (synopsis "Common Lisp collection of mathematical routines") (description "This package provides Common Lisp math and statistics routines.") @@ -21219,8 +21281,8 @@ running into parallelism problems when having to change directory.") (sbcl-package->cl-source-package sbcl-simple-inferiors)) (define-public sbcl-metacopy - (let ((commit "1b5bf443206cc1dea7801ae23d1167bd02122d30") - (revision "1")) + (let ((commit "df7856f2a43fa91124fe780ef22f792040bc130c") + (revision "2")) (package (name "sbcl-metacopy") (version (git-version "0.2.0" revision commit)) @@ -21228,27 +21290,27 @@ running into parallelism problems when having to change directory.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/metacopy") + ;; Upstream changed the maintaner. + ;; legacy https://github.com/gwkkwg/metacopy + (url "https://github.com/hraban/metacopy") (commit commit))) (file-name (git-file-name "cl-metacopy" version)) (sha256 - (base32 "1rzp112djgw5n76s6hy2aq92bc43p0zd5bgzvqwvgvws4pls42s9")))) + (base32 "0l5ryg8pvqz9sn9s8bsvd0plvcnm7crsx86iqk5wxblkialaizip")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-asdf-system-connections sbcl-lift)) (inputs (list sbcl-contextl sbcl-moptilities)) - (home-page "https://github.com/gwkkwg/metacopy") + (home-page "https://github.com/hraban/metacopy") (synopsis "Flexible Common Lisp shallow/deep copy mechanism") (description "This package provides a flexible shallow/deep copy mechanism for Common Lisp.") (license license:expat)))) -;; NOTE: (Sharlatan-20221112T214131+0000): There is no ecl-moptilities variable -;; required for tests. -;; -;; ecl-metacopy +(define-public ecl-metacopy + (sbcl-package->ecl-package sbcl-metacopy)) (define-public cl-metacopy (sbcl-package->cl-source-package sbcl-metacopy)) |