From patchwork Wed Apr 17 02:34:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Katherine Cox-Buday X-Patchwork-Id: 3302 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CAA9116E99; Wed, 17 Apr 2019 03:36:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RDNS_NONE,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from lists.gnu.org (unknown [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9208916E95 for ; Wed, 17 Apr 2019 03:35:45 +0100 (BST) Received: from localhost ([127.0.0.1]:45739 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGaPs-0000QL-Qo for patchwork@mira.cbaines.net; Tue, 16 Apr 2019 22:35:16 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#35302] Update ASDF Version to 3.3.3. Resent-From: Katherine Cox-Buday Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Apr 2019 02:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35302 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 35302@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15554684822506 (code B ref -1); Wed, 17 Apr 2019 02:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Apr 2019 02:34:42 +0000 Received: from localhost ([127.0.0.1]:39018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hGaPJ-0000eJ-Hq for submit@debbugs.gnu.org; Tue, 16 Apr 2019 22:34:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hGaPH-0000e7-3u for submit@debbugs.gnu.org; Tue, 16 Apr 2019 22:34:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:55156) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hGaPB-0003GI-SE for submit@debbugs.gnu.org; Tue, 16 Apr 2019 22:34:34 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:user-agent:mime-version; bh=0kpZbm21Qz0Mj77MYmQKGugsGxtx68oWuO8/kTChAaI=; b=QmPasgjiMFa01LUzLB9IDxkAXHLnE4nLOWvDiGXwe9U/evbyNkgR40lLfTDAIf0n+H KFcyIJJApvreyeGSiqVgcTkYjqlpOu2TB2ZKfI2mI0vnJmR9+5y1uUWXTFro/Ojl/4Ef wfoxNF6S5YY1MoMKWR8I4HXyhT31RlpiSBbtC9A3fB7a4aucoFOgoLuK5h+Dvve2GUvn NqCcCy8IzN1wuhtQzrtBTo7mgcF4QbsX1U76PlrlaM4b3uYvNQaAU5A9QyLU4kTD0GxL novdjzKQDUgCeYeIsj/0mKXqB7itb4vNY7lJu5qI93DzDbq3Mm6GiK6f6o/XoAqadEkA LnlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:user-agent :mime-version; bh=0kpZbm21Qz0Mj77MYmQKGugsGxtx68oWuO8/kTChAaI=; b=Du//MU1HrXeFU532GtR8KdOELgyA77ULltxrmRJkOLnQx65is7vZXQPaILzsKgwJiG /HDLixY46ohs0O/rOAPsd97WrYDmmAwMx/speECUC3rhK8FQVIQeFM1vQDu5Kxd7bV9v bzOxznkKVa9uOLqQsJ1R++HPluB0Z8jXim7C48qtOdD4cqcY3tL5ZkrRBOb4ZQWOs2/y tw/rMTa2zRwBpZlh5p0xQ5mfrCQmVS+ENmoOUdWGGZzrJ0XHBX7OGoSAPkRXuS6/nUYY dZS2c2cUo6vtAY+lnFeyTdNAht+5NXhiDbm7B2v5bwQQdhN2KldkFHrF5pN+i3qDSgoa 0zLQ== X-Gm-Message-State: APjAAAVcLIty427lQkDSN6GhJEu0J4BA9FvgiRW+7rRZFDz7ezK7f8EB u3grgcpfAfT+yl9/aaA1RLIS4VPk X-Google-Smtp-Source: APXvYqz8r1kTLMIg9E09DYZHP42NdGcaSPzKf1az62BLaw4UJ80mHCF+dxEn3qkUjaSz/4YTiR4p0Q== X-Received: by 2002:a24:25cf:: with SMTP id g198mr32314085itg.141.1555468468793; Tue, 16 Apr 2019 19:34:28 -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> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 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