From e9c6be11260b1487ee241855d8189e1441f6bf8d Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Fri, 10 Dec 2021 06:09:49 +0000 Subject: gnu: Add cl-zsort. * gnu/packages/lisp-xyz.scm (cl-zsort, ecl-zsort, sbcl-zsort): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages/lisp-xyz.scm') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 635f8e48cb..0ac48db778 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19868,6 +19868,40 @@ library inspired by @code{cl-data-format-validation} and WTForms validators.") (define-public ecl-restas (sbcl-package->ecl-package sbcl-restas)) +(define-public sbcl-zsort + (let ((commit "f6724a6fff7662a942195cedb0d7f00da59c74ed") + (revision "1")) + (package + (name "sbcl-zsort") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jorgetavares/zsort") + (commit commit))) + (file-name (git-file-name "cl-zsort" version)) + (sha256 + (base32 "1vyklyh99712zsll4qi0m4mm8yb1nz04403vl8i57bjv5p5max49")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria))) + (home-page "https://github.com/jorgetavares/zsort") + (synopsis "Collection of portable sorting algorithms in Common Lisp") + (description + "@code{zsort} is a collection of portable sorting algorithms. Common +Lisp provides the @code{sort} and @code{stable-sort} functions but these can +have different algorithms implemented according to each implementation. Also, +the standard sorting functions might not be the best for a certain situations. +This library aims to provide developers with more options.") + (license license:expat)))) + +(define-public cl-zsort + (sbcl-package->cl-source-package sbcl-zsort)) + +(define-public ecl-zsort + (sbcl-package->ecl-package sbcl-zsort)) + (define-public sbcl-cl-https-everywhere ;; No release. ;; Don't forget to update the https-everywhere input. -- cgit 1.4.1 From d3b541469139040ddc3fb5bb37b1ac184572296d Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Fri, 10 Dec 2021 06:10:52 +0000 Subject: gnu: Add cl-core-gp. * gnu/packages/lisp-xyz.scm (cl-core-gp, ecl-core-gp, sbcl-core-gp): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/lisp-xyz.scm') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0ac48db778..113f867ae5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19782,6 +19782,36 @@ score. When evaluated, the musical score is rendered to an image.") (define-public ecl-cmn (sbcl-package->ecl-package sbcl-cmn)) +(define-public sbcl-core-gp + (let ((commit "90ec1c4599a19c5a911be1f703f78d5108aee160") + (revision "1")) + (package + (name "sbcl-core-gp") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jorgetavares/core-gp") + (commit commit))) + (file-name (git-file-name "cl-core-gp" version)) + (sha256 + (base32 "0nzlb2gwqisa1amlpl4zc5xxph2g3qwhfyaxchci67d31rzws6l3")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/jorgetavares/core-gp") + (synopsis "Common Lisp library for genetic programming") + (description + "@code{core-gp} is a Common Lisp library for genetic programming (GP) +algorithms. It allows standard GP, strongly-typed GP, grammatical evolution as +well as standard genetic algorithms.") + (license license:expat)))) + +(define-public cl-core-gp + (sbcl-package->cl-source-package sbcl-core-gp)) + +(define-public ecl-core-gp + (sbcl-package->ecl-package sbcl-core-gp)) + (define-public sbcl-data-sift (let ((commit "fd617d8200cdcc1b87ecf45ab59bb38e8b16ef7e") (revision "1")) -- cgit 1.4.1 From 163f7831c4ed7c7d877234bc208caf625afce808 Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Fri, 10 Dec 2021 06:14:09 +0000 Subject: gnu: Add cl-num-utils. * gnu/packages/lisp-xyz.scm (cl-num-utils, ecl-cl-num-utils, sbcl-cl-num-utils): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages/lisp-xyz.scm') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 113f867ae5..e0e3b8ab4e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19363,6 +19363,53 @@ command in Common Lisp.") (define-public ecl-which (sbcl-package->ecl-package sbcl-which)) +(define-public sbcl-cl-num-utils + (let ((commit "97a88cd34540acf52e872a82ebfef3da0a34fa12") + (revision "1")) + (package + (name "sbcl-cl-num-utils") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tpapp/cl-num-utils") + (commit commit))) + (file-name (git-file-name "cl-num-utils" version)) + (sha256 + (base32 "15ihsxxs76xnldmqfsbxybckqjwrxwcpphgghiwzr2mnbqjpdqkh")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("anaphora" ,sbcl-anaphora) + ("alexandria" ,sbcl-alexandria) + ("array-operations" ,sbcl-array-operations) + ("cl-slice" ,sbcl-cl-slice) + ("let-plus" ,sbcl-let-plus))) + (native-inputs + `(("clunit" ,sbcl-clunit))) + (home-page "https://github.com/tpapp/cl-num-utils") + (synopsis "Numerical utilities for Common Lisp") + (description + "@code{cl-num-utils} implements simple numerical functions for Common +Lisp, including: +@itemize +@item @code{num=}, a comparison operator for floats +@item simple arithmeric functions, like @code{sum} and @code{l2norm} +@item elementwise operations for arrays +@item intervals +@item special matrices and shorthand for their input +@item sample statistics +@item Chebyshev polynomials +@item univariate rootfinding +@end itemize") + (license license:boost1.0)))) + +(define-public cl-num-utils + (sbcl-package->cl-source-package sbcl-cl-num-utils)) + +(define-public ecl-cl-num-utils + (sbcl-package->ecl-package sbcl-cl-num-utils)) + (define-public sbcl-cl-tld ;; No release. (let ((commit "f5014da8d831fa9481d4181d4450f10a52850c75")) -- cgit 1.4.1 From e8fa25f6a4fd2748666bfdba197cddc28b9c2ddc Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Fri, 10 Dec 2021 06:15:12 +0000 Subject: gnu: Add cl-lla. * gnu/packages/lisp-xyz.scm (cl-lla, ecl-lla, sbcl-lla): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu/packages/lisp-xyz.scm') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e0e3b8ab4e..54b33d742b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19410,6 +19410,58 @@ Lisp, including: (define-public ecl-cl-num-utils (sbcl-package->ecl-package sbcl-cl-num-utils)) +(define-public sbcl-lla + (let ((commit "ded805d1e9b1493e17b601116ba9bd8a3de3024f") + (revision "1")) + (package + (name "sbcl-lla") + (version (git-version "0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tpapp/lla") + (commit commit))) + (file-name (git-file-name "cl-lla" version)) + (sha256 + (base32 "0n9vc7dnyjbbsv1n7rd8sylwda5fsdf8f890g4nachanyx0xps9k")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/configuration.lisp" + (("\"libblas.so.3gf\"") + (string-append "\"" (assoc-ref inputs "lapack") + "/lib/libblas.so\"")) + (("\"liblapack.so.3gf\"") + (string-append "\"" (assoc-ref inputs "lapack") + "/lib/liblapack.so\"")))))))) + (inputs + `(("anaphora" ,sbcl-anaphora) + ("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("cl-num-utils" ,sbcl-cl-num-utils) + ("cl-slice" ,sbcl-cl-slice) + ("lapack" ,lapack) + ("let-plus" ,sbcl-let-plus))) + (native-inputs + `(("clunit" ,sbcl-clunit))) + (home-page "https://github.com/tpapp/lla") + (synopsis "Linear algebra library for Common Lisp") + (description + "LLA is a high-level Common Lisp library built on BLAS and LAPACK, but +providing a much more abstract interface with the purpose of freeing the user +from low-level concerns and reducing the number of bugs in numerical code.") + (license license:boost1.0)))) + +(define-public cl-lla + (sbcl-package->cl-source-package sbcl-lla)) + +(define-public ecl-lla + (sbcl-package->ecl-package sbcl-lla)) + (define-public sbcl-cl-tld ;; No release. (let ((commit "f5014da8d831fa9481d4181d4450f10a52850c75")) -- cgit 1.4.1 From 17bbd5ae070ff99335fbb45ad08a0add0223ce78 Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Fri, 10 Dec 2021 06:16:37 +0000 Subject: gnu: Add cl-rmath. * gnu/packages/lisp-xyz.scm (cl-rmath, ecl-cl-rmath, sbcl-cl-rmath): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages/lisp-xyz.scm') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 54b33d742b..ebc528f84e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -93,6 +93,7 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) + #:use-module (gnu packages statistics) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) #:use-module (gnu packages video) @@ -19462,6 +19463,51 @@ from low-level concerns and reducing the number of bugs in numerical code.") (define-public ecl-lla (sbcl-package->ecl-package sbcl-lla)) +(define-public sbcl-cl-rmath + (let ((commit "f6add1edda31547691d08e36ccf6c17305161aca") + (revision "1")) + (package + (name "sbcl-cl-rmath") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tpapp/cl-rmath") + (commit commit))) + (file-name (git-file-name "cl-rmath" version)) + (sha256 + (base32 "1ld8vbpy10paymx2hn0mcgd21i7cjhdrayln1jx0kayqxm12mmk4")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cl-rmath.lisp" + (("\\(cffi:define-foreign-library librmath" all) + (string-append all "\n" + " (:unix \"" + (assoc-ref inputs "librmath") + "/lib/libRmath.so\")")))))))) + (inputs + `(("cffi" ,sbcl-cffi) + ("librmath" ,rmath-standalone))) + (home-page "https://github.com/tpapp/cl-rmath") + (synopsis "Common Lisp wrapper for libRmath") + (description + "@code{cl-rmath} is a simple, autogenerated foreign interface for the +standalone R API @code{libRmath}. There has been no effort to provide a +high-level interface for the original library, instead, this library is meant +to serve as a building block for such an interface.") + (license license:boost1.0)))) + +(define-public cl-rmath + (sbcl-package->cl-source-package sbcl-cl-rmath)) + +(define-public ecl-cl-rmath + (sbcl-package->ecl-package sbcl-cl-rmath)) + (define-public sbcl-cl-tld ;; No release. (let ((commit "f5014da8d831fa9481d4181d4450f10a52850c75")) -- cgit 1.4.1 From 0191fedb7fb3fd17f78cb740f151c558797e8a50 Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Fri, 10 Dec 2021 06:17:27 +0000 Subject: gnu: Add cl-random. * gnu/packages/lisp-xyz.scm (cl-random, ecl-cl-random, sbcl-cl-random): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages/lisp-xyz.scm') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ebc528f84e..b3957878b5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19508,6 +19508,48 @@ to serve as a building block for such an interface.") (define-public ecl-cl-rmath (sbcl-package->ecl-package sbcl-cl-rmath)) +(define-public sbcl-cl-random + (let ((commit "5bb65911037f95a4260bd29a594a09df3849f4ea") + (revision "1")) + (package + (name "sbcl-cl-random") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tpapp/cl-random") + (commit commit))) + (file-name (git-file-name "cl-random" version)) + (sha256 + (base32 "0jn80xphyvyp2v72acr6b8a2f6dw06myr5vrjfl14brsvks7wr89")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("anaphora" ,sbcl-anaphora) + ("array-operations" ,sbcl-array-operations) + ("cl-num-utils" ,sbcl-cl-num-utils) + ("cl-rmath" ,sbcl-cl-rmath) + ("cl-slice" ,sbcl-cl-slice) + ("gsll" ,sbcl-gsll) + ("let-plus" ,sbcl-let-plus) + ("lla" ,sbcl-lla))) + (native-inputs + `(("clunit" ,sbcl-clunit))) + (home-page "https://github.com/tpapp/cl-random") + (synopsis "Random variates for Common Lisp") + (description + "@code{cl-random} is a library for generating random draws from various +commonly used distributions, and for calculating statistical functions, such as +density, distribution and quantiles for these distributions.") + (license license:expat)))) + +(define-public cl-random + (sbcl-package->cl-source-package sbcl-cl-random)) + +(define-public ecl-cl-random + (sbcl-package->ecl-package sbcl-cl-random)) + (define-public sbcl-cl-tld ;; No release. (let ((commit "f5014da8d831fa9481d4181d4450f10a52850c75")) -- cgit 1.4.1 From acf44174c9002b1860beda5619170e5cbae9bb5e Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Fri, 10 Dec 2021 06:18:28 +0000 Subject: gnu: Add cl-mgl-gpr. * gnu/packages/lisp-xyz.scm (cl-mgl-gpr, ecl-mgl-gpr, sbcl-mgl-gpr): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/lisp-xyz.scm') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b3957878b5..a7e50cd9fd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19550,6 +19550,39 @@ density, distribution and quantiles for these distributions.") (define-public ecl-cl-random (sbcl-package->ecl-package sbcl-cl-random)) +(define-public sbcl-mgl-gpr + (let ((commit "cb6ce51e2f87bf1d589f3703c13eea6e25780afe") + (revision "1")) + (package + (name "sbcl-mgl-gpr") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/melisgl/mgl-gpr") + (commit commit))) + (file-name (git-file-name "cl-mgl-gpr" version)) + (sha256 + (base32 "0w51dqixh277k6sl8bqvvp1400y6kd1l5h3d9q2f40l9bpxy8gjx")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-random" ,sbcl-cl-random) + ("mgl-pax" ,sbcl-mgl-pax))) + (home-page "https://melisgl.github.io/mgl-gpr/") + (synopsis "Common Lisp library of evolutionary algorithms") + (description + "@code{MGL-GPR} is a library of evolutionary algorithms such as +Genetic Programming (evolving typed expressions from a set of operators and +constants) and Differential Evolution.") + (license license:expat)))) + +(define-public cl-mgl-gpr + (sbcl-package->cl-source-package sbcl-mgl-gpr)) + +(define-public ecl-mgl-gpr + (sbcl-package->ecl-package sbcl-mgl-gpr)) + (define-public sbcl-cl-tld ;; No release. (let ((commit "f5014da8d831fa9481d4181d4450f10a52850c75")) -- cgit 1.4.1 From 0e14da54754fd80c24777281ec940024529ed8f2 Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Sat, 11 Dec 2021 08:07:58 +0000 Subject: gnu: sbcl-mgl-pax: Update home page. * gnu/packages/lisp-xyz.scm (sbcl-mgl-pax)[home-page]: Update home page. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/lisp-xyz.scm') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a7e50cd9fd..8668a12078 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2187,7 +2187,7 @@ With the simplistic tools provided, one may accomplish similar effects as with Literate Programming, but documentation is generated from code, not vice versa and there is no support for chunking yet. Code is first, code must look pretty, documentation is code.") - (home-page "http://quotenil.com/") + (home-page "https://melisgl.github.io/mgl-pax/") (license license:expat)))) (define-public cl-mgl-pax -- cgit 1.4.1 From b3a801330ed1c126a215fa8e3ff2aea0880eeba8 Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Tue, 7 Dec 2021 14:47:07 -0600 Subject: gnu: sbcl-slime-swank: Update to 2.26.1. * gnu/packages/lisp-xyz.scm (sbcl-slime-swank): Update to 2.26.1. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/lisp-xyz.scm') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 8668a12078..e838b5b198 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2114,7 +2114,7 @@ writing code that contains string literals that contain code themselves.") (define-public sbcl-slime-swank (package (name "sbcl-slime-swank") - (version "2.26") + (version "2.26.1") (source (origin (file-name (git-file-name "slime-swank" version)) @@ -2124,7 +2124,7 @@ writing code that contains string literals that contain code themselves.") (commit (string-append "v" version)))) (sha256 (base32 - "0mxb1wnw19v0s72w2wkz5afdlzvpy5nn7pr4vav403qybac0sw5c")))) + "1a25ixb7q4svqabxnhwkk43v47mbsh13qwm7qlazkd3zkr8j3cli")))) (build-system asdf-build-system/sbcl) (arguments '(#:asd-systems '("swank"))) -- cgit 1.4.1 From d1072f21ba446fe470b171575f5e3202aef17a04 Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Sat, 11 Dec 2021 08:09:01 +0000 Subject: gnu: sbcl-aserve: Add HTML5 elements to htmlgen. * gnu/patches/sbcl-aserve-add-HTML-5-elements.patch: New file. * gnu/patches/sbcl-aserve-fix-rfe12668.patch: New file. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/lisp-xyz.scm (sbcl-aserve)[source]: Use them. Signed-off-by: Guillaume Le Vaillant --- gnu/local.mk | 2 + gnu/packages/lisp-xyz.scm | 17 ++++-- .../patches/sbcl-aserve-add-HTML-5-elements.patch | 63 ++++++++++++++++++++++ .../patches/sbcl-aserve-fix-rfe12668.patch | 43 +++++++++++++++ 4 files changed, 121 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/sbcl-aserve-add-HTML-5-elements.patch create mode 100644 gnu/packages/patches/sbcl-aserve-fix-rfe12668.patch (limited to 'gnu/packages/lisp-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 9a85977973..f485e733e0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1750,6 +1750,8 @@ dist_patch_DATA = \ %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ %D%/packages/patches/rust-shell2batch-lint-fix.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ + %D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \ + %D%/packages/patches/sbcl-aserve-fix-rfe12668.patch \ %D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch \ %D%/packages/patches/sbcl-clml-fix-types.patch \ %D%/packages/patches/sbcl-png-fix-sbcl-compatibility.patch \ diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e838b5b198..22c9479c9f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17906,10 +17906,11 @@ functions allow Lisp programs to explore the web.") (define-public sbcl-aserve ;; There does not seem to be proper releases. - (let ((commit "cac1d6920998ddcbee8310a873414732e707d8e5")) + (let ((commit "cac1d6920998ddcbee8310a873414732e707d8e5") + (revision "2")) (package (name "sbcl-aserve") - (version (git-version "1.2.50" "1" commit)) + (version (git-version "1.2.50" revision commit)) (source (origin (method git-fetch) @@ -17920,7 +17921,14 @@ functions allow Lisp programs to explore the web.") (commit commit))) (file-name (git-file-name "aserve" version)) (sha256 - (base32 "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa")))) + (base32 "0ak6mqp84sjr0a7h5svr16vra4bf4fcx6wpir0n88dc1vjwy5xqa")) + (patches (search-patches + ;; Add HTML5 elements to htmlgen. + ;; Adapted from https://github.com/franzinc/aserve/ commits: + ;; * e47bd763: "rfe12668: add HTML 5 elements to htmlgen" + ;; * 7371ce59: "fix bugs in rfe12668 implementation" + "sbcl-aserve-add-HTML-5-elements.patch" + "sbcl-aserve-fix-rfe12668.patch")))) (build-system asdf-build-system/sbcl) (arguments `(#:phases @@ -17941,7 +17949,8 @@ functions allow Lisp programs to explore the web.") #t))))) (inputs `(("acl-compat" ,sbcl-acl-compat))) - (home-page "https://franz.com/support/documentation/current/doc/aserve/aserve.html") + (home-page + "https://franz.com/support/documentation/current/doc/aserve/aserve.html") (synopsis "AllegroServe, a web server written in Common Lisp") (description "The server part of AllegroServe can be used either as a standalone web diff --git a/gnu/packages/patches/sbcl-aserve-add-HTML-5-elements.patch b/gnu/packages/patches/sbcl-aserve-add-HTML-5-elements.patch new file mode 100644 index 0000000000..93962e10ec --- /dev/null +++ b/gnu/packages/patches/sbcl-aserve-add-HTML-5-elements.patch @@ -0,0 +1,63 @@ +From 940679fb75073a59186099e3dd7fb381e727db6b Mon Sep 17 00:00:00 2001 +From: Kevin Layer +Date: Thu, 31 Oct 2013 04:27:29 -0700 +Subject: [PATCH 1/2] rfe12668: add HTML 5 elements to htmlgen + +Add the new elements listed here: + http://www.w3.org/TR/html5-diff/#new-elements + +Change-Id: I7f64363751130644caf90ecdd65c13175d77ae97 +--- + aserve/htmlgen/htmlgen.cl | 38 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 36 insertions(+), 2 deletions(-) + +diff --git a/aserve/htmlgen/htmlgen.cl b/aserve/htmlgen/htmlgen.cl +index 59248ef..0c0d6e8 100644 +--- a/aserve/htmlgen/htmlgen.cl ++++ b/aserve/htmlgen/htmlgen.cl +@@ -747,6 +747,40 @@ + + (def-std-html :var t nil) + +-(def-std-html :wbr nil nil) +- + (def-std-html :xmp t nil) ++ ++;; html 5 ++ ++(def-std-html :section t nil) ++(def-std-html :article t nil) ++(def-std-html :main t nil) ++(def-std-html :aside t nil) ++(def-std-html :hgroup t nil) ++(def-std-html :header t nil) ++(def-std-html :footer t nil) ++(def-std-html :nav t nil) ++(def-std-html :figure t nil) ++(def-std-html :figcaption t nil) ++ ++(def-std-html :video t nil) ++(def-std-html :audio t nil) ++(def-std-html :source t nil) ++(def-std-html :track t nil) ++(def-std-html :embed t nil) ++(def-std-html :mark t nil) ++(def-std-html :progress t nil) ++(def-std-html :meter t nil) ++(def-std-html :time t nil) ++(def-std-html :data t nil) ++(def-std-html :dialog t nil) ++(def-std-html :ruby t nil) ++(def-std-html :rt t nil) ++(def-std-html :rp t nil) ++(def-std-html :bdi t nil) ++(def-std-html :wbr nil nil) ++(def-std-html :canvas t nil) ++(def-std-html :menuitem t nil) ++(def-std-html :details t nil) ++(def-std-html :datalist t nil) ++(def-std-html :keygen t nil) ++(def-std-html :output t nil) +-- +2.25.1 + diff --git a/gnu/packages/patches/sbcl-aserve-fix-rfe12668.patch b/gnu/packages/patches/sbcl-aserve-fix-rfe12668.patch new file mode 100644 index 0000000000..c7a8e05aae --- /dev/null +++ b/gnu/packages/patches/sbcl-aserve-fix-rfe12668.patch @@ -0,0 +1,43 @@ +From 8110ebd55d5bf659cd40dab2df59d80dafdb367a Mon Sep 17 00:00:00 2001 +From: Kevin Layer +Date: Mon, 10 Feb 2014 11:10:42 -0800 +Subject: [PATCH 2/2] fix bugs in rfe12668 implementation + +The previous commit added :embed and :keygen but they were already +there. Resolve this issue. + +Change-Id: Ieb962a12880394e67d973835945005446833fab7 +--- + aserve/htmlgen/htmlgen.cl | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/aserve/htmlgen/htmlgen.cl b/aserve/htmlgen/htmlgen.cl +index 0c0d6e8..f77d6de 100644 +--- a/aserve/htmlgen/htmlgen.cl ++++ b/aserve/htmlgen/htmlgen.cl +@@ -658,7 +658,6 @@ + (def-std-html :dt t nil) + + (def-std-html :em t nil) +-(def-std-html :embed t nil) + + (def-std-html :fieldset t nil) + (def-std-html :font t nil) +@@ -685,7 +684,6 @@ + (def-std-html :isindex nil nil) + + (def-std-html :kbd t nil) +-(def-std-html :keygen nil nil) + + (def-std-html :label t nil) + (def-std-html :layer t nil) +@@ -782,5 +780,5 @@ + (def-std-html :menuitem t nil) + (def-std-html :details t nil) + (def-std-html :datalist t nil) +-(def-std-html :keygen t nil) ++(def-std-html :keygen nil nil) + (def-std-html :output t nil) +-- +2.25.1 + -- cgit 1.4.1 From c12c7f128418d4e0d8373d6e918547bc7f95abef Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Sat, 11 Dec 2021 14:37:21 +0000 Subject: gnu: sbcl-geco: Update to 2.1.2. * gnu/packages/lisp-xyz.scm (sbcl-geco): Update to 2.1.2. [home-page]: Update home page. [license]: Fix license. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) (limited to 'gnu/packages/lisp-xyz.scm') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 22c9479c9f..e25d0f5488 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12650,25 +12650,28 @@ XML to Lisp structures or s-expressions and back.") ((#:tests? _ #f) #f)))))) (define-public sbcl-geco - (package - (name "sbcl-geco") - (version "2.1.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gpwwjr/GECO") - (commit (string-append "v" version)))) - (file-name (git-file-name "geco" version)) - (sha256 - (base32 "1rc8a4mk40hjx5qy980hjylv6xxqdbq38hg8c4w30y93abfd519s")))) - (build-system asdf-build-system/sbcl) - (home-page "http://hiwaay.net/~gpw/geco/geco.html") - (synopsis "Genetic algorithm toolkit for Common Lisp") - (description - "GECO (Genetic Evolution through Combination of Objects) is an extensible, -object-oriented framework for prototyping genetic algorithms in Common Lisp.") - (license license:lgpl2.1+))) + (let ((commit "db13c9384491092975f46f6a837ccdc04681a93a") + (revision "1")) + (package + (name "sbcl-geco") + (version (git-version "2.1.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gpwwjr/GECO") + (commit commit))) + (file-name (git-file-name "cl-geco" version)) + (sha256 + (base32 "1ncaf9ab7jz59zmga0p97blsjjb1m6db0qih57wipfhqdb5ylz17")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/gpwwjr/GECO") + (synopsis "Genetic algorithm toolkit for Common Lisp") + (description + "GECO (Genetic Evolution through Combination of Objects) is an +extensible, object-oriented framework for prototyping genetic algorithms in +Common Lisp.") + (license license:lgpl2.0+)))) (define-public cl-geco (sbcl-package->cl-source-package sbcl-geco)) -- cgit 1.4.1