From unknown Sun Jun 22 22:48:18 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#57103] [PATCH]: Update sbcl to 2.2.7 Resent-From: =?UTF-8?Q?Andr=C3=A9?= A. Gomes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Aug 2022 09:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57103 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57103@debbugs.gnu.org Cc: artyom@atlas.engineer, pierre@atlas.engineer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166012203432336 (code B ref -1); Wed, 10 Aug 2022 09:01:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Aug 2022 09:00:34 +0000 Received: from localhost ([127.0.0.1]:46031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLhZo-0008PQ-V0 for submit@debbugs.gnu.org; Wed, 10 Aug 2022 05:00:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:45946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLhZl-0008PE-VG for submit@debbugs.gnu.org; Wed, 10 Aug 2022 05:00:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLhZg-0007Jw-RM for guix-patches@gnu.org; Wed, 10 Aug 2022 05:00:29 -0400 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]:35488) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLhZc-0006vt-29 for guix-patches@gnu.org; Wed, 10 Aug 2022 05:00:23 -0400 Received: by mail-lf1-x135.google.com with SMTP id z25so20367532lfr.2 for ; Wed, 10 Aug 2022 02:00:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:date:subject:cc:to:from:from:to :cc; bh=yEGWeq2V1uni5lMxQAupW8884x+QCjRR3pnR4BBZniU=; b=HogpB4KQGSM84O2WoXQb6fG3OTpo9Qjeff5zE5ym/o7UZKlD3aG2P8AwovQGR/UuGS IEVzX3NAYBdBwi/Knn/CmMKph07KWBu0CpzCqbBVPCsAKCVrh8Kh3TBEogWqiimW1Gn2 +QUfDFVYfz7WC5bvkr+COPKGcf8mHXUIslPlhRw2/fzS9IN71u4cgPo3Wvy6/b8X/szr p4z3U0XQ3Llrb7/dNnS4z4yaTgfk67zyaZ6R/JEaBCdVcG3st90PaRXRZJXHr3iJmCKE BE0jGGXeFBd+eT3V2U2pSkJsvJZOiM/241YyrnIk0o0ZslvTnVKwf6EDj82cmNwb0O6Y fhvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc; bh=yEGWeq2V1uni5lMxQAupW8884x+QCjRR3pnR4BBZniU=; b=vu8Gbsza97TkrhFflEvGrBZOmAqqTozfPejEQnRusOP8lAWf4eICl2fBhb9WbMW02S MS9bIVECzICqVH/j+Au7EO9YkIP8mY2AoprGlyCiWvZNkEvtu7DBvu1fdRUhWOwWxjvj xn2MpmZBXEt+QGacsXY5dd5tUevcY7bYOcw9087wH6kVADb02uSArfSrtPGbqoAesOEm a3FPxwQEVRIdA7twaS6jZBX5a9qnKyL5T8QBzuTqgDpYrrakJeWtXhEdmhUsmDgCehKq JzUVF65SQIzEvNkhm3f+3njTHScwaWn9wVcRNqqRHwIOioT+C4yazbQFJGm3a3+/lMch h6NA== X-Gm-Message-State: ACgBeo3S42i/mLkr1RZ2qKOdIeeWCR2Aj8Yh1VF98EOINCVkrXgQiYgE c8eavJqVpNXi/iuZ7plMIy4= X-Google-Smtp-Source: AA6agR5j4g/vdQLgH0P16rhILkL2opsup0YckrlJYCwgX7c8UkE8Moigiu3si7fUA8p7F1KqqrnqiA== X-Received: by 2002:a05:6512:b96:b0:48b:19c:5332 with SMTP id b22-20020a0565120b9600b0048b019c5332mr10038558lfv.151.1660122016871; Wed, 10 Aug 2022 02:00:16 -0700 (PDT) Received: from guix-xps13 (95-27-199-45.broadband.corbina.ru. [95.27.199.45]) by smtp.gmail.com with ESMTPSA id s14-20020a2e83ce000000b0025e4dcc48b1sm334709ljh.19.2022.08.10.02.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 02:00:16 -0700 (PDT) From: =?UTF-8?Q?Andr=C3=A9?= A. Gomes Date: Wed, 10 Aug 2022 12:00:14 +0300 Message-ID: <87tu6kscbl.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1.91 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2a00:1450:4864:20::135; envelope-from=andremegafone@gmail.com; helo=mail-lf1-x135.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Guix, The tagged 2.2.7 version of sbcl has some issues. For instance, maxima failed to build. This patch updates sbcl while ensuring that all packages that depend on it build successfully. I tested it by issuing --8<---------------cut here---------------start------------->8--- ./pre-inst-env guix build $(./pre-inst-env guix refresh -l sbcl | cut -d ':= ' -f 2) --8<---------------cut here---------------end--------------->8--- Find the patched attached. Thanks. --=20 Andr=C3=A9 A. Gomes "You cannot even find the ruins..." --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-sbcl-Update-to-2.2.7-0.390809a.patch >From e7687c803d2bb021c4ca89185620383761598303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20A=2E=20Gomes?= Date: Wed, 10 Aug 2022 11:46:15 +0300 Subject: [PATCH 1/2] gnu: sbcl: Update to 2.2.7-0.390809a. * gnu/packages/lisp.scm (sbcl): Update to 2.2.7-0.390809a. The tagged 2.2.7 version has issues, hence the revision. --- gnu/packages/lisp.scm | 513 +++++++++++++++++++++--------------------- 1 file changed, 260 insertions(+), 253 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 8e59ec956b..142b800632 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -411,262 +411,269 @@ (define-public clisp (license license:gpl2+))) (define-public sbcl - (package - (name "sbcl") - (version "2.2.6") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" - version "-source.tar.bz2")) - (sha256 - (base32 "18044dqx37mkipnrzs7jrp0cbnwp6snb5gi06a8zn9m8iy6088ry")))) - (build-system gnu-build-system) - (outputs '("out" "doc")) - (native-inputs - ;; From INSTALL: - ;; Supported build hosts are: - ;; SBCL - ;; CMUCL - ;; CCL (formerly known as OpenMCL) - ;; ABCL (recent versions only) - ;; CLISP (only some versions: 2.44.1 is OK, 2.47 is not) - ;; XCL - ;; - ;; From NEWS: - ;; * build enhancement: new host quirks mechanism, support for building under - ;; ABCL and ECL (as well as CCL, CMUCL, CLISP and SBCL itself) - ;; - ;; CCL is not bootstrappable so it won't do. CLISP 2.49 seems to work. - ;; ECL too. As of 2020-07-01, ECL was last updated in 2020 while CLISP - ;; was last updated in 2010, and both take about the same time to build SBCL. - ;; - ;; For now we stick to CLISP as the default for all systems. In any event, keep - ;; the `match' here to make it easier to change the host compiler for various - ;; architectures. Consider switching to ECL if it gets faster than CLISP - ;; (maybe post 2020 release). - (list (match (%current-system) - ("powerpc-linux" ; CLISP fails to build, needs investigating. - ecl) - (_ - clisp)) - cl-asdf - ed - inetutils ;for hostname(1) - texinfo - (texlive-updmap.cfg (list texlive-tex-texinfo)) - which)) - (inputs - (list gmp ; for sb-gmp - mpfr ; for sb-mpfr - (list zstd "lib"))) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1)) - #:phases - (modify-phases %standard-phases - ,@(if (target-arm32?) - ;; TODO: Move to snippet in staging. - `((add-after 'unpack 'dont-force-armv5 - (lambda _ - (substitute* "src/runtime/Config.arm-linux" - (("-march=armv5") ""))))) - '()) - (delete 'configure) - (add-after 'unpack 'fix-build-id - ;; One of the build scripts makes a build id using the current date. - ;; Replace it with a reproducible id using a part of the output hash. - (lambda* (#:key outputs #:allow-other-keys) - (let ((hash (substring (assoc-ref outputs "out") - (+ (string-length (%store-directory)) 1) - (+ (string-length (%store-directory)) 9)))) - (substitute* "make-config.sh" - (("echo .* > output/build-id.inc") - (string-append "echo '\"'guix-sbcl-" - hash - "'\"' > output/build-id.inc")))))) - (add-after 'unpack 'replace-asdf - ;; SBCL developers have not committed to keeping ASDF up to date - ;; due to breaking changes [1]. Guix can handle this situation - ;; easily, and it behooves us to have more control over what version - ;; 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 #: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 "contrib/asdf/asdf.lisp")) - (copy-file guix-asdf contrib-asdf)) - #t)) - (add-before 'build 'patch-unix-tool-paths - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bash (assoc-ref inputs "bash")) - (coreutils (assoc-ref inputs "coreutils")) - (ed (assoc-ref inputs "ed"))) - (define (quoted-path input path) - (string-append "\"" input path "\"")) - ;; Patch absolute paths in string literals. Note that this - ;; occurs in some .sh files too (which contain Lisp code). Use - ;; ISO-8859-1 because some of the files are ISO-8859-1 encoded. - (with-fluids ((%default-port-encoding #f)) - ;; The removed file is utf-16-be encoded, which gives substitute* - ;; trouble. It does not contain references to the listed programs. - (substitute* (delete - "./tests/data/compile-file-pos-utf16be.lisp" - (find-files "." "\\.(lisp|sh)$")) - (("\"/bin/sh\"") (quoted-path bash "/bin/sh")) - (("\"/usr/bin/env\"") (quoted-path coreutils "/usr/bin/env")) - (("\"/bin/cat\"") (quoted-path coreutils "/bin/cat")) - (("\"/bin/ed\"") (quoted-path ed "/bin/ed")) - (("\"/bin/echo\"") (quoted-path coreutils "/bin/echo")) - (("\"/bin/uname\"") (quoted-path coreutils "/bin/uname")))) - ;; This one script has a non-string occurrence of /bin/sh. - (substitute* '("tests/foreign.test.sh") - ;; Leave whitespace so we don't match the shebang. - ((" /bin/sh ") " sh ")) - ;; This file contains a module that can create executable files - ;; which depend on the presence of SBCL. It generates shell - ;; scripts doing "exec sbcl ..." to achieve this. We patch both - ;; the shebang and the reference to "sbcl", tying the generated - ;; executables to the exact SBCL package that generated them. - (substitute* '("contrib/sb-executable/sb-executable.lisp") - (("/bin/sh") (string-append bash "/bin/sh")) - (("exec sbcl") (string-append "exec " out "/bin/sbcl"))) - ;; Disable some tests that fail in our build environment. - (substitute* '("contrib/sb-bsd-sockets/tests.lisp") - ;; This requires /etc/protocols. - (("\\(deftest get-protocol-by-name/error" all) - (string-append "#+nil ;disabled by Guix\n" all))) - (substitute* '("contrib/sb-posix/posix-tests.lisp") - ;; These assume some users/groups which we don't have. - (("\\(deftest pwent\\.[12]" all) - (string-append "#+nil ;disabled by Guix\n" all)) - (("\\(deftest grent\\.[12]" all) - (string-append "#+nil ;disabled by Guix\n" all)))) - #t)) - (add-before 'build 'fix-shared-library-makefile - (lambda _ - (substitute* '("src/runtime/GNUmakefile") - ((" cc") " $(CC)")) - #t)) - (add-before 'build 'fix-contrib-library-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((gmp (assoc-ref inputs "gmp")) - (mpfr (assoc-ref inputs "mpfr"))) - (substitute* '("contrib/sb-gmp/gmp.lisp") - (("\"libgmp\\.so") (string-append "\"" gmp "/lib/libgmp.so"))) - (substitute* '("contrib/sb-mpfr/mpfr.lisp") - (("\"libmpfr\\.so") (string-append "\"" mpfr "/lib/libmpfr.so")))) - #t)) - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (setenv "CC" "gcc") - (invoke "sh" "make.sh" ,@(match (%current-system) - ("powerpc-linux" - `("ecl")) - (_ - `("clisp"))) - (string-append "--prefix=" - (assoc-ref outputs "out")) - ,@(if (target-ppc32?) - ;; 3072 is too much for this architecture. - `("--dynamic-space-size=2048") - `("--dynamic-space-size=3072")) - "--with-sb-core-compression" - "--with-sb-xref-for-internals" - ;; SB-SIMD will only be built on x86_64 CPUs supporting - ;; AVX2 instructions. Some x86_64 CPUs don't, so for reproducibility - ;; we disable it and we don't build its documentation (see the - ;; 'build-doc' phase). - "--without-sb-simd"))) - (add-after 'build 'build-shared-library - (lambda* (#:key outputs #:allow-other-keys) - (setenv "CC" "gcc") - (invoke "sh" "make-shared-library.sh"))) - (replace 'install - (lambda _ - (invoke "sh" "install.sh"))) - (add-after 'build 'build-doc - (lambda _ - ;; Don't build the documentation for SB-SIMD as it is disabled in - ;; the 'build' phase. - (substitute* "doc/manual/generate-texinfo.lisp" - (("exclude '\\(\"asdf\"\\)") - "exclude '(\"asdf\" \"sb-simd\")")) - (with-directory-excursion "doc/manual" - (and (invoke "make" "info") - (invoke "make" "dist"))))) - (add-after 'build 'build-source - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (rc (string-append out "/lib/sbcl/sbclrc")) - (source-dir (string-append out "/share/sbcl"))) - (for-each (lambda (p) - (copy-recursively p (string-append source-dir "/" p))) - '("src" "contrib")) - (mkdir-p (dirname rc)) - (with-output-to-file rc - (lambda () - (display - (string-append "(sb-ext:set-sbcl-source-location \"" - source-dir "\")") ))) - #t))) - (add-after 'install 'remove-coreutils-references - ;; They are only useful on non-Linux, non-SBCL. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share-dir (string-append out "/share/sbcl/"))) - (substitute* (string-append share-dir "src/code/run-program.lisp") - (("\\(run-program \".*uname\"") - "(run-program \"uname\"")) - (substitute* (string-append share-dir "contrib/asdf/asdf.lisp") - (("\\(\".*/usr/bin/env\"") - "(\"/usr/bin/env\"")) - (substitute* (string-append share-dir "contrib/asdf/uiop.lisp") - (("\\(\".*/usr/bin/env\"") - "(\"/usr/bin/env\"")) - #t))) - (add-after 'install 'install-shared-library - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib-dir (string-append out "/lib"))) - (install-file "src/runtime/libsbcl.so" lib-dir) - #t))) - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (old-doc-dir (string-append out "/share/doc")) - (new-doc/sbcl-dir (string-append doc "/share/doc/sbcl"))) - (rmdir (string-append old-doc-dir "/sbcl/html")) - (mkdir-p new-doc/sbcl-dir) - (copy-recursively (string-append old-doc-dir "/sbcl") - new-doc/sbcl-dir) - (delete-file-recursively old-doc-dir) - #t)))) - ;; No 'check' target, though "make.sh" (build phase) runs tests. - #:tests? #f)) - (native-search-paths - (list (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - (search-path-specification - (variable "XDG_CONFIG_DIRS") - (files '("etc"))))) - (home-page "http://www.sbcl.org/") - (synopsis "Common Lisp implementation") - (description "Steel Bank Common Lisp (SBCL) is a high performance Common + (let ((commit "390809ae6f32b8dfbf4f5bd3a10425553f0fb7cd") + (revision "0")) + (package + (name "sbcl") + (version (git-version "2.2.7" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference (url "https://git.code.sf.net/p/sbcl/sbcl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zlypy366zsk0rm91ad27cmary91xpgrbm7al1f1w5cw03yd6k4l")) + (snippet + '(let ((file (open-file "version.lisp-expr" "w"))) + (display "\"2.2.7\"" file) + (close-port file))))) + (build-system gnu-build-system) + (outputs '("out" "doc")) + (native-inputs + ;; From INSTALL: + ;; Supported build hosts are: + ;; SBCL + ;; CMUCL + ;; CCL (formerly known as OpenMCL) + ;; ABCL (recent versions only) + ;; CLISP (only some versions: 2.44.1 is OK, 2.47 is not) + ;; XCL + ;; + ;; From NEWS: + ;; * build enhancement: new host quirks mechanism, support for building under + ;; ABCL and ECL (as well as CCL, CMUCL, CLISP and SBCL itself) + ;; + ;; CCL is not bootstrappable so it won't do. CLISP 2.49 seems to work. + ;; ECL too. As of 2020-07-01, ECL was last updated in 2020 while CLISP + ;; was last updated in 2010, and both take about the same time to build SBCL. + ;; + ;; For now we stick to CLISP as the default for all systems. In any event, keep + ;; the `match' here to make it easier to change the host compiler for various + ;; architectures. Consider switching to ECL if it gets faster than CLISP + ;; (maybe post 2020 release). + (list (match (%current-system) + ("powerpc-linux" ; CLISP fails to build, needs investigating. + ecl) + (_ + clisp)) + cl-asdf + ed + inetutils ;for hostname(1) + texinfo + (texlive-updmap.cfg (list texlive-tex-texinfo)) + which)) + (inputs + (list gmp ; for sb-gmp + mpfr ; for sb-mpfr + (list zstd "lib"))) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + ,@(if (target-arm32?) + ;; TODO: Move to snippet in staging. + `((add-after 'unpack 'dont-force-armv5 + (lambda _ + (substitute* "src/runtime/Config.arm-linux" + (("-march=armv5") ""))))) + '()) + (delete 'configure) + (add-after 'unpack 'fix-build-id + ;; One of the build scripts makes a build id using the current date. + ;; Replace it with a reproducible id using a part of the output hash. + (lambda* (#:key outputs #:allow-other-keys) + (let ((hash (substring (assoc-ref outputs "out") + (+ (string-length (%store-directory)) 1) + (+ (string-length (%store-directory)) 9)))) + (substitute* "make-config.sh" + (("echo .* > output/build-id.inc") + (string-append "echo '\"'guix-sbcl-" + hash + "'\"' > output/build-id.inc")))))) + (add-after 'unpack 'replace-asdf + ;; SBCL developers have not committed to keeping ASDF up to date + ;; due to breaking changes [1]. Guix can handle this situation + ;; easily, and it behooves us to have more control over what version + ;; 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 #: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 "contrib/asdf/asdf.lisp")) + (copy-file guix-asdf contrib-asdf)) + #t)) + (add-before 'build 'patch-unix-tool-paths + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bash (assoc-ref inputs "bash")) + (coreutils (assoc-ref inputs "coreutils")) + (ed (assoc-ref inputs "ed"))) + (define (quoted-path input path) + (string-append "\"" input path "\"")) + ;; Patch absolute paths in string literals. Note that this + ;; occurs in some .sh files too (which contain Lisp code). Use + ;; ISO-8859-1 because some of the files are ISO-8859-1 encoded. + (with-fluids ((%default-port-encoding #f)) + ;; The removed file is utf-16-be encoded, which gives substitute* + ;; trouble. It does not contain references to the listed programs. + (substitute* (delete + "./tests/data/compile-file-pos-utf16be.lisp" + (find-files "." "\\.(lisp|sh)$")) + (("\"/bin/sh\"") (quoted-path bash "/bin/sh")) + (("\"/usr/bin/env\"") (quoted-path coreutils "/usr/bin/env")) + (("\"/bin/cat\"") (quoted-path coreutils "/bin/cat")) + (("\"/bin/ed\"") (quoted-path ed "/bin/ed")) + (("\"/bin/echo\"") (quoted-path coreutils "/bin/echo")) + (("\"/bin/uname\"") (quoted-path coreutils "/bin/uname")))) + ;; This one script has a non-string occurrence of /bin/sh. + (substitute* '("tests/foreign.test.sh") + ;; Leave whitespace so we don't match the shebang. + ((" /bin/sh ") " sh ")) + ;; This file contains a module that can create executable files + ;; which depend on the presence of SBCL. It generates shell + ;; scripts doing "exec sbcl ..." to achieve this. We patch both + ;; the shebang and the reference to "sbcl", tying the generated + ;; executables to the exact SBCL package that generated them. + (substitute* '("contrib/sb-executable/sb-executable.lisp") + (("/bin/sh") (string-append bash "/bin/sh")) + (("exec sbcl") (string-append "exec " out "/bin/sbcl"))) + ;; Disable some tests that fail in our build environment. + (substitute* '("contrib/sb-bsd-sockets/tests.lisp") + ;; This requires /etc/protocols. + (("\\(deftest get-protocol-by-name/error" all) + (string-append "#+nil ;disabled by Guix\n" all))) + (substitute* '("contrib/sb-posix/posix-tests.lisp") + ;; These assume some users/groups which we don't have. + (("\\(deftest pwent\\.[12]" all) + (string-append "#+nil ;disabled by Guix\n" all)) + (("\\(deftest grent\\.[12]" all) + (string-append "#+nil ;disabled by Guix\n" all)))) + #t)) + (add-before 'build 'fix-shared-library-makefile + (lambda _ + (substitute* '("src/runtime/GNUmakefile") + ((" cc") " $(CC)")) + #t)) + (add-before 'build 'fix-contrib-library-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((gmp (assoc-ref inputs "gmp")) + (mpfr (assoc-ref inputs "mpfr"))) + (substitute* '("contrib/sb-gmp/gmp.lisp") + (("\"libgmp\\.so") (string-append "\"" gmp "/lib/libgmp.so"))) + (substitute* '("contrib/sb-mpfr/mpfr.lisp") + (("\"libmpfr\\.so") (string-append "\"" mpfr "/lib/libmpfr.so")))) + #t)) + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (setenv "CC" "gcc") + (invoke "sh" "make.sh" ,@(match (%current-system) + ("powerpc-linux" + `("ecl")) + (_ + `("clisp"))) + (string-append "--prefix=" + (assoc-ref outputs "out")) + ,@(if (target-ppc32?) + ;; 3072 is too much for this architecture. + `("--dynamic-space-size=2048") + `("--dynamic-space-size=3072")) + "--with-sb-core-compression" + "--with-sb-xref-for-internals" + ;; SB-SIMD will only be built on x86_64 CPUs supporting + ;; AVX2 instructions. Some x86_64 CPUs don't, so for reproducibility + ;; we disable it and we don't build its documentation (see the + ;; 'build-doc' phase). + "--without-sb-simd"))) + (add-after 'build 'build-shared-library + (lambda* (#:key outputs #:allow-other-keys) + (setenv "CC" "gcc") + (invoke "sh" "make-shared-library.sh"))) + (replace 'install + (lambda _ + (invoke "sh" "install.sh"))) + (add-after 'build 'build-doc + (lambda _ + ;; Don't build the documentation for SB-SIMD as it is disabled in + ;; the 'build' phase. + (substitute* "doc/manual/generate-texinfo.lisp" + (("exclude '\\(\"asdf\"\\)") + "exclude '(\"asdf\" \"sb-simd\")")) + (with-directory-excursion "doc/manual" + (and (invoke "make" "info") + (invoke "make" "dist"))))) + (add-after 'build 'build-source + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (rc (string-append out "/lib/sbcl/sbclrc")) + (source-dir (string-append out "/share/sbcl"))) + (for-each (lambda (p) + (copy-recursively p (string-append source-dir "/" p))) + '("src" "contrib")) + (mkdir-p (dirname rc)) + (with-output-to-file rc + (lambda () + (display + (string-append "(sb-ext:set-sbcl-source-location \"" + source-dir "\")") ))) + #t))) + (add-after 'install 'remove-coreutils-references + ;; They are only useful on non-Linux, non-SBCL. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share-dir (string-append out "/share/sbcl/"))) + (substitute* (string-append share-dir "src/code/run-program.lisp") + (("\\(run-program \".*uname\"") + "(run-program \"uname\"")) + (substitute* (string-append share-dir "contrib/asdf/asdf.lisp") + (("\\(\".*/usr/bin/env\"") + "(\"/usr/bin/env\"")) + (substitute* (string-append share-dir "contrib/asdf/uiop.lisp") + (("\\(\".*/usr/bin/env\"") + "(\"/usr/bin/env\"")) + #t))) + (add-after 'install 'install-shared-library + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib-dir (string-append out "/lib"))) + (install-file "src/runtime/libsbcl.so" lib-dir) + #t))) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (old-doc-dir (string-append out "/share/doc")) + (new-doc/sbcl-dir (string-append doc "/share/doc/sbcl"))) + (rmdir (string-append old-doc-dir "/sbcl/html")) + (mkdir-p new-doc/sbcl-dir) + (copy-recursively (string-append old-doc-dir "/sbcl") + new-doc/sbcl-dir) + (delete-file-recursively old-doc-dir) + #t)))) + ;; No 'check' target, though "make.sh" (build phase) runs tests. + #:tests? #f)) + (native-search-paths + (list (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))) + (search-path-specification + (variable "XDG_CONFIG_DIRS") + (files '("etc"))))) + (home-page "http://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 Lisp, it provides an interactive environment including a debugger, a statistical profiler, a code coverage tool, and many other extensions.") - ;; Public domain in jurisdictions that allow it, bsd-2 otherwise. MIT - ;; loop macro has its own license. See COPYING file for further notes. - (license (list license:public-domain license:bsd-2 - (license:x11-style "file://src/code/loop.lisp"))))) + ;; Public domain in jurisdictions that allow it, bsd-2 otherwise. MIT + ;; loop macro has its own license. See COPYING file for further notes. + (license (list license:public-domain license:bsd-2 + (license:x11-style "file://src/code/loop.lisp")))))) (define-public ccl ;; Warning: according to upstream, CCL is not bootstrappable. -- 2.37.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-stumpwm-Update-to-22.05-0.9f47673.patch >From a663ce96fe0a0ce9f5fe2b7c70b14a1ac9ebebac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20A=2E=20Gomes?= Date: Wed, 10 Aug 2022 11:50:26 +0300 Subject: [PATCH 2/2] gnu: stumpwm: Update to 22.05-0.9f47673. * gnu/packages/wm.scm (stumpwm): Update to 22.05-0.9f47673. --- gnu/packages/wm.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f4dcbf742e..24f6a7ef9c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1819,23 +1819,24 @@ (define-public kanshi (license license:expat))) ; MIT license (define-public stumpwm - (package + (let ((commit "9f476737d4431d88728738408592bd7004f71255") + (revision "0")) + (package (name "stumpwm") - (version "22.05") + (version (git-version "22.05" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/stumpwm/stumpwm") - (commit version))) - (file-name (git-file-name "stumpwm" version)) + (commit commit))) + (file-name (git-file-name name version)) (sha256 - (base32 "12hf70mpwy0ixiyvv8sf8pkwrzz8nb12a8ybvsdpibsxfjxgxnan")))) + (base32 "04jifrsp2zs0wvfh87k4xjvndqg4fs4m8ixrlvrilbcl0x01fl36")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-fiasco texinfo - ;; To build the manual. autoconf automake)) @@ -1891,7 +1892,7 @@ (define-public stumpwm productive, customizable lisp based systems.") (home-page "https://github.com/stumpwm/stumpwm") (license license:gpl2+) - (properties `((cl-source-variant . ,(delay cl-stumpwm)))))) + (properties `((cl-source-variant . ,(delay cl-stumpwm))))))) (define-public sbcl-stumpwm (deprecated-package "sbcl-stumpwm" stumpwm)) -- 2.37.1 --=-=-=-- From unknown Sun Jun 22 22:48:18 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#57103] [PATCH]: Update sbcl to 2.2.7 Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Aug 2022 09:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57103 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: andremegafone@gmail.com, 57103@debbugs.gnu.org Cc: artyom@atlas.engineer X-Debbugs-Original-To: =?UTF-8?Q?Andr=C3=A9?= A. Gomes , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16601234652139 (code B ref -1); Wed, 10 Aug 2022 09:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Aug 2022 09:24:25 +0000 Received: from localhost ([127.0.0.1]:46058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLhwu-0000YR-Rw for submit@debbugs.gnu.org; Wed, 10 Aug 2022 05:24:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:52698) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLhws-0000YJ-Q0 for submit@debbugs.gnu.org; Wed, 10 Aug 2022 05:24:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLhwr-00050K-DX for guix-patches@gnu.org; Wed, 10 Aug 2022 05:24:22 -0400 Received: from relay1-d.mail.gandi.net ([2001:4b98:dc4:8::221]:34061) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLhwp-0002an-Cl for guix-patches@gnu.org; Wed, 10 Aug 2022 05:24:21 -0400 Received: (Authenticated sender: pierre@atlas.engineer) by mail.gandi.net (Postfix) with ESMTPSA id 33798240002; Wed, 10 Aug 2022 09:24:09 +0000 (UTC) From: Pierre Neidhardt In-Reply-To: <87tu6kscbl.fsf@gmail.com> References: <87tu6kscbl.fsf@gmail.com> Date: Wed, 10 Aug 2022 11:24:04 +0200 Message-ID: <87zggc5u4r.fsf@ambrevar.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=2001:4b98:dc4:8::221; envelope-from=pierre@atlas.engineer; helo=relay1-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Thank you Andr=C3=A9. Unfortunately, Guix prefers stable packages and if there is no urgent need for a specific intermediary version, it's often best to simply wait for the next stable release. In the case of SBCL, a new stable version is release at the end of each month. The easiest fix (and probably the right thing to do) is to simply wait some 20 days :) Pierre --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFKBAEBCAA0FiEEUPM+LlsMPZAEJKvom9z0l6S7zH8FAmLzeTQWHHBpZXJyZUBh dGxhcy5lbmdpbmVlcgAKCRCb3PSXpLvMfw53CACU6wJFDlLjTkdQ59Aib1t7QYpA 0num62ZD8pHsjcnoh5+Rq0kMm/DrIke+eFBj8Anwb6m9PMq+qekx7ndN4kStUoiT ojEumg+1a3iJyC69BxH2+lxXRA139E3+iL24Mw+sIXElXXKj+ny9I4tAFm50+xQm nNRE8W7t19hmk+Sqh0NiIYW1AP+nHcFILuK2r22cANDEFoUk+G4NZQCEO45rRAQv tb6Ta7hCdRra7zuFmnzPc0msC1rBqjRkREnOVhUF2p6pj3JENGDtmEajo80xRhRx rTLIpqN4Ixjm3hsYgwKA8XVpEZ2dvpTESWazno7hNAZq2d2kQWO59X297pTq =ry2u -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 22:48:18 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#57103] [PATCH]: Update sbcl to 2.2.7 Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Aug 2022 09:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57103 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Pierre Neidhardt" , , <57103@debbugs.gnu.org> Cc: artyom@atlas.engineer Received: via spool by 57103-submit@debbugs.gnu.org id=B57103.16601235602302 (code B ref 57103); Wed, 10 Aug 2022 09:26:02 +0000 Received: (at 57103) by debbugs.gnu.org; 10 Aug 2022 09:26:00 +0000 Received: from localhost ([127.0.0.1]:46067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLhyS-0000b4-Gv for submit@debbugs.gnu.org; Wed, 10 Aug 2022 05:26:00 -0400 Received: from knopi.disroot.org ([178.21.23.139]:40948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLhyP-0000at-OM for 57103@debbugs.gnu.org; Wed, 10 Aug 2022 05:25:59 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 530E945593; Wed, 10 Aug 2022 11:25:56 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iWjHkjvRaExc; Wed, 10 Aug 2022 11:25:55 +0200 (CEST) Mime-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1660123555; bh=q4ZE2huQTtLoDrV//F25b+Sx1dC4MoDl0fomqjkqeik=; h=Date:Cc:Subject:From:To:References:In-Reply-To; b=WDd4Ye+6nF8P+Vn4YH2tkzTEmcr4xHKwaN6eUfHuoWkmtCeGtvNV47ElJiVZXDhOU LqWE9n6Ju8n71IygU8FhlWvG8X3spiiXdiGVI/IpbBNuLelbKivA7M+a5omRdhyrbt NjpUzpyWj9cm7IH+at82DLDA/93HZ63a+xXmjMOJ2OW785cN/IQc9UG5bfN7oW6EkZ sx16s1laOKh3F8+8iCNGZXQ4JEKbYYysLz2ADVeSiQqfTW1pgXqEnQJVyLj/ec5Nip zSxuivQjHXP8IPuHVBK8S5SHSrN2qLJPfdik/MA2pI5SyieosNPiX2fXzBg4flPGE9 GWufqN0xlfN1Q== Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Wed, 10 Aug 2022 10:25:54 +0100 Message-Id: From: "(" References: <87tu6kscbl.fsf@gmail.com> <87zggc5u4r.fsf@ambrevar.xyz> In-Reply-To: <87zggc5u4r.fsf@ambrevar.xyz> X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Wed Aug 10, 2022 at 10:24 AM BST, Pierre Neidhardt wrote: > In the case of SBCL, a new stable version is release at the end of each > month. The easiest fix (and probably the right thing to do) is to > simply wait some 20 days :) Maybe we could have an sbcl-next? :) -- ( From unknown Sun Jun 22 22:48:18 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#57103] [PATCH]: Update sbcl to 2.2.7 Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Aug 2022 10:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57103 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "(" , andremegafone@gmail.com, 57103@debbugs.gnu.org Cc: artyom@atlas.engineer Received: via spool by 57103-submit@debbugs.gnu.org id=B57103.16601259836581 (code B ref 57103); Wed, 10 Aug 2022 10:07:01 +0000 Received: (at 57103) by debbugs.gnu.org; 10 Aug 2022 10:06:23 +0000 Received: from localhost ([127.0.0.1]:46167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLibW-0001i5-M5 for submit@debbugs.gnu.org; Wed, 10 Aug 2022 06:06:22 -0400 Received: from relay10.mail.gandi.net ([217.70.178.230]:47349) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLibT-0001hq-V4 for 57103@debbugs.gnu.org; Wed, 10 Aug 2022 06:06:20 -0400 Received: (Authenticated sender: pierre@atlas.engineer) by mail.gandi.net (Postfix) with ESMTPSA id A8859240012; Wed, 10 Aug 2022 10:06:07 +0000 (UTC) From: Pierre Neidhardt In-Reply-To: References: <87tu6kscbl.fsf@gmail.com> <87zggc5u4r.fsf@ambrevar.xyz> Date: Wed, 10 Aug 2022 12:06:01 +0200 Message-ID: <87wnbg5s6u.fsf@ambrevar.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Packages with a -next version mostly make sense when the release timeline is in the order of a year or more. For SBCL, it's just too short. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFKBAEBCAA0FiEEUPM+LlsMPZAEJKvom9z0l6S7zH8FAmLzgwkWHHBpZXJyZUBh dGxhcy5lbmdpbmVlcgAKCRCb3PSXpLvMf9FgCACfKhGWAaD9/lXq5zWGe9MQlR4I b/Sfawh8+Sei4j3mfhUXLYsckzxjTobQc0ljBuVTs7UrF79lK6EsOL7MnuydWxgi Kc53kCZSI4yKO230EBDJ9uIQH0oK3l2MSkiHsF0USPT7kgvF8KLzq3jhDZwDPdC6 o501Dk/JGZH73BPTshzqjRh9ZqBXSELFaDfmEjh8Cb3EufRKumyFfXOQ4k4Yprgr /MVXO8KAmI4P4IKROBIf4iPGAwuKQSJTQh5+yszt+XFkhfwKo+06m3En6O6gJKFq Yr8dFqFY772qmcaV+Vkl2VkLsfXZ5/J7lBd9TfMn+NvLB3iJ98yZgxAklWlf =epvG -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 22:48:18 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#57103] [PATCH]: Update sbcl to 2.2.7 Resent-From: =?UTF-8?Q?Andr=C3=A9?= A. Gomes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Aug 2022 10:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57103 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Pierre Neidhardt Cc: artyom@atlas.engineer, 57103@debbugs.gnu.org X-Debbugs-Original-Cc: artyom@atlas.engineer, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166012853911306 (code B ref -1); Wed, 10 Aug 2022 10:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Aug 2022 10:48:59 +0000 Received: from localhost ([127.0.0.1]:46224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLjGl-0002wI-Gq for submit@debbugs.gnu.org; Wed, 10 Aug 2022 06:48:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:33074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLjGj-0002w9-1e for submit@debbugs.gnu.org; Wed, 10 Aug 2022 06:48:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLjGX-0003Pl-Iy for guix-patches@gnu.org; Wed, 10 Aug 2022 06:48:48 -0400 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]:42908) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLjGW-0007uo-4K for guix-patches@gnu.org; Wed, 10 Aug 2022 06:48:45 -0400 Received: by mail-lj1-x233.google.com with SMTP id v10so12189607ljh.9 for ; Wed, 10 Aug 2022 03:48:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc; bh=GxsD3AFIJQ7gr/JTcLz7Yq9FgDs986btM2PtmuRBzxw=; b=XHrtVAEJWWjp0cMF31sxwjmUfRh9wOCI6ptL8aBlb5fhA9rVrQruTsH9PH5LsOh4WB bJP04PF9fc6+0NVisSGCdtGSsevB/Ju+QP0sPQ1k7X23eGfD4EEJyku+ahtyq8yzVVnk dMlwOehcmSMzrnkywB7SRrK+TlU9zvifbZN+aQdwhOo74vaN3t1ZomPi5KTwp88tvpMA pPAYJU6agC6JQmloCp6VFNk+uRWbLTckS/DDVqDrATVYmqE45hjaA+utvOEiAtIYmZrc livPTlRUIBOLCp7u+pFDOX1L0ixWHzaeTFosr32b31k3PXXTlYU6bmsVDu7UnjpwpoH2 ZP3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc; bh=GxsD3AFIJQ7gr/JTcLz7Yq9FgDs986btM2PtmuRBzxw=; b=E2QCp/QqREqUM87oO0vtwtfL7K0i38IEZq0Cb5a7LPgxBfSrglvTZnGZT/bbp1GvSC 2unCI/GoyTpj2HxcqJ7dVycQkTmY0VoNz/+UkBJTRKg0otLzZh46NqhYJvlbs3sZfn/G Y4zCO8txNUbidJcDhj7NY2gHfLRitvcNIcDrJmOlt3pMXLdZFD96jtZJ0bxFVQdjvxUp plrmZI6bCRsW5A7c4DvLZoZCQhufjTMfcOVAit9qlrfcnNLW8BrwvC16H8PTcaZNAzY9 avzb3IUxZHuIJ3UlDB4G+XQdzd3bfUypa7gGW/ySNoe0KjTq/hn+6GBFIBk86ddKpzXa KieQ== X-Gm-Message-State: ACgBeo2BWmRY4Xkh1fs0vHqFOBRSYrmzKzbC7GdX2L1730W1Tbv39KVb wj/ixiWJq6pg9QyFdR5ueQQ= X-Google-Smtp-Source: AA6agR6sq8QOgAP1cFqnL0MjMw3eCWbNyTLk4XD1O8pLu0b/Zg4He78tqY2cdQkseLTbGaT4eGnstQ== X-Received: by 2002:a2e:a405:0:b0:25e:5942:6e56 with SMTP id p5-20020a2ea405000000b0025e59426e56mr8154131ljn.345.1660128521844; Wed, 10 Aug 2022 03:48:41 -0700 (PDT) Received: from guix-xps13 (95-27-199-45.broadband.corbina.ru. [95.27.199.45]) by smtp.gmail.com with ESMTPSA id c16-20020a05651c015000b0025e6e1c836dsm354036ljd.126.2022.08.10.03.48.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 03:48:41 -0700 (PDT) From: =?UTF-8?Q?Andr=C3=A9?= A. Gomes References: <87tu6kscbl.fsf@gmail.com> <87zggc5u4r.fsf@ambrevar.xyz> Date: Wed, 10 Aug 2022 13:48:39 +0300 In-Reply-To: <87zggc5u4r.fsf@ambrevar.xyz> (Pierre Neidhardt's message of "Wed, 10 Aug 2022 11:24:04 +0200") Message-ID: <87pmh8s7aw.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1.91 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2a00:1450:4864:20::233; envelope-from=andremegafone@gmail.com; helo=mail-lj1-x233.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Pierre Neidhardt writes: > Thank you Andr=C3=A9. Unfortunately, Guix prefers stable packages and if > there is no urgent need for a specific intermediary version, it's often > best to simply wait for the next stable release. > > In the case of SBCL, a new stable version is release at the end of each > month. The easiest fix (and probably the right thing to do) is to > simply wait some 20 days :) I see! Let's wait then :) --=20 Andr=C3=A9 A. Gomes "You cannot even find the ruins..." From unknown Sun Jun 22 22:48:18 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: =?UTF-8?Q?Andr=C3=A9?= A. Gomes Subject: bug#57103: closed (Re: [bug#57103] [PATCH]: Update sbcl to 2.2.7) Message-ID: References: <87ilk0jam0.fsf@kitej> <87tu6kscbl.fsf@gmail.com> X-Gnu-PR-Message: they-closed 57103 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 57103@debbugs.gnu.org Date: Mon, 31 Oct 2022 15:07:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1667228822-26745-1" This is a multi-part message in MIME format... ------------=_1667228822-26745-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #57103: [PATCH]: Update sbcl to 2.2.7 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 57103@debbugs.gnu.org. --=20 57103: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D57103 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1667228822-26745-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 57103-close) by debbugs.gnu.org; 31 Oct 2022 15:06:57 +0000 Received: from localhost ([127.0.0.1]:41528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opWNN-0006x6-By for submit@debbugs.gnu.org; Mon, 31 Oct 2022 11:06:57 -0400 Received: from mout02.posteo.de ([185.67.36.66]:60543) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opWNL-0006wt-CC for 57103-close@debbugs.gnu.org; Mon, 31 Oct 2022 11:06:56 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 6E0EC240101 for <57103-close@debbugs.gnu.org>; Mon, 31 Oct 2022 16:06:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1667228809; bh=pQUTB+Ow/0X2JFiReJhLJVnaO9sggkrx+n+KTwyBAVE=; h=From:To:Cc:Subject:Date:From; b=CGkR1nzIMqQovY3qXU8/I2EiPm3NWrGAIfeYSSDncLhzlnllCNRo+Q5pmv2xQpw8D wQiIx9+l6HlNjeCIqYGgmwobg6m7RFSDjrj0xsIk7GHv4820fcbytXvCgF9eRwHRwx qJajqU2Q61Qe5DVvDjpaVrqcI9hKtImjjA2x5fwEQb6/fQzt6u5pBBQWTZDViLRUS/ Y400n1vFTskuTq2QpVHpMEsNfaqBQ+bOO/ovKmRpueyddirkPjpL2VZjcP32xV1KGF bBdgth4NL33rUchzNpP0Du6Z93G7EX5cbxs2ShMWdDS8qX01Vc+f5wzad9SYHidagY EzumcvRlkUk5w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4N1GhS3y3sz6tmg; Mon, 31 Oct 2022 16:06:48 +0100 (CET) References: <87tu6kscbl.fsf@gmail.com> <87zggc5u4r.fsf@ambrevar.xyz> <87pmh8s7aw.fsf@gmail.com> From: Guillaume Le Vaillant To: =?utf-8?Q?Andr=C3=A9_A=2E_Gomes?= Subject: Re: [bug#57103] [PATCH]: Update sbcl to 2.2.7 Date: Mon, 31 Oct 2022 15:05:05 +0000 In-reply-to: <87pmh8s7aw.fsf@gmail.com> Message-ID: <87ilk0jam0.fsf@kitej> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57103-close Cc: 57103-close@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain SBCL updated to 2.2.10 in 1eee671d7d0bca1486ff8b4259c93b0cf7783e58. Closing. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCY1/khw8cZ2x2QHBvc3Rl by5uZXQACgkQa+ggit8h/j9BqAD9EzPK4xnxm0LzmjWCRrjeSeGUrVoFfkiDrXg6 0FWhiHUA/3w4rMfKNhCUnm2r3jcRad6yN7dXOS9sFcICqdFGFYFk =11SW -----END PGP SIGNATURE----- --=-=-=-- ------------=_1667228822-26745-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 10 Aug 2022 09:00:34 +0000 Received: from localhost ([127.0.0.1]:46031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLhZo-0008PQ-V0 for submit@debbugs.gnu.org; Wed, 10 Aug 2022 05:00:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:45946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLhZl-0008PE-VG for submit@debbugs.gnu.org; Wed, 10 Aug 2022 05:00:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLhZg-0007Jw-RM for guix-patches@gnu.org; Wed, 10 Aug 2022 05:00:29 -0400 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]:35488) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLhZc-0006vt-29 for guix-patches@gnu.org; Wed, 10 Aug 2022 05:00:23 -0400 Received: by mail-lf1-x135.google.com with SMTP id z25so20367532lfr.2 for ; Wed, 10 Aug 2022 02:00:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:date:subject:cc:to:from:from:to :cc; bh=yEGWeq2V1uni5lMxQAupW8884x+QCjRR3pnR4BBZniU=; b=HogpB4KQGSM84O2WoXQb6fG3OTpo9Qjeff5zE5ym/o7UZKlD3aG2P8AwovQGR/UuGS IEVzX3NAYBdBwi/Knn/CmMKph07KWBu0CpzCqbBVPCsAKCVrh8Kh3TBEogWqiimW1Gn2 +QUfDFVYfz7WC5bvkr+COPKGcf8mHXUIslPlhRw2/fzS9IN71u4cgPo3Wvy6/b8X/szr p4z3U0XQ3Llrb7/dNnS4z4yaTgfk67zyaZ6R/JEaBCdVcG3st90PaRXRZJXHr3iJmCKE BE0jGGXeFBd+eT3V2U2pSkJsvJZOiM/241YyrnIk0o0ZslvTnVKwf6EDj82cmNwb0O6Y fhvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc; bh=yEGWeq2V1uni5lMxQAupW8884x+QCjRR3pnR4BBZniU=; b=vu8Gbsza97TkrhFflEvGrBZOmAqqTozfPejEQnRusOP8lAWf4eICl2fBhb9WbMW02S MS9bIVECzICqVH/j+Au7EO9YkIP8mY2AoprGlyCiWvZNkEvtu7DBvu1fdRUhWOwWxjvj xn2MpmZBXEt+QGacsXY5dd5tUevcY7bYOcw9087wH6kVADb02uSArfSrtPGbqoAesOEm a3FPxwQEVRIdA7twaS6jZBX5a9qnKyL5T8QBzuTqgDpYrrakJeWtXhEdmhUsmDgCehKq JzUVF65SQIzEvNkhm3f+3njTHScwaWn9wVcRNqqRHwIOioT+C4yazbQFJGm3a3+/lMch h6NA== X-Gm-Message-State: ACgBeo3S42i/mLkr1RZ2qKOdIeeWCR2Aj8Yh1VF98EOINCVkrXgQiYgE c8eavJqVpNXi/iuZ7plMIy4= X-Google-Smtp-Source: AA6agR5j4g/vdQLgH0P16rhILkL2opsup0YckrlJYCwgX7c8UkE8Moigiu3si7fUA8p7F1KqqrnqiA== X-Received: by 2002:a05:6512:b96:b0:48b:19c:5332 with SMTP id b22-20020a0565120b9600b0048b019c5332mr10038558lfv.151.1660122016871; Wed, 10 Aug 2022 02:00:16 -0700 (PDT) Received: from guix-xps13 (95-27-199-45.broadband.corbina.ru. [95.27.199.45]) by smtp.gmail.com with ESMTPSA id s14-20020a2e83ce000000b0025e4dcc48b1sm334709ljh.19.2022.08.10.02.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 02:00:16 -0700 (PDT) From: =?utf-8?Q?Andr=C3=A9_A=2E_Gomes?= To: guix-patches@gnu.org Subject: [PATCH]: Update sbcl to 2.2.7 Date: Wed, 10 Aug 2022 12:00:14 +0300 Message-ID: <87tu6kscbl.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1.91 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2a00:1450:4864:20::135; envelope-from=andremegafone@gmail.com; helo=mail-lf1-x135.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: artyom@atlas.engineer, pierre@atlas.engineer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Guix, The tagged 2.2.7 version of sbcl has some issues. For instance, maxima failed to build. This patch updates sbcl while ensuring that all packages that depend on it build successfully. I tested it by issuing --8<---------------cut here---------------start------------->8--- ./pre-inst-env guix build $(./pre-inst-env guix refresh -l sbcl | cut -d ':= ' -f 2) --8<---------------cut here---------------end--------------->8--- Find the patched attached. Thanks. --=20 Andr=C3=A9 A. Gomes "You cannot even find the ruins..." --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-sbcl-Update-to-2.2.7-0.390809a.patch >From e7687c803d2bb021c4ca89185620383761598303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20A=2E=20Gomes?= Date: Wed, 10 Aug 2022 11:46:15 +0300 Subject: [PATCH 1/2] gnu: sbcl: Update to 2.2.7-0.390809a. * gnu/packages/lisp.scm (sbcl): Update to 2.2.7-0.390809a. The tagged 2.2.7 version has issues, hence the revision. --- gnu/packages/lisp.scm | 513 +++++++++++++++++++++--------------------- 1 file changed, 260 insertions(+), 253 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 8e59ec956b..142b800632 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -411,262 +411,269 @@ (define-public clisp (license license:gpl2+))) (define-public sbcl - (package - (name "sbcl") - (version "2.2.6") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" - version "-source.tar.bz2")) - (sha256 - (base32 "18044dqx37mkipnrzs7jrp0cbnwp6snb5gi06a8zn9m8iy6088ry")))) - (build-system gnu-build-system) - (outputs '("out" "doc")) - (native-inputs - ;; From INSTALL: - ;; Supported build hosts are: - ;; SBCL - ;; CMUCL - ;; CCL (formerly known as OpenMCL) - ;; ABCL (recent versions only) - ;; CLISP (only some versions: 2.44.1 is OK, 2.47 is not) - ;; XCL - ;; - ;; From NEWS: - ;; * build enhancement: new host quirks mechanism, support for building under - ;; ABCL and ECL (as well as CCL, CMUCL, CLISP and SBCL itself) - ;; - ;; CCL is not bootstrappable so it won't do. CLISP 2.49 seems to work. - ;; ECL too. As of 2020-07-01, ECL was last updated in 2020 while CLISP - ;; was last updated in 2010, and both take about the same time to build SBCL. - ;; - ;; For now we stick to CLISP as the default for all systems. In any event, keep - ;; the `match' here to make it easier to change the host compiler for various - ;; architectures. Consider switching to ECL if it gets faster than CLISP - ;; (maybe post 2020 release). - (list (match (%current-system) - ("powerpc-linux" ; CLISP fails to build, needs investigating. - ecl) - (_ - clisp)) - cl-asdf - ed - inetutils ;for hostname(1) - texinfo - (texlive-updmap.cfg (list texlive-tex-texinfo)) - which)) - (inputs - (list gmp ; for sb-gmp - mpfr ; for sb-mpfr - (list zstd "lib"))) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1)) - #:phases - (modify-phases %standard-phases - ,@(if (target-arm32?) - ;; TODO: Move to snippet in staging. - `((add-after 'unpack 'dont-force-armv5 - (lambda _ - (substitute* "src/runtime/Config.arm-linux" - (("-march=armv5") ""))))) - '()) - (delete 'configure) - (add-after 'unpack 'fix-build-id - ;; One of the build scripts makes a build id using the current date. - ;; Replace it with a reproducible id using a part of the output hash. - (lambda* (#:key outputs #:allow-other-keys) - (let ((hash (substring (assoc-ref outputs "out") - (+ (string-length (%store-directory)) 1) - (+ (string-length (%store-directory)) 9)))) - (substitute* "make-config.sh" - (("echo .* > output/build-id.inc") - (string-append "echo '\"'guix-sbcl-" - hash - "'\"' > output/build-id.inc")))))) - (add-after 'unpack 'replace-asdf - ;; SBCL developers have not committed to keeping ASDF up to date - ;; due to breaking changes [1]. Guix can handle this situation - ;; easily, and it behooves us to have more control over what version - ;; 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 #: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 "contrib/asdf/asdf.lisp")) - (copy-file guix-asdf contrib-asdf)) - #t)) - (add-before 'build 'patch-unix-tool-paths - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bash (assoc-ref inputs "bash")) - (coreutils (assoc-ref inputs "coreutils")) - (ed (assoc-ref inputs "ed"))) - (define (quoted-path input path) - (string-append "\"" input path "\"")) - ;; Patch absolute paths in string literals. Note that this - ;; occurs in some .sh files too (which contain Lisp code). Use - ;; ISO-8859-1 because some of the files are ISO-8859-1 encoded. - (with-fluids ((%default-port-encoding #f)) - ;; The removed file is utf-16-be encoded, which gives substitute* - ;; trouble. It does not contain references to the listed programs. - (substitute* (delete - "./tests/data/compile-file-pos-utf16be.lisp" - (find-files "." "\\.(lisp|sh)$")) - (("\"/bin/sh\"") (quoted-path bash "/bin/sh")) - (("\"/usr/bin/env\"") (quoted-path coreutils "/usr/bin/env")) - (("\"/bin/cat\"") (quoted-path coreutils "/bin/cat")) - (("\"/bin/ed\"") (quoted-path ed "/bin/ed")) - (("\"/bin/echo\"") (quoted-path coreutils "/bin/echo")) - (("\"/bin/uname\"") (quoted-path coreutils "/bin/uname")))) - ;; This one script has a non-string occurrence of /bin/sh. - (substitute* '("tests/foreign.test.sh") - ;; Leave whitespace so we don't match the shebang. - ((" /bin/sh ") " sh ")) - ;; This file contains a module that can create executable files - ;; which depend on the presence of SBCL. It generates shell - ;; scripts doing "exec sbcl ..." to achieve this. We patch both - ;; the shebang and the reference to "sbcl", tying the generated - ;; executables to the exact SBCL package that generated them. - (substitute* '("contrib/sb-executable/sb-executable.lisp") - (("/bin/sh") (string-append bash "/bin/sh")) - (("exec sbcl") (string-append "exec " out "/bin/sbcl"))) - ;; Disable some tests that fail in our build environment. - (substitute* '("contrib/sb-bsd-sockets/tests.lisp") - ;; This requires /etc/protocols. - (("\\(deftest get-protocol-by-name/error" all) - (string-append "#+nil ;disabled by Guix\n" all))) - (substitute* '("contrib/sb-posix/posix-tests.lisp") - ;; These assume some users/groups which we don't have. - (("\\(deftest pwent\\.[12]" all) - (string-append "#+nil ;disabled by Guix\n" all)) - (("\\(deftest grent\\.[12]" all) - (string-append "#+nil ;disabled by Guix\n" all)))) - #t)) - (add-before 'build 'fix-shared-library-makefile - (lambda _ - (substitute* '("src/runtime/GNUmakefile") - ((" cc") " $(CC)")) - #t)) - (add-before 'build 'fix-contrib-library-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((gmp (assoc-ref inputs "gmp")) - (mpfr (assoc-ref inputs "mpfr"))) - (substitute* '("contrib/sb-gmp/gmp.lisp") - (("\"libgmp\\.so") (string-append "\"" gmp "/lib/libgmp.so"))) - (substitute* '("contrib/sb-mpfr/mpfr.lisp") - (("\"libmpfr\\.so") (string-append "\"" mpfr "/lib/libmpfr.so")))) - #t)) - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (setenv "CC" "gcc") - (invoke "sh" "make.sh" ,@(match (%current-system) - ("powerpc-linux" - `("ecl")) - (_ - `("clisp"))) - (string-append "--prefix=" - (assoc-ref outputs "out")) - ,@(if (target-ppc32?) - ;; 3072 is too much for this architecture. - `("--dynamic-space-size=2048") - `("--dynamic-space-size=3072")) - "--with-sb-core-compression" - "--with-sb-xref-for-internals" - ;; SB-SIMD will only be built on x86_64 CPUs supporting - ;; AVX2 instructions. Some x86_64 CPUs don't, so for reproducibility - ;; we disable it and we don't build its documentation (see the - ;; 'build-doc' phase). - "--without-sb-simd"))) - (add-after 'build 'build-shared-library - (lambda* (#:key outputs #:allow-other-keys) - (setenv "CC" "gcc") - (invoke "sh" "make-shared-library.sh"))) - (replace 'install - (lambda _ - (invoke "sh" "install.sh"))) - (add-after 'build 'build-doc - (lambda _ - ;; Don't build the documentation for SB-SIMD as it is disabled in - ;; the 'build' phase. - (substitute* "doc/manual/generate-texinfo.lisp" - (("exclude '\\(\"asdf\"\\)") - "exclude '(\"asdf\" \"sb-simd\")")) - (with-directory-excursion "doc/manual" - (and (invoke "make" "info") - (invoke "make" "dist"))))) - (add-after 'build 'build-source - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (rc (string-append out "/lib/sbcl/sbclrc")) - (source-dir (string-append out "/share/sbcl"))) - (for-each (lambda (p) - (copy-recursively p (string-append source-dir "/" p))) - '("src" "contrib")) - (mkdir-p (dirname rc)) - (with-output-to-file rc - (lambda () - (display - (string-append "(sb-ext:set-sbcl-source-location \"" - source-dir "\")") ))) - #t))) - (add-after 'install 'remove-coreutils-references - ;; They are only useful on non-Linux, non-SBCL. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share-dir (string-append out "/share/sbcl/"))) - (substitute* (string-append share-dir "src/code/run-program.lisp") - (("\\(run-program \".*uname\"") - "(run-program \"uname\"")) - (substitute* (string-append share-dir "contrib/asdf/asdf.lisp") - (("\\(\".*/usr/bin/env\"") - "(\"/usr/bin/env\"")) - (substitute* (string-append share-dir "contrib/asdf/uiop.lisp") - (("\\(\".*/usr/bin/env\"") - "(\"/usr/bin/env\"")) - #t))) - (add-after 'install 'install-shared-library - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib-dir (string-append out "/lib"))) - (install-file "src/runtime/libsbcl.so" lib-dir) - #t))) - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (old-doc-dir (string-append out "/share/doc")) - (new-doc/sbcl-dir (string-append doc "/share/doc/sbcl"))) - (rmdir (string-append old-doc-dir "/sbcl/html")) - (mkdir-p new-doc/sbcl-dir) - (copy-recursively (string-append old-doc-dir "/sbcl") - new-doc/sbcl-dir) - (delete-file-recursively old-doc-dir) - #t)))) - ;; No 'check' target, though "make.sh" (build phase) runs tests. - #:tests? #f)) - (native-search-paths - (list (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - (search-path-specification - (variable "XDG_CONFIG_DIRS") - (files '("etc"))))) - (home-page "http://www.sbcl.org/") - (synopsis "Common Lisp implementation") - (description "Steel Bank Common Lisp (SBCL) is a high performance Common + (let ((commit "390809ae6f32b8dfbf4f5bd3a10425553f0fb7cd") + (revision "0")) + (package + (name "sbcl") + (version (git-version "2.2.7" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference (url "https://git.code.sf.net/p/sbcl/sbcl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zlypy366zsk0rm91ad27cmary91xpgrbm7al1f1w5cw03yd6k4l")) + (snippet + '(let ((file (open-file "version.lisp-expr" "w"))) + (display "\"2.2.7\"" file) + (close-port file))))) + (build-system gnu-build-system) + (outputs '("out" "doc")) + (native-inputs + ;; From INSTALL: + ;; Supported build hosts are: + ;; SBCL + ;; CMUCL + ;; CCL (formerly known as OpenMCL) + ;; ABCL (recent versions only) + ;; CLISP (only some versions: 2.44.1 is OK, 2.47 is not) + ;; XCL + ;; + ;; From NEWS: + ;; * build enhancement: new host quirks mechanism, support for building under + ;; ABCL and ECL (as well as CCL, CMUCL, CLISP and SBCL itself) + ;; + ;; CCL is not bootstrappable so it won't do. CLISP 2.49 seems to work. + ;; ECL too. As of 2020-07-01, ECL was last updated in 2020 while CLISP + ;; was last updated in 2010, and both take about the same time to build SBCL. + ;; + ;; For now we stick to CLISP as the default for all systems. In any event, keep + ;; the `match' here to make it easier to change the host compiler for various + ;; architectures. Consider switching to ECL if it gets faster than CLISP + ;; (maybe post 2020 release). + (list (match (%current-system) + ("powerpc-linux" ; CLISP fails to build, needs investigating. + ecl) + (_ + clisp)) + cl-asdf + ed + inetutils ;for hostname(1) + texinfo + (texlive-updmap.cfg (list texlive-tex-texinfo)) + which)) + (inputs + (list gmp ; for sb-gmp + mpfr ; for sb-mpfr + (list zstd "lib"))) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + ,@(if (target-arm32?) + ;; TODO: Move to snippet in staging. + `((add-after 'unpack 'dont-force-armv5 + (lambda _ + (substitute* "src/runtime/Config.arm-linux" + (("-march=armv5") ""))))) + '()) + (delete 'configure) + (add-after 'unpack 'fix-build-id + ;; One of the build scripts makes a build id using the current date. + ;; Replace it with a reproducible id using a part of the output hash. + (lambda* (#:key outputs #:allow-other-keys) + (let ((hash (substring (assoc-ref outputs "out") + (+ (string-length (%store-directory)) 1) + (+ (string-length (%store-directory)) 9)))) + (substitute* "make-config.sh" + (("echo .* > output/build-id.inc") + (string-append "echo '\"'guix-sbcl-" + hash + "'\"' > output/build-id.inc")))))) + (add-after 'unpack 'replace-asdf + ;; SBCL developers have not committed to keeping ASDF up to date + ;; due to breaking changes [1]. Guix can handle this situation + ;; easily, and it behooves us to have more control over what version + ;; 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 #: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 "contrib/asdf/asdf.lisp")) + (copy-file guix-asdf contrib-asdf)) + #t)) + (add-before 'build 'patch-unix-tool-paths + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bash (assoc-ref inputs "bash")) + (coreutils (assoc-ref inputs "coreutils")) + (ed (assoc-ref inputs "ed"))) + (define (quoted-path input path) + (string-append "\"" input path "\"")) + ;; Patch absolute paths in string literals. Note that this + ;; occurs in some .sh files too (which contain Lisp code). Use + ;; ISO-8859-1 because some of the files are ISO-8859-1 encoded. + (with-fluids ((%default-port-encoding #f)) + ;; The removed file is utf-16-be encoded, which gives substitute* + ;; trouble. It does not contain references to the listed programs. + (substitute* (delete + "./tests/data/compile-file-pos-utf16be.lisp" + (find-files "." "\\.(lisp|sh)$")) + (("\"/bin/sh\"") (quoted-path bash "/bin/sh")) + (("\"/usr/bin/env\"") (quoted-path coreutils "/usr/bin/env")) + (("\"/bin/cat\"") (quoted-path coreutils "/bin/cat")) + (("\"/bin/ed\"") (quoted-path ed "/bin/ed")) + (("\"/bin/echo\"") (quoted-path coreutils "/bin/echo")) + (("\"/bin/uname\"") (quoted-path coreutils "/bin/uname")))) + ;; This one script has a non-string occurrence of /bin/sh. + (substitute* '("tests/foreign.test.sh") + ;; Leave whitespace so we don't match the shebang. + ((" /bin/sh ") " sh ")) + ;; This file contains a module that can create executable files + ;; which depend on the presence of SBCL. It generates shell + ;; scripts doing "exec sbcl ..." to achieve this. We patch both + ;; the shebang and the reference to "sbcl", tying the generated + ;; executables to the exact SBCL package that generated them. + (substitute* '("contrib/sb-executable/sb-executable.lisp") + (("/bin/sh") (string-append bash "/bin/sh")) + (("exec sbcl") (string-append "exec " out "/bin/sbcl"))) + ;; Disable some tests that fail in our build environment. + (substitute* '("contrib/sb-bsd-sockets/tests.lisp") + ;; This requires /etc/protocols. + (("\\(deftest get-protocol-by-name/error" all) + (string-append "#+nil ;disabled by Guix\n" all))) + (substitute* '("contrib/sb-posix/posix-tests.lisp") + ;; These assume some users/groups which we don't have. + (("\\(deftest pwent\\.[12]" all) + (string-append "#+nil ;disabled by Guix\n" all)) + (("\\(deftest grent\\.[12]" all) + (string-append "#+nil ;disabled by Guix\n" all)))) + #t)) + (add-before 'build 'fix-shared-library-makefile + (lambda _ + (substitute* '("src/runtime/GNUmakefile") + ((" cc") " $(CC)")) + #t)) + (add-before 'build 'fix-contrib-library-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((gmp (assoc-ref inputs "gmp")) + (mpfr (assoc-ref inputs "mpfr"))) + (substitute* '("contrib/sb-gmp/gmp.lisp") + (("\"libgmp\\.so") (string-append "\"" gmp "/lib/libgmp.so"))) + (substitute* '("contrib/sb-mpfr/mpfr.lisp") + (("\"libmpfr\\.so") (string-append "\"" mpfr "/lib/libmpfr.so")))) + #t)) + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (setenv "CC" "gcc") + (invoke "sh" "make.sh" ,@(match (%current-system) + ("powerpc-linux" + `("ecl")) + (_ + `("clisp"))) + (string-append "--prefix=" + (assoc-ref outputs "out")) + ,@(if (target-ppc32?) + ;; 3072 is too much for this architecture. + `("--dynamic-space-size=2048") + `("--dynamic-space-size=3072")) + "--with-sb-core-compression" + "--with-sb-xref-for-internals" + ;; SB-SIMD will only be built on x86_64 CPUs supporting + ;; AVX2 instructions. Some x86_64 CPUs don't, so for reproducibility + ;; we disable it and we don't build its documentation (see the + ;; 'build-doc' phase). + "--without-sb-simd"))) + (add-after 'build 'build-shared-library + (lambda* (#:key outputs #:allow-other-keys) + (setenv "CC" "gcc") + (invoke "sh" "make-shared-library.sh"))) + (replace 'install + (lambda _ + (invoke "sh" "install.sh"))) + (add-after 'build 'build-doc + (lambda _ + ;; Don't build the documentation for SB-SIMD as it is disabled in + ;; the 'build' phase. + (substitute* "doc/manual/generate-texinfo.lisp" + (("exclude '\\(\"asdf\"\\)") + "exclude '(\"asdf\" \"sb-simd\")")) + (with-directory-excursion "doc/manual" + (and (invoke "make" "info") + (invoke "make" "dist"))))) + (add-after 'build 'build-source + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (rc (string-append out "/lib/sbcl/sbclrc")) + (source-dir (string-append out "/share/sbcl"))) + (for-each (lambda (p) + (copy-recursively p (string-append source-dir "/" p))) + '("src" "contrib")) + (mkdir-p (dirname rc)) + (with-output-to-file rc + (lambda () + (display + (string-append "(sb-ext:set-sbcl-source-location \"" + source-dir "\")") ))) + #t))) + (add-after 'install 'remove-coreutils-references + ;; They are only useful on non-Linux, non-SBCL. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share-dir (string-append out "/share/sbcl/"))) + (substitute* (string-append share-dir "src/code/run-program.lisp") + (("\\(run-program \".*uname\"") + "(run-program \"uname\"")) + (substitute* (string-append share-dir "contrib/asdf/asdf.lisp") + (("\\(\".*/usr/bin/env\"") + "(\"/usr/bin/env\"")) + (substitute* (string-append share-dir "contrib/asdf/uiop.lisp") + (("\\(\".*/usr/bin/env\"") + "(\"/usr/bin/env\"")) + #t))) + (add-after 'install 'install-shared-library + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib-dir (string-append out "/lib"))) + (install-file "src/runtime/libsbcl.so" lib-dir) + #t))) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (old-doc-dir (string-append out "/share/doc")) + (new-doc/sbcl-dir (string-append doc "/share/doc/sbcl"))) + (rmdir (string-append old-doc-dir "/sbcl/html")) + (mkdir-p new-doc/sbcl-dir) + (copy-recursively (string-append old-doc-dir "/sbcl") + new-doc/sbcl-dir) + (delete-file-recursively old-doc-dir) + #t)))) + ;; No 'check' target, though "make.sh" (build phase) runs tests. + #:tests? #f)) + (native-search-paths + (list (search-path-specification + (variable "XDG_DATA_DIRS") + (files '("share"))) + (search-path-specification + (variable "XDG_CONFIG_DIRS") + (files '("etc"))))) + (home-page "http://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 Lisp, it provides an interactive environment including a debugger, a statistical profiler, a code coverage tool, and many other extensions.") - ;; Public domain in jurisdictions that allow it, bsd-2 otherwise. MIT - ;; loop macro has its own license. See COPYING file for further notes. - (license (list license:public-domain license:bsd-2 - (license:x11-style "file://src/code/loop.lisp"))))) + ;; Public domain in jurisdictions that allow it, bsd-2 otherwise. MIT + ;; loop macro has its own license. See COPYING file for further notes. + (license (list license:public-domain license:bsd-2 + (license:x11-style "file://src/code/loop.lisp")))))) (define-public ccl ;; Warning: according to upstream, CCL is not bootstrappable. -- 2.37.1 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-stumpwm-Update-to-22.05-0.9f47673.patch >From a663ce96fe0a0ce9f5fe2b7c70b14a1ac9ebebac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20A=2E=20Gomes?= Date: Wed, 10 Aug 2022 11:50:26 +0300 Subject: [PATCH 2/2] gnu: stumpwm: Update to 22.05-0.9f47673. * gnu/packages/wm.scm (stumpwm): Update to 22.05-0.9f47673. --- gnu/packages/wm.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f4dcbf742e..24f6a7ef9c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1819,23 +1819,24 @@ (define-public kanshi (license license:expat))) ; MIT license (define-public stumpwm - (package + (let ((commit "9f476737d4431d88728738408592bd7004f71255") + (revision "0")) + (package (name "stumpwm") - (version "22.05") + (version (git-version "22.05" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/stumpwm/stumpwm") - (commit version))) - (file-name (git-file-name "stumpwm" version)) + (commit commit))) + (file-name (git-file-name name version)) (sha256 - (base32 "12hf70mpwy0ixiyvv8sf8pkwrzz8nb12a8ybvsdpibsxfjxgxnan")))) + (base32 "04jifrsp2zs0wvfh87k4xjvndqg4fs4m8ixrlvrilbcl0x01fl36")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-fiasco texinfo - ;; To build the manual. autoconf automake)) @@ -1891,7 +1892,7 @@ (define-public stumpwm productive, customizable lisp based systems.") (home-page "https://github.com/stumpwm/stumpwm") (license license:gpl2+) - (properties `((cl-source-variant . ,(delay cl-stumpwm)))))) + (properties `((cl-source-variant . ,(delay cl-stumpwm))))))) (define-public sbcl-stumpwm (deprecated-package "sbcl-stumpwm" stumpwm)) -- 2.37.1 --=-=-=-- ------------=_1667228822-26745-1--