amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'staging' into 'core-updates'.

Browse source 
Conflicts:

	gnu/local.mk
	gnu/packages/cmake.scm
	gnu/packages/curl.scm
	gnu/packages/gl.scm
	gnu/packages/glib.scm
	gnu/packages/guile.scm
	gnu/packages/node.scm
	gnu/packages/openldap.scm
	gnu/packages/package-management.scm
	gnu/packages/python-xyz.scm
	gnu/packages/python.scm
	gnu/packages/tls.scm
	gnu/packages/vpn.scm
	gnu/packages/xorg.scm
This commit is contained in:
Maxim Cournoyer 2021-01-13 23:39:52 -05:00
commit 01f0707207
No known key found for this signature in database
GPG key ID: 1260E46482E63562
407 changed files with 75910 additions and 10423 deletions
Download patch file Download diff file Expand all files Collapse all files

154
gnu/packages/lisp.scm
View file

@ -16,6 +16,7 @@
;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -44,6 +45,7 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system ant)
#:use-module (guix build-system asdf)
@ -89,6 +91,9 @@
(sha256
(base32 "1hpx30f6yrak15nw992k7x3pn75ahvjs04n4f134k68mhgs62km2"))))
(build-system trivial-build-system)
(native-inputs
`(("config-patch" ,@(search-patches "cl-asdf-config-directories.patch"))
("patch" ,patch)))
(arguments
`(#:modules ((guix build utils)
(guix build lisp-utils))
@ -100,28 +105,13 @@
(asdf-install (string-append out %source-install-prefix
"/source/asdf/"))
(src-asdf (string-append (assoc-ref %build-inputs "source")))
(dst-asdf (string-append asdf-install "asdf.lisp")))
(dst-asdf (string-append asdf-install "asdf.lisp"))
(patch (string-append (assoc-ref %build-inputs "patch")
"/bin/patch"))
(config-patch (assoc-ref %build-inputs "config-patch")))
(mkdir-p asdf-install)
(copy-file src-asdf dst-asdf)
;; Patch ASDF to make it read the configuration files in all
;; the direcories listed in '$XDG_CONFIG_DIRS' instead of just
;; the first.
(substitute* dst-asdf
(("\\(xdg-config-pathname \\*source-registry-directory\\* direction\\)")
"`(:source-registry
,@(loop
for dir in (xdg-config-dirs
\"common-lisp/source-registry.conf.d/\")
collect `(:include ,dir))
:inherit-configuration)")
(("\\(xdg-config-pathname \\*output-translations-directory\\* direction\\)")
"`(:output-translations
,@(loop
for dir in (xdg-config-dirs
\"common-lisp/asdf-output-translations.conf.d/\")
collect `(:include ,dir))
:inherit-configuration)")))
#t)))
(invoke patch "-p1" "-i" config-patch dst-asdf)))))
(home-page "https://common-lisp.net/project/asdf/")
(synopsis "Another System Definition Facility")
(description
@ -261,16 +251,20 @@ interface to the Tk widget system.")
(delete 'check)
(add-after 'unpack 'replace-asdf
;; Use system ASDF instead of bundled one.
(lambda* (#:key inputs outputs #:allow-other-keys)
(lambda* (#:key inputs #:allow-other-keys)
(let* ((cl-asdf (assoc-ref inputs "cl-asdf"))
(guix-asdf (string-append
cl-asdf
"/share/common-lisp/source/asdf/asdf.lisp"))
(out (string-append (assoc-ref outputs "out")))
(contrib-asdf "contrib/asdf/asdf.lisp"))
(copy-file guix-asdf contrib-asdf))
#t))
(add-after 'install 'wrap
(add-after 'install 'remove-build-stamp
(lambda* (#:key outputs #:allow-other-keys)
(delete-file (string-append (assoc-ref outputs "out")
"/lib/ecl-" ,version "/build-stamp"))
#t))
(add-after 'remove-build-stamp 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((ecl (assoc-ref outputs "out"))
(input-path (lambda (lib path)
@ -292,7 +286,8 @@ interface to the Tk widget system.")
(input-path lib "/include"))
`("kernel-headers" ,@libraries)))
`("LIBRARY_PATH" suffix ,library-directories)
`("LD_LIBRARY_PATH" suffix ,library-directories)))))
`("LD_LIBRARY_PATH" suffix ,library-directories))
#t)))
(add-after 'wrap 'check (assoc-ref %standard-phases 'check))
(add-before 'check 'fix-path-to-ecl
(lambda _
@ -331,9 +326,10 @@ supporting ASDF, Sockets, Gray streams, MOP, and other useful components.")
(commit "clisp-2.49.92-2018-02-18")))
(file-name (git-file-name name version))
(sha256
(base32 "0k2dmgl0miz3767iks4p0mvp6xw0ysyxhjpklyh11j010rmh6hqb"))
(patches (search-patches "clisp-remove-failing-test.patch"))))
(base32 "0k2dmgl0miz3767iks4p0mvp6xw0ysyxhjpklyh11j010rmh6hqb"))))
(build-system gnu-build-system)
(native-inputs
`(("cl-asdf" ,cl-asdf)))
(inputs `(("libffcall" ,libffcall)
("ncurses" ,ncurses)
("readline" ,readline)
@ -346,8 +342,11 @@ supporting ASDF, Sockets, Gray streams, MOP, and other useful components.")
'())
"--with-dynamic-ffi"
"--with-dynamic-modules"
"--with-ffcall"
"--with-readline"
"--with-sigsegv"
"--with-module=asdf"
"--with-module=rawsock")
#:build #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-sh-and-pwd
@ -365,9 +364,24 @@ supporting ASDF, Sockets, Gray streams, MOP, and other useful components.")
(("/bin/sh") "sh"))
(substitute* '("src/clisp-link.in")
(("/bin/pwd") "pwd"))
#t)))
;; Makefiles seem to have race conditions.
#:parallel-build? #f))
#t))
(add-after 'unpack 'replace-asdf
;; Use system ASDF instead of bundled one.
(lambda* (#:key inputs #:allow-other-keys)
(let* ((cl-asdf (assoc-ref inputs "cl-asdf"))
(guix-asdf (string-append
cl-asdf
"/share/common-lisp/source/asdf/asdf.lisp"))
(contrib-asdf "modules/asdf/asdf.lisp"))
(delete-file contrib-asdf)
(copy-file guix-asdf contrib-asdf)))))))
(native-search-paths
(list (search-path-specification
(variable "XDG_DATA_DIRS")
(files '("share")))
(search-path-specification
(variable "XDG_CONFIG_DIRS")
(files '("etc")))))
(home-page "https://clisp.sourceforge.io/")
(synopsis "A Common Lisp implementation")
(description
@ -379,14 +393,14 @@ an interpreter, a compiler, a debugger, and much more.")
(define-public sbcl
(package
(name "sbcl")
(version "2.0.10")
(version "2.1.0")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-"
version "-source.tar.bz2"))
(sha256
(base32 "0mq5ga977hzsq4wgv31l8d6rpa186q8xc4x2awwcskf5nq842xai"))))
(base32 "0k12m2z60fnq64m8dgivprs2mvrsnmp7c5ipzx7jzkprcsymdvh5"))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
(native-inputs
@ -437,12 +451,11 @@ an interpreter, a compiler, a debugger, and much more.")
;; of ASDF we use to build software; therefore, replace the contrib
;; ASDF with the version packaged into Guix.
;; [1] - https://bugs.launchpad.net/sbcl/+bug/1823442
(lambda* (#:key inputs outputs #:allow-other-keys)
(lambda* (#:key inputs #:allow-other-keys)
(let* ((cl-asdf (assoc-ref inputs "cl-asdf"))
(guix-asdf (string-append
cl-asdf
"/share/common-lisp/source/asdf/asdf.lisp"))
(out (string-append (assoc-ref outputs "out")))
(contrib-asdf "contrib/asdf/asdf.lisp"))
(copy-file guix-asdf contrib-asdf))
#t))
@ -503,7 +516,7 @@ an interpreter, a compiler, a debugger, and much more.")
`("clisp")))
(string-append "--prefix="
(assoc-ref outputs "out"))
"--dynamic-space-size=2Gb"
"--dynamic-space-size=3072"
"--with-sb-core-compression"
"--with-sb-xref-for-internals")))
(replace 'install
@ -610,7 +623,8 @@ statistical profiler, a code coverage tool, and many other extensions.")
"0x4bjx6cxsjvxyagijhlvmc7jkyxifdvz5q5zvz37028va65243c")
(_ "15l7cfa4a7jkfwdzsfm4q3n22jnb57imxahpql3h77xin57v1gbz"))))))))
(native-inputs
`(("m4" ,m4)))
`(("cl-asdf" ,cl-asdf)
("m4" ,m4)))
(arguments
`(#:tests? #f ;no 'check' target
#:modules ((ice-9 match)
@ -622,6 +636,16 @@ statistical profiler, a code coverage tool, and many other extensions.")
(add-after 'unpack 'unpack-image
(lambda* (#:key inputs #:allow-other-keys)
(invoke "tar" "xzvf" (assoc-ref inputs "ccl-bootstrap"))))
(add-after 'unpack 'replace-asdf
;; Use system ASDF instead of bundled one.
(lambda* (#:key inputs #:allow-other-keys)
(let* ((cl-asdf (assoc-ref inputs "cl-asdf"))
(guix-asdf (string-append
cl-asdf
"/share/common-lisp/source/asdf/asdf.lisp"))
(contrib-asdf "tools/asdf.lisp"))
(delete-file contrib-asdf)
(copy-file guix-asdf contrib-asdf))))
(delete 'configure)
(add-before 'build 'pre-build
;; Enter the source directory for the current platform's lisp
@ -685,6 +709,13 @@ statistical profiler, a code coverage tool, and many other extensions.")
"exec -a \"$0\" " libdir kernel " \"$@\"\n"))))
(chmod wrapper #o755))
#t)))))
(native-search-paths
(list (search-path-specification
(variable "XDG_DATA_DIRS")
(files '("share")))
(search-path-specification
(variable "XDG_CONFIG_DIRS")
(files '("etc")))))
(supported-systems '("i686-linux" "x86_64-linux" "armhf-linux"))
(home-page "https://ccl.clozure.com/")
(synopsis "Common Lisp implementation")
@ -805,7 +836,7 @@ enough to play the original mainframe Zork all the way through.")
(define-public txr
(package
(name "txr")
(version "244")
(version "246")
(source
(origin
(method git-fetch)
@ -814,7 +845,7 @@ enough to play the original mainframe Zork all the way through.")
(commit (string-append "txr-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1bzhb1pms6gjzphbsimhwdyq46ik1m7sgldigg5l1q7bppg9r3i0"))))
(base32 "1ynkz0ss7nn1ssiaxagpq80iabknf085nk0pra9hn8y9hx7av0db"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@ -1044,3 +1075,50 @@ embedding a single C file and two headers. It can be easily ported to new
platforms. The entire language (core library, interpreter, compiler,
assembler, PEG) is less than 1MB.")
(license license:expat)))
(define-public lisp-repl-core-dumper
(package
(name "lisp-repl-core-dumper")
(version "0.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/ambrevar/lisp-repl-core-dumper.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1w7x7d7bnrdj0bd04vnjy7d7sngvcx1yjr4iw429hdd9lzlg8rbg"))))
(build-system copy-build-system)
(arguments
'(#:install-plan
'(("lisp-repl-core-dumper" "bin/"))
#:phases
(modify-phases %standard-phases
(add-before 'install 'fix-utils-path
(lambda* (#:key inputs #:allow-other-keys)
(let* ((coreutils (string-append (assoc-ref inputs "coreutils") "/bin/"))
(paste (string-append coreutils "paste"))
(sort (string-append coreutils "sort"))
(basename (string-append coreutils "basename"))
(sed (string-append (assoc-ref inputs "sed") "/bin/sed")))
(substitute* "lisp-repl-core-dumper"
(("\\$\\(basename") (string-append "$(" basename))
(("\\<paste\\>") paste)
(("\\<sed\\>") sed)
(("\\<sort\\>") sort))))))))
(inputs
`(("coreutils" ,coreutils-minimal)
("sed" ,sed)))
(home-page "https://gitlab.com/ambrevar/lisp-repl-core-dumper")
(synopsis "Generate REPL-optimized Lisp cores on demand")
(description
"This tool generates Lisp images that can embed the provided systems
and make for REPLs that start blazing fast.
@itemize
@item It’s portable and should work with any compiler.
@item It works for any REPL.
@item It allows you to include arbitrary libraries.
@end itemize\n")
(license license:gpl3+)))