From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:55203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGaPg-0000EW-7n for guix-patches@gnu.org; Tue, 16 Apr 2019 22:35:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hGaPe-0003he-S5 for guix-patches@gnu.org; Tue, 16 Apr 2019 22:35:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53707) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hGaPe-0003hO-Li for guix-patches@gnu.org; Tue, 16 Apr 2019 22:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hGaPe-0000f1-Fl for guix-patches@gnu.org; Tue, 16 Apr 2019 22:35:02 -0400 Subject: [bug#35302] Update ASDF Version to 3.3.3. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:55073) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGaPA-0008Oo-FX for guix-patches@gnu.org; Tue, 16 Apr 2019 22:34:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hGaP8-0003Ef-Vt for guix-patches@gnu.org; Tue, 16 Apr 2019 22:34:32 -0400 Received: from mail-it1-x12b.google.com ([2607:f8b0:4864:20::12b]:54217) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hGaP8-0003Dq-Dw for guix-patches@gnu.org; Tue, 16 Apr 2019 22:34:30 -0400 Received: by mail-it1-x12b.google.com with SMTP id y204so2129848itf.3 for ; Tue, 16 Apr 2019 19:34:29 -0700 (PDT) Received: from gazelle-pro (172-221-246-205.dhcp.chtrptr.net. [172.221.246.205]) by smtp.gmail.com with ESMTPSA id p7sm19489446ioh.70.2019.04.16.19.34.27 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Apr 2019 19:34:27 -0700 (PDT) From: Katherine Cox-Buday Date: Tue, 16 Apr 2019 21:34:26 -0500 Message-ID: <87pnplnyvh.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35302@debbugs.gnu.org --=-=-= Content-Type: text/plain This patch overwrites the ASDF version vendored into SBCL with the newest version. The SBCL devs have stated[1] that they are not planning on keeping their version of ASDF up to date. This will allow our SBCL packages to use the newest ASDF going forward so. [1] - https://bugs.launchpad.net/sbcl/+bug/1823442 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-Add-cl-clack.patch >From cfefce666df7a5fbc0f3ab4e771ccc8c28620bdd Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Mon, 15 Apr 2019 22:33:27 -0500 Subject: [PATCH 1/2] gnu: Add cl-clack. * gnu/packages/lisp.scm (cl-clack): New variable. --- gnu/packages/lisp.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 5549f7ddc8..449bcc856f 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -5246,3 +5246,41 @@ Python's WSGI and Ruby's Rack.") (define-public cl-clack (sbcl-package->cl-source-package sbcl-clack)) + +(define-public cl-asdf + (let ((version "3.3.3")) + (package + (name "cl-asdf") + (version version) + (source + (origin + (method url-fetch) + (uri + (string-append + "https://common-lisp.net/project/asdf/archives/asdf-" + version ".lisp")) + (sha256 + (base32 "18lr6kxvzhr79c9rx3sdricz30aby866fj0m24w27zxsqlyvn3rd")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils) + (guix build lisp-utils)) + #:builder + (begin + (use-modules (guix build utils) + (guix build lisp-utils)) + (let* ((out (string-append (assoc-ref %outputs "out"))) + (asdf-install + (format #f "~a~a/source/asdf/" out %source-install-prefix)) + (asdf (string-append (assoc-ref %build-inputs "source")))) + (mkdir-p asdf-install) + (copy-file asdf + (string-append asdf-install "asdf.lisp")))))) + (home-page "https://common-lisp.net/project/asdf/") + (synopsis "Another System Definition Facility") + (description + "ASDF is what Common Lisp hackers use to build and load software. It is +the successor of the Lisp DEFSYSTEM of yore. ASDF stands for Another System +Definition Facility.") + ;; MIT License + (license license:expat)))) -- 2.20.1 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-sbcl-Update-ASDF-Version-to-3.3.3.patch >From a3b9985c46e2dbc9ce472ed5522cc5f1e8763c6e Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Mon, 15 Apr 2019 22:38:55 -0500 Subject: [PATCH 2/2] gnu: sbcl: Update ASDF Version to 3.3.3. * gnu/packages/lisp.scm (sbcl): Update ASDF Version to 3.3.3. --- gnu/packages/lisp.scm | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 449bcc856f..419ff1d2eb 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -328,14 +328,10 @@ an interpreter, a compiler, a debugger, and much more.") version "-source.tar.bz2")) (sha256 (base32 "08z62qba0kmm15k93s2rq7ipi769895g8iwigcp20qjh6amwnwph")) - (modules '((guix build utils))) - (snippet - ;; Add sbcl-bundle-systems to 'default-system-source-registry'. - `(begin - (substitute* "contrib/asdf/asdf.lisp" - ,@(asdf-substitutions name)) - #t)))) + (modules '((guix build utils))))) (build-system gnu-build-system) + (inputs + `(("cl-asdf" ,cl-asdf))) (outputs '("out" "doc")) (native-inputs ;; From INSTALL: @@ -415,6 +411,22 @@ an interpreter, a compiler, a debugger, and much more.") ;; them in HOME, so it needs to be writeable. (add-before 'build 'set-HOME (lambda _ (setenv "HOME" "/tmp") #t)) + (add-after 'unpack 'replace-asdf + ;; SBCL developers have not committed to keeping ASDF up to date + ;; due to breaking changes. 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. + (lambda* (#:key build-inputs #:allow-other-keys) + (let* ((cl-asdf (assoc-ref %build-inputs "cl-asdf")) + (guix-asdf + (format #f "~a/share/common-lisp/source/asdf/asdf.lisp" + cl-asdf)) + (out (string-append (assoc-ref %outputs "out"))) + (contrib-asdf (format #f "./contrib/asdf/asdf.lisp"))) + (copy-file guix-asdf contrib-asdf) + (substitute* "contrib/asdf/asdf.lisp" + ,@(asdf-substitutions name))))) (replace 'build (lambda* (#:key outputs #:allow-other-keys) (setenv "CC" "gcc") @@ -445,8 +457,8 @@ an interpreter, a compiler, a debugger, and much more.") new-doc/sbcl-dir) (delete-file-recursively old-doc-dir) #t)))) - ;; No 'check' target, though "make.sh" (build phase) runs tests. - #:tests? #f)) + ;; No 'check' target, though "make.sh" (build phase) runs tests. + #:tests? #f)) (native-search-paths (list (search-path-specification (variable "XDG_DATA_DIRS") -- 2.20.1 --=-=-= Content-Type: text/plain -- Katherine --=-=-=--