mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in: gnu/packages/ibus.scm gnu/packages/image.scm gnu/packages/lisp.scm gnu/packages/virtualization.scm
This commit is contained in:
Maxim Cournoyer
commit
839bb4616f
599 changed files with 326965 additions and 238699 deletions
|
|
@ -14,7 +14,7 @@
|
|||
;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;; Copyright © 2019, 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
|
||||
;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
|
||||
;;; Copyright © 2019, 2020, 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2019-2023 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
|
||||
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
|
|
@ -54,8 +54,6 @@
|
|||
#: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)
|
||||
#:use-module (guix build-system haskell)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (gnu packages admin)
|
||||
|
|
@ -141,117 +139,124 @@ Definition Facility.")
|
|||
(license license:expat)))
|
||||
|
||||
(define-public gcl
|
||||
(let ((commit "ff7ef981765cc0efdb4b1db27c292f5c11a72753")
|
||||
(revision "3")) ;Guix package revision
|
||||
(package
|
||||
(name "gcl")
|
||||
(version (git-version "2.6.12" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.savannah.gnu.org/r/gcl.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0z64fxxcaial2i1s1hms8r095dm1ff3wd8ivwdx894a3yln9c0an"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:parallel-build? #f ; The build system seems not to be thread safe.
|
||||
#:test-target "ansi-tests/test_results"
|
||||
#:configure-flags ,#~(list
|
||||
"--enable-ansi" ; required by the maxima package
|
||||
(string-append "CFLAGS=-I"
|
||||
#$(this-package-input "libtirpc")
|
||||
"/include/tirpc")
|
||||
(string-append "LDFLAGS=-L"
|
||||
#$(this-package-input "libtirpc")
|
||||
"/lib")
|
||||
"LIBS=-ltirpc")
|
||||
#:make-flags ,#~(let ((gcc (search-input-file %build-inputs "/bin/gcc")))
|
||||
(list (string-append "GCL_CC=" gcc)
|
||||
(string-append "CC=" gcc)))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'realpath-workaround
|
||||
;; Calls to the realpath function can set errno even if the return
|
||||
;; value of the function indicates that there is no error, which
|
||||
;; make massert consider that there was an error.
|
||||
(lambda _
|
||||
(substitute* "gcl/o/main.c"
|
||||
(("massert\\(realpath\\(s,o\\)\\);" all)
|
||||
"massert((realpath(s, o) != NULL) && ((errno = 0) == 0));"))))
|
||||
(add-after 'unpack 'fix-makefile
|
||||
;; The "final" target doesn't exist.
|
||||
(lambda _
|
||||
(substitute* "gcl/makefile"
|
||||
(("\\$\\(MAKE\\) -C \\$\\(PORTDIR\\) final")
|
||||
"$(MAKE) -C $(PORTDIR)"))))
|
||||
(add-before 'configure 'pre-conf
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(chdir "gcl")
|
||||
(substitute*
|
||||
(append
|
||||
'("pcl/impl/kcl/makefile.akcl"
|
||||
"add-defs"
|
||||
"unixport/makefile.dos"
|
||||
"add-defs.bat"
|
||||
"gcl-tk/makefile.prev"
|
||||
"add-defs1")
|
||||
(find-files "h" "\\.defs"))
|
||||
(("SHELL=/bin/bash")
|
||||
(string-append "SHELL=" (which "bash")))
|
||||
(("SHELL=/bin/sh")
|
||||
(string-append "SHELL=" (which "sh"))))
|
||||
(substitute* "h/linux.defs"
|
||||
(("#CC") "CC")
|
||||
(("-fwritable-strings") "")
|
||||
(("-Werror") ""))
|
||||
(substitute* "lsp/gcl_top.lsp"
|
||||
(("\"cc\"")
|
||||
(string-append "\"" (assoc-ref %build-inputs "gcc")
|
||||
"/bin/gcc\""))
|
||||
(("\\(or \\(get-path \\*cc\\*\\) \\*cc\\*\\)") "*cc*")
|
||||
(("\"ld\"")
|
||||
(string-append "\"" (assoc-ref %build-inputs "binutils")
|
||||
"/bin/ld\""))
|
||||
(("\\(or \\(get-path \\*ld\\*\\) \\*ld\\*\\)") "*ld*")
|
||||
(("\\(get-path \"objdump --source \"\\)")
|
||||
(string-append "\"" (assoc-ref %build-inputs "binutils")
|
||||
"/bin/objdump --source \"")))
|
||||
#t))
|
||||
(add-after 'install 'wrap
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((gcl (assoc-ref outputs "out"))
|
||||
(input-path (lambda (lib path)
|
||||
(string-append
|
||||
(assoc-ref inputs lib) path)))
|
||||
(binaries '("binutils")))
|
||||
;; GCC and the GNU binutils are necessary for GCL to be
|
||||
;; able to compile Lisp functions and programs (this is
|
||||
;; a standard feature in Common Lisp). While the
|
||||
;; the location of GCC is specified in the make-flags,
|
||||
;; the GNU binutils must be available in GCL's $PATH.
|
||||
(wrap-program (string-append gcl "/bin/gcl")
|
||||
`("PATH" prefix ,(map (lambda (binary)
|
||||
(input-path binary "/bin"))
|
||||
binaries))))
|
||||
#t))
|
||||
;; drop strip phase to make maxima build, see
|
||||
;; https://www.ma.utexas.edu/pipermail/maxima/2008/009769.html
|
||||
(delete 'strip))))
|
||||
(inputs
|
||||
(list bash-minimal gmp libtirpc readline))
|
||||
(native-inputs
|
||||
(list m4 texinfo))
|
||||
(home-page "https://www.gnu.org/software/gcl/")
|
||||
(synopsis "Common Lisp implementation")
|
||||
(description "GCL is an implementation of the Common Lisp language. It
|
||||
(package
|
||||
(name "gcl")
|
||||
(version "2.6.14")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.savannah.gnu.org/r/gcl.git")
|
||||
(commit (string-append "Version_"
|
||||
(string-map (lambda (c)
|
||||
(if (char=? c #\.) #\_ c))
|
||||
version)))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1b9m02rfnyflsr8n57v7llxz5m3mi7ip3ypwdww4pdhbgh0lzyg7"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:parallel-build? #f ; The build system seems not to be thread safe.
|
||||
#:test-target "ansi-tests/test_results"
|
||||
#:configure-flags #~(list
|
||||
"--enable-ansi" ; required by the maxima package
|
||||
(string-append "CFLAGS=-I"
|
||||
#$(this-package-input "libtirpc")
|
||||
"/include/tirpc")
|
||||
(string-append "LDFLAGS=-L"
|
||||
#$(this-package-input "libtirpc")
|
||||
"/lib")
|
||||
"LIBS=-ltirpc")
|
||||
#:make-flags #~(let ((gcc (search-input-file %build-inputs "/bin/gcc")))
|
||||
(list (string-append "GCL_CC=" gcc)
|
||||
(string-append "CC=" gcc)))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'realpath-workaround
|
||||
;; Calls to the realpath function can set errno even if the return
|
||||
;; value of the function indicates that there is no error, which
|
||||
;; make massert consider that there was an error.
|
||||
(lambda _
|
||||
(substitute* "gcl/o/main.c"
|
||||
(("massert\\(realpath\\(s,o\\)\\);" all)
|
||||
"massert((realpath(s, o) != NULL) && ((errno = 0) == 0));"))))
|
||||
(add-after 'unpack 'fix-missing-enum
|
||||
(lambda _
|
||||
;; The 'disassembler_style' enum is not defined anywhere,
|
||||
;; and the parameter is not used...
|
||||
(substitute* "gcl/o/main.c"
|
||||
(("my_fprintf_styled\\(void \\*v,enum disassembler_style,")
|
||||
"my_fprintf_styled(void *v,int disassembler_style,"))))
|
||||
(add-after 'unpack 'fix-makefile
|
||||
;; The "final" target doesn't exist.
|
||||
(lambda _
|
||||
(substitute* "gcl/makefile"
|
||||
(("\\$\\(MAKE\\) -C \\$\\(PORTDIR\\) final")
|
||||
"$(MAKE) -C $(PORTDIR)"))))
|
||||
(add-before 'configure 'pre-conf
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(chdir "gcl")
|
||||
(substitute*
|
||||
(append
|
||||
'("pcl/impl/kcl/makefile.akcl"
|
||||
"add-defs"
|
||||
"unixport/makefile.dos"
|
||||
"add-defs.bat"
|
||||
"gcl-tk/makefile.prev"
|
||||
"add-defs1")
|
||||
(find-files "h" "\\.defs"))
|
||||
(("SHELL=/bin/bash")
|
||||
(string-append "SHELL=" (which "bash")))
|
||||
(("SHELL=/bin/sh")
|
||||
(string-append "SHELL=" (which "sh"))))
|
||||
(substitute* "h/linux.defs"
|
||||
(("#CC") "CC")
|
||||
(("-fwritable-strings") "")
|
||||
(("-Werror") ""))
|
||||
(substitute* "lsp/gcl_top.lsp"
|
||||
(("\"cc\"")
|
||||
(string-append "\"" (assoc-ref %build-inputs "gcc")
|
||||
"/bin/gcc\""))
|
||||
(("\\(or \\(get-path \\*cc\\*\\) \\*cc\\*\\)") "*cc*")
|
||||
(("\"ld\"")
|
||||
(string-append "\"" (assoc-ref %build-inputs "binutils")
|
||||
"/bin/ld\""))
|
||||
(("\\(or \\(get-path \\*ld\\*\\) \\*ld\\*\\)") "*ld*")
|
||||
(("\\(get-path \"objdump --source \"\\)")
|
||||
(string-append "\"" (assoc-ref %build-inputs "binutils")
|
||||
"/bin/objdump --source \"")))))
|
||||
(add-after 'install 'wrap
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((gcl #$output)
|
||||
(input-path (lambda (lib path)
|
||||
(string-append
|
||||
(assoc-ref inputs lib) path)))
|
||||
(binaries '("binutils")))
|
||||
;; GCC and the GNU binutils are necessary for GCL to be
|
||||
;; able to compile Lisp functions and programs (this is
|
||||
;; a standard feature in Common Lisp). While the
|
||||
;; the location of GCC is specified in the make-flags,
|
||||
;; the GNU binutils must be available in GCL's $PATH.
|
||||
(wrap-program (string-append gcl "/bin/gcl")
|
||||
`("PATH" prefix ,(map (lambda (binary)
|
||||
(input-path binary "/bin"))
|
||||
binaries))))))
|
||||
;; drop strip phase to make maxima build, see
|
||||
;; https://www.ma.utexas.edu/pipermail/maxima/2008/009769.html
|
||||
(delete 'strip))))
|
||||
(inputs
|
||||
(list bash-minimal gmp libtirpc readline))
|
||||
(native-inputs
|
||||
(list m4 texinfo))
|
||||
(home-page "https://www.gnu.org/software/gcl/")
|
||||
(synopsis "Common Lisp implementation")
|
||||
(description "GCL is an implementation of the Common Lisp language. It
|
||||
features the ability to compile to native object code and to load native
|
||||
object code modules directly into its lisp core. It also features a
|
||||
stratified garbage collection strategy, a source-level debugger and a built-in
|
||||
interface to the Tk widget system.")
|
||||
(license license:lgpl2.0+))))
|
||||
(license license:lgpl2.0+)))
|
||||
|
||||
(define-public ecl
|
||||
(package
|
||||
|
|
@ -423,20 +428,14 @@ an interpreter, a compiler, a debugger, and much more.")
|
|||
(define-public sbcl
|
||||
(package
|
||||
(name "sbcl")
|
||||
(version "2.2.11")
|
||||
(version "2.3.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-"
|
||||
version "-source.tar.bz2"))
|
||||
(sha256
|
||||
(base32 "1pwnhjp0fmkcgq11a6hj36gw8k05qramspgdbj28063k2s0dc1rn"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Don't force ARMv5.
|
||||
(substitute* "src/runtime/Config.arm-linux"
|
||||
(("-march=armv5") ""))))))
|
||||
(base32 "1ahyrc3p9cf7y5zbgzvb9yxa8a480ccis4ksijlajck3z8n1dk24"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(native-inputs
|
||||
|
|
@ -655,7 +654,7 @@ an interpreter, a compiler, a debugger, and much more.")
|
|||
(search-path-specification
|
||||
(variable "XDG_CONFIG_DIRS")
|
||||
(files '("etc")))))
|
||||
(home-page "http://www.sbcl.org/")
|
||||
(home-page "https://www.sbcl.org/")
|
||||
(synopsis "Common Lisp implementation")
|
||||
(description "Steel Bank Common Lisp (SBCL) is a high performance Common
|
||||
Lisp compiler. In addition to the compiler and runtime system for ANSI Common
|
||||
|
|
@ -878,7 +877,7 @@ libraries such as OpenGL, SDL, Video4Linux, and ALSA (video/audio
|
|||
grabbing), and others. Lush is an ideal frontend script language for
|
||||
programming projects written in C or other languages. Lush also has
|
||||
libraries for Machine Learning, Neural Nets and statistical estimation.")
|
||||
(home-page "http://lush.sourceforge.net/")
|
||||
(home-page "https://lush.sourceforge.net/")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public confusion-mdl
|
||||
|
|
@ -972,7 +971,7 @@ enough to play the original mainframe Zork all the way through.")
|
|||
(invoke "./configure" "+lang" "en" "+fhs"
|
||||
(string-append "-prefix=" (assoc-ref outputs "out")))
|
||||
#t)))))
|
||||
(home-page "http://www.kylheku.com/cgit/man/")
|
||||
(home-page "https://www.kylheku.com/cgit/man/")
|
||||
(synopsis "Modifications to the man utilities, specifically man2html")
|
||||
(description
|
||||
"This is a fork of the man utilities intended specifically for building
|
||||
|
|
@ -1263,71 +1262,74 @@ assembler, PEG) is less than 1MB.")
|
|||
(license license:expat)))
|
||||
|
||||
(define-public carp
|
||||
(package
|
||||
(name "carp")
|
||||
(version "0.5.5")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/carp-lang/Carp")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"14jdnv0ljqvpr9ych1plfw7hp5q57a8j1bv8h3v345x06z783d07"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; Carp looks inside the sources checkout to know where to
|
||||
;; find its core libraries and other files.
|
||||
;; Carp emits C code and tries to compile it with an external
|
||||
;; C compiler. On Linux it defaults to Clang.
|
||||
(add-after 'install 'wrap-programs
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(define (wrap-carp-program program)
|
||||
(wrap-program (string-append
|
||||
#$output "/bin/" program)
|
||||
`("CARP_DIR" prefix
|
||||
(#$(package-source this-package)))
|
||||
`("PATH" prefix
|
||||
,(list (dirname
|
||||
(search-input-file inputs "bin/clang"))
|
||||
(dirname
|
||||
(search-input-file inputs "bin/ld"))))
|
||||
`("C_INCLUDE_PATH" prefix
|
||||
,(list (dirname
|
||||
(search-input-directory
|
||||
inputs "include/linux"))
|
||||
(dirname
|
||||
(search-input-file
|
||||
inputs "include/stdlib.h"))))))
|
||||
|
||||
(for-each wrap-carp-program
|
||||
(list "carp"
|
||||
"carp-header-parse")))))))
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
clang
|
||||
ghc-blaze-markup
|
||||
ghc-blaze-html
|
||||
ghc-split
|
||||
ghc-ansi-terminal
|
||||
ghc-cmark
|
||||
ghc-edit-distance
|
||||
ghc-hashable
|
||||
ghc-open-browser
|
||||
ghc-optparse-applicative))
|
||||
(native-inputs
|
||||
(list ghc-hunit))
|
||||
(home-page "https://carp-lang.org/")
|
||||
(synopsis "Statically typed Lisp without a garbage collector")
|
||||
(description
|
||||
"@code{carp} is a Lisp-like programming language that compiles to
|
||||
;; Release 0.5.5 does not support GHC 9.2.
|
||||
(let ((commit "339722325ec607091f6035866ebedea2b69080fe")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "carp")
|
||||
(version (git-version "0.5.5" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/carp-lang/Carp")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0w0j3imi4270dsmrh96spsc9xllsk5rrh817l80q1nyay9p53xwd"))))
|
||||
(build-system haskell-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; Carp looks inside the sources checkout to know where to
|
||||
;; find its core libraries and other files.
|
||||
;; Carp emits C code and tries to compile it with an external
|
||||
;; C compiler. On Linux it defaults to Clang.
|
||||
(add-after 'install 'wrap-programs
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(define (wrap-carp-program program)
|
||||
(wrap-program (string-append
|
||||
#$output "/bin/" program)
|
||||
`("CARP_DIR" prefix
|
||||
(#$(package-source this-package)))
|
||||
`("PATH" prefix
|
||||
,(list (dirname
|
||||
(search-input-file inputs "bin/clang"))
|
||||
(dirname
|
||||
(search-input-file inputs "bin/ld"))))
|
||||
`("C_INCLUDE_PATH" prefix
|
||||
,(list (dirname
|
||||
(search-input-directory
|
||||
inputs "include/linux"))
|
||||
(dirname
|
||||
(search-input-file
|
||||
inputs "include/stdlib.h"))))))
|
||||
|
||||
(for-each wrap-carp-program
|
||||
(list "carp"
|
||||
"carp-header-parse")))))))
|
||||
(inputs
|
||||
(list bash-minimal
|
||||
clang
|
||||
ghc-blaze-markup
|
||||
ghc-blaze-html
|
||||
ghc-split
|
||||
ghc-ansi-terminal
|
||||
ghc-cmark
|
||||
ghc-edit-distance
|
||||
ghc-hashable
|
||||
ghc-open-browser
|
||||
ghc-optparse-applicative))
|
||||
(native-inputs
|
||||
(list ghc-hunit))
|
||||
(home-page "https://carp-lang.org/")
|
||||
(synopsis "Statically typed Lisp without a garbage collector")
|
||||
(description
|
||||
"@code{carp} is a Lisp-like programming language that compiles to
|
||||
C. It features inferred static typing, macros, automatic memory
|
||||
management without a garbage collector, a REPL, and straightforward
|
||||
integration with code written in C.")
|
||||
(license license:asl2.0)))
|
||||
(license license:asl2.0))))
|
||||
(define-public lisp-repl-core-dumper
|
||||
(package
|
||||
(name "lisp-repl-core-dumper")
|
||||
|
|
@ -1419,7 +1421,7 @@ executable Common Lisp image. It is similar to cl-launch and hu.dwim.build.")
|
|||
(define-public eisl
|
||||
(package
|
||||
(name "eisl")
|
||||
(version "2.65")
|
||||
(version "2.72")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -1428,7 +1430,7 @@ executable Common Lisp image. It is similar to cl-launch and hu.dwim.build.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1cnis1v70k4wmvw1gmvj3l9qajzncaa9ka8rx67vx12bgrr0811g"))))
|
||||
(base32 "12dc6b70dcfalyq3h5i7lmz39xh310k5p83x5q6j18knd6ql9ik9"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list bash-minimal freeglut gdbm libiconv ncurses tcl tk))
|
||||
|
|
@ -1446,8 +1448,8 @@ executable Common Lisp image. It is similar to cl-launch and hu.dwim.build.")
|
|||
(("\"cc ")
|
||||
"\"gcc "))
|
||||
(substitute* "library/tcltk.lsp"
|
||||
(("c-include \"<tcl/tcl\\.h>\"")
|
||||
"c-include \"<tcl.h>\"")
|
||||
(("include <tcl/tcl\\.h>")
|
||||
"include <tcl.h>")
|
||||
(("c-option \"-ltcl -ltk\" linux")
|
||||
"c-option \"-ltcl8.6 -ltk8.6\" linux"))))
|
||||
(delete 'configure)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue