From 074236d19796577b2f55b3c7030c14242efa8f3f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 30 Nov 2020 12:28:38 +0100 Subject: gnu: clisp: Enable ASDF module and parallel build, remove old patch. * gnu/packages/lisp.scm (clisp)[source]: Remove patch that does not seem to be needed anymore. [arguments]: Remove (obsolete?) #:build keyword. Enable ASDF and explicitly enable ffcall, readline, sigsegv. Enable parallel-build since they seem to work now. --- gnu/packages/lisp.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a3139c21c8..70f0ceadb0 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -331,8 +331,7 @@ 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) (inputs `(("libffcall" ,libffcall) ("ncurses" ,ncurses) @@ -346,8 +345,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 +367,7 @@ 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))))) (home-page "https://clisp.sourceforge.io/") (synopsis "A Common Lisp implementation") (description -- cgit v1.2.3 From 40bfe1168f7909a5ef3c6ae3486ea341129eaae7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 30 Nov 2020 12:30:00 +0100 Subject: gnu: sbcl: Update to 2.0.11. * gnu/packages/lisp.scm (sbcl): Update to 2.0.11. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 70f0ceadb0..f0f5c018c8 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -379,14 +379,14 @@ an interpreter, a compiler, a debugger, and much more.") (define-public sbcl (package (name "sbcl") - (version "2.0.10") + (version "2.0.11") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "0mq5ga977hzsq4wgv31l8d6rpa186q8xc4x2awwcskf5nq842xai")))) + (base32 "07cpswxh2f38b440xdn3fjk7b4r0ipj3sbwb3jd134phrr9smll7")))) (build-system gnu-build-system) (outputs '("out" "doc")) (native-inputs -- cgit v1.2.3 From c3e459d266992939a190b9c36d7446ffeed8535a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 30 Nov 2020 19:42:04 +0100 Subject: gnu: sbcl: Increase default maximum heap size. * gnu/packages/lisp.scm (sbcl)[arguments]: Build with a max heap size of 3 GiB. --- gnu/packages/lisp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f0f5c018c8..681aaac68d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -507,7 +507,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 -- cgit v1.2.3 From ab15cf5a6d25c710183acdad94ede86135423d30 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 1 Dec 2020 11:14:46 +0100 Subject: gnu: Add lisp-repl-core-dumper. * gnu/packages/lisp.scm (lisp-repl-core-dumper): New variable. --- gnu/packages/lisp.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 681aaac68d..a0997f2337 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -44,6 +44,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) @@ -1048,3 +1049,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.1.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 "1n6hlmppn3k8hmwmr21mnapzpvgdcagg17b8a3zz2aa128611s5s")))) + (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) + (("\\") sed) + (("\\") 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+))) -- cgit v1.2.3 From 9fe5bb7c9217f247a0fbbc72467ba5de3a6ddf03 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 2 Dec 2020 10:38:07 +0100 Subject: gnu: lisp-repl-core-dumper: Update to 0.2.0. * gnu/packages/lisp.scm (lisp-repl-core-dumper): Update to 0.2.0. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a0997f2337..78f790ca05 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1053,7 +1053,7 @@ assembler, PEG) is less than 1MB.") (define-public lisp-repl-core-dumper (package (name "lisp-repl-core-dumper") - (version "0.1.0") + (version "0.2.0") (source (origin (method git-fetch) @@ -1062,7 +1062,7 @@ assembler, PEG) is less than 1MB.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1n6hlmppn3k8hmwmr21mnapzpvgdcagg17b8a3zz2aa128611s5s")))) + (base32 "0ghiqwl7bgzxfqg6hpmyqazr9mi0v5k9byqa3myg5462csvgb754")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit v1.2.3 From 75b11d671388b4f16f27a54eb89b30da90494f60 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 3 Dec 2020 12:33:52 +0100 Subject: gnu: lisp-repl-core-dumper: Update to 0.3.0. * gnu/packages/lisp.scm (lisp-repl-core-dumper): Update to 0.3.0. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 78f790ca05..e4c963070e 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1053,7 +1053,7 @@ assembler, PEG) is less than 1MB.") (define-public lisp-repl-core-dumper (package (name "lisp-repl-core-dumper") - (version "0.2.0") + (version "0.3.0") (source (origin (method git-fetch) @@ -1062,7 +1062,7 @@ assembler, PEG) is less than 1MB.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0ghiqwl7bgzxfqg6hpmyqazr9mi0v5k9byqa3myg5462csvgb754")))) + (base32 "1w7x7d7bnrdj0bd04vnjy7d7sngvcx1yjr4iw429hdd9lzlg8rbg")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit v1.2.3 From 031fbebafef81244a72e584a46b3fcc219256fcb Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 3 Dec 2020 14:52:02 +0100 Subject: gnu: cl-asdf: Improve priorities of configuration file search. * gnu/packages/patches/cl-asdf-config-directories.patch: New file. * gnu/local.mk (dist_PATCH_DATA): Add it. * gnu/packages/lisp.scm (cl-asdf)[native-inputs]: Add it. [arguments]: Apply the new patch. Co-authored-by: Pierre Neidhardt --- gnu/local.mk | 1 + gnu/packages/lisp.scm | 28 ++++---------- .../patches/cl-asdf-config-directories.patch | 44 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/cl-asdf-config-directories.patch (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 28ad119846..f838ebe1fa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -868,6 +868,7 @@ dist_patch_DATA = \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ %D%/packages/patches/chmlib-inttypes.patch \ + %D%/packages/patches/cl-asdf-config-directories.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ %D%/packages/patches/clamav-system-tomsfastmath.patch \ %D%/packages/patches/clang-3.5-libc-search-path.patch \ diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index e4c963070e..0038cb0dca 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -90,6 +90,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)) @@ -101,28 +104,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 diff --git a/gnu/packages/patches/cl-asdf-config-directories.patch b/gnu/packages/patches/cl-asdf-config-directories.patch new file mode 100644 index 0000000000..2b1b51932c --- /dev/null +++ b/gnu/packages/patches/cl-asdf-config-directories.patch @@ -0,0 +1,44 @@ +Search for ASDF configuration files first in user directories, and then in +Guix profiles. + +diff -ru a/asdf-3.3.4.lisp b/asdf-3.3.4.lisp +--- a/asdf-3.3.4.lisp 2020-02-14 20:16:22.000000000 +0100 ++++ b/asdf-3.3.4.lisp 2020-12-05 11:09:56.066229482 +0100 +@@ -12535,10 +12535,15 @@ + (find-preferred-file (system-config-pathnames *output-translations-file*) + :direction direction)) + (defun user-output-translations-directory-pathname (&key (direction :input)) +- (xdg-config-pathname *output-translations-directory* direction)) +- (defun system-output-translations-directory-pathname (&key (direction :input)) +- (find-preferred-file (system-config-pathnames *output-translations-directory*) ++ (find-preferred-file (list (xdg-config-home *output-translations-directory*)) + :direction direction)) ++ (defun system-output-translations-directory-pathname (&key (direction :input)) ++ `(:output-translations ++ ,@(loop :for dir :in (filter-pathname-set ++ (xdg-config-dirs ++ "common-lisp/asdf-output-translations.conf.d/")) ++ :collect `(:include ,dir)) ++ :inherit-configuration)) + (defun environment-output-translations () + (getenv "ASDF_OUTPUT_TRANSLATIONS")) + +@@ -12921,10 +12926,15 @@ + (find-preferred-file (system-config-pathnames *source-registry-file*) + :direction direction)) + (defun user-source-registry-directory (&key (direction :input)) +- (xdg-config-pathname *source-registry-directory* direction)) +- (defun system-source-registry-directory (&key (direction :input)) +- (find-preferred-file (system-config-pathnames *source-registry-directory*) ++ (find-preferred-file (list (xdg-config-home *source-registry-directory*)) + :direction direction)) ++ (defun system-source-registry-directory (&key (direction :input)) ++ `(:source-registry ++ ,@(loop :for dir :in (filter-pathname-set ++ (xdg-config-dirs ++ "common-lisp/source-registry.conf.d/")) ++ :collect `(:include ,dir)) ++ :inherit-configuration)) + (defun environment-source-registry () + (getenv "CL_SOURCE_REGISTRY")) + -- cgit v1.2.3 From 623a98a9dcc5878dc16595b7716b8c44fc7bbef8 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 4 Dec 2020 10:29:34 +0100 Subject: gnu: ccl: Use system ASDF instead of bundled one. * gnu/packages/lisp.scm (ccl)[native-inputs]: Add cl-asdf. [arguments]: Add 'replace-asdf' phase. [native-search-paths]: Add XDG_CONFIG_DIRS and XDG_DATA_DIRS. --- gnu/packages/lisp.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 0038cb0dca..a4cbc28ffc 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -603,7 +603,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) @@ -615,6 +616,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 @@ -678,6 +689,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") -- cgit v1.2.3 From c32a7b348556532756615fc92bccf43bd0373c03 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 4 Dec 2020 10:48:41 +0100 Subject: gnu: clisp: Use system ASDF instead of bundled one. * gnu/packages/lisp.scm (clisp)[native-inputs]: Add cl-asdf. [arguments]: Add 'replace-asdf' phase. [native-search-paths]: Add XDG_CONFIG_DIRS and XDG_DATA_DIRS. --- gnu/packages/lisp.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a4cbc28ffc..2ec4da8fbb 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -322,6 +322,8 @@ supporting ASDF, Sockets, Gray streams, MOP, and other useful components.") (sha256 (base32 "0k2dmgl0miz3767iks4p0mvp6xw0ysyxhjpklyh11j010rmh6hqb")))) (build-system gnu-build-system) + (native-inputs + `(("cl-asdf" ,cl-asdf))) (inputs `(("libffcall" ,libffcall) ("ncurses" ,ncurses) ("readline" ,readline) @@ -356,7 +358,24 @@ supporting ASDF, Sockets, Gray streams, MOP, and other useful components.") (("/bin/sh") "sh")) (substitute* '("src/clisp-link.in") (("/bin/pwd") "pwd")) - #t))))) + #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 -- cgit v1.2.3 From f62982d96d1ee51a0ae47c171a6cfda6efa36c78 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 5 Dec 2020 10:11:38 +0100 Subject: gnu: ecl: Simplify 'replace-asdf' phase. * gnu/packages/lisp.scm (ecl)[arguments]: Remove unused 'out' variable in 'replace-asdf' phase. --- gnu/packages/lisp.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 2ec4da8fbb..a540174c88 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -250,12 +250,11 @@ 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)) -- cgit v1.2.3 From 4354dacede0bb7ca73c68594753bc973ff6ca653 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 5 Dec 2020 10:22:42 +0100 Subject: gnu: sbcl: Simplify 'replace-asdf' phase. * gnu/packages/lisp.scm (sbcl)[arguments]: Remove unused 'out' variable in 'replace-asdf' phase. --- gnu/packages/lisp.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a540174c88..3d446290a7 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -444,12 +444,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)) -- cgit v1.2.3 From e3f538969ef250b5a4a720834f9f6e54aaf72a19 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 12 Dec 2020 10:33:37 +0800 Subject: gnu: ecl: Return #t in wrap phase. * gnu/packages/lisp.scm (ecl)[arguments]: In phase "wrap", return #t. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3d446290a7..4592724867 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -280,7 +280,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 _ -- cgit v1.2.3 From 20a964149cd51d06f3560287126111490a502581 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 12 Dec 2020 10:34:37 +0800 Subject: gnu: ecl: Remove build-stamp to improve reproducibility. * gnu/packages/lisp.scm (ecl)[arguments]: Add "remove-build-stamp" phase. Move "wrap" phase after "remove-build-stamp" phase. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 4592724867..f250e8804b 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2019 Jesse Gildersleve ;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -258,7 +259,12 @@ interface to the Tk widget system.") (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) -- cgit v1.2.3 From 069ee21808d4ca4105bf40381a891f6111fff176 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 28 Dec 2020 14:35:19 +0100 Subject: gnu: txr: Update to 245. * gnu/packages/lisp.scm (txr): Update to 245. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f250e8804b..9753926d13 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -840,7 +840,7 @@ enough to play the original mainframe Zork all the way through.") (define-public txr (package (name "txr") - (version "244") + (version "245") (source (origin (method git-fetch) @@ -849,7 +849,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 "1pnajvqhzjlw0rwwhhk4hyps5pbg9njh10iqhnmvl1xnah6ff94z")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 32feb2c5f6c33421836cc525aed730be83799939 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 30 Dec 2020 22:35:20 +0100 Subject: gnu: sbcl: Update to 2.1.0. * gnu/packages/lisp.scm (sbcl): Update to 2.1.0. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 9753926d13..603bbab736 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -393,14 +393,14 @@ an interpreter, a compiler, a debugger, and much more.") (define-public sbcl (package (name "sbcl") - (version "2.0.11") + (version "2.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "07cpswxh2f38b440xdn3fjk7b4r0ipj3sbwb3jd134phrr9smll7")))) + (base32 "0k12m2z60fnq64m8dgivprs2mvrsnmp7c5ipzx7jzkprcsymdvh5")))) (build-system gnu-build-system) (outputs '("out" "doc")) (native-inputs -- cgit v1.2.3 From 88a4e5f19b7288d73a70115e3c80a8dbcb2c04d7 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 2 Jan 2021 10:48:08 +0100 Subject: gnu: txr: Update to 246. * gnu/packages/lisp.scm (txr): Update to 246. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 603bbab736..9ef37d706b 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -840,7 +840,7 @@ enough to play the original mainframe Zork all the way through.") (define-public txr (package (name "txr") - (version "245") + (version "246") (source (origin (method git-fetch) @@ -849,7 +849,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 "1pnajvqhzjlw0rwwhhk4hyps5pbg9njh10iqhnmvl1xnah6ff94z")))) + (base32 "1ynkz0ss7nn1ssiaxagpq80iabknf085nk0pra9hn8y9hx7av0db")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3