From patchwork Tue Oct 24 07:31:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?QW5kcsOpIEEuIEdvbWVz?= X-Patchwork-Id: 55263 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 7C7DC27BBE9; Tue, 24 Oct 2023 08:33:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8062327BBE2 for ; Tue, 24 Oct 2023 08:33:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvBu4-0003A4-Qz; Tue, 24 Oct 2023 03:32:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvBtz-00039T-8C for guix-patches@gnu.org; Tue, 24 Oct 2023 03:32:37 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvBtx-0006hm-3R for guix-patches@gnu.org; Tue, 24 Oct 2023 03:32:34 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvBuQ-0001wi-FB for guix-patches@gnu.org; Tue, 24 Oct 2023 03:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66143] [PATCH]: Update emacs-slime and sbcl-slime-swank to 2.28-0.1e4b741 Resent-From: =?utf-8?b?QW5kcsOp?= A. Gomes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 07:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66143 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: Guillaume Le Vaillant Cc: ludo@gnu.org, Christopher Baines , 66143@debbugs.gnu.org Received: via spool by 66143-submit@debbugs.gnu.org id=B66143.16981327597436 (code B ref 66143); Tue, 24 Oct 2023 07:33:02 +0000 Received: (at 66143) by debbugs.gnu.org; 24 Oct 2023 07:32:39 +0000 Received: from localhost ([127.0.0.1]:52943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvBu3-0001vr-1S for submit@debbugs.gnu.org; Tue, 24 Oct 2023 03:32:39 -0400 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]:44056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvBu0-0001vd-RH for 66143@debbugs.gnu.org; Tue, 24 Oct 2023 03:32:38 -0400 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-507b9408c61so5688298e87.0 for <66143@debbugs.gnu.org>; Tue, 24 Oct 2023 00:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698132721; x=1698737521; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=rYnzR198gW0qyutFjnziCI6NWNrCtVT2EhmI0E8pfhQ=; b=KB03CAPEGWBa/CXFNyllGIDC0heV3oS4Doa/uVMvKW5OvT6ygybw12EDvQe87H7y73 lz6pxAQFQSdN86GBtj6QsIeW7LmJJIiCZC0RO57SbPXMGay7byEsY1YgRpjYscnr6uQM 5nW2dMCR3ND3bhg7RPPJNm3W8C7Wc9Mzr6G0THdJpLSWnhE6WX5AVaOhnGtSZjgczyHM RjhbpQfYzi19TzjCPFvOrYROSrs1Z2Pz9BBVnSGZjHpGu9mKaQ9WpHHKYBe2s3UVh8Cm H/6qy1nc6vNS9yLCI60l0Oer3ixNk+qL10lFiyQoWg29cpOth/xSGkyQ84gr+ZD2PL/c lWmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698132721; x=1698737521; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=rYnzR198gW0qyutFjnziCI6NWNrCtVT2EhmI0E8pfhQ=; b=S8t35xs/OlUtsJ3Q6O9EGIJR02kIEGx2Qo+BjjhJml9+wrVhTYCHH3SJDVqUwh7wPv UYdzk7Ru01UDW2MZ11ueIoU5rLqnkomgWAcyAYFhc/6pKDIpHhLUUFSj/WljjnpSOyR4 WL6pdBi1xDa6PnTINrcE7tLsOoW/golNzRIY0kquJAtq5c2pSUpInEpM15y164OE7ISB 71ZhBGPM5KttBuTvENfstJOwkM2v5napbwctVFATJ+I8EpMTJlC1likFRRpkXCbGj6aX EUXQkUSUgvObgBrPvLa2GBJeA8j3pZUhs5fZBCk0dsrI8QpSpsXWqOTlXOTA3838nIBs 7+AQ== X-Gm-Message-State: AOJu0YyaUIwKvThfaLv/FHyJ+4F1MaKnHLDLUPgtkav7kgXXIvmQWvUT VipaCP7TxuiqKh5tkOxOgMQ= X-Google-Smtp-Source: AGHT+IF3+isiJsDp282CA7pjTo4kpUVHKH/X8BXWOIrFleP+t7kgEcU3AiVCIIuk3O+VODV+lodI8g== X-Received: by 2002:a19:4f0d:0:b0:507:a2f3:32dc with SMTP id d13-20020a194f0d000000b00507a2f332dcmr8498373lfb.12.1698132721226; Tue, 24 Oct 2023 00:32:01 -0700 (PDT) Received: from mini (82.131.72.150.cable.starman.ee. [82.131.72.150]) by smtp.gmail.com with ESMTPSA id eq25-20020a056512489900b005079fff83d2sm2010089lfb.3.2023.10.24.00.32.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 00:32:00 -0700 (PDT) From: =?utf-8?b?QW5kcsOp?= A. Gomes In-Reply-To: <877cne7tml.fsf@kitej> (Guillaume Le Vaillant's message of "Sun, 22 Oct 2023 11:51:27 +0000") References: <87fs375jy2.fsf@gmail.com> <87il7y7efi.fsf@cbaines.net> <87pm25l2ga.fsf@gmail.com> <875y3uob1g.fsf@gmail.com> <87jzrhaxg7.fsf@gmail.com> <877cne7tml.fsf@kitej> Date: Tue, 24 Oct 2023 10:31:59 +0300 Message-ID: <87v8awa32o.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Guillaume Le Vaillant writes: > Hi. > Concerning patch 2 for sbcl-slime-swank, the first 'substitute*' form > of the 'set-fasl-directory' phase looks obsolete because of changes in > "swank.asd". > If the fasl files are now put in the right place even without it, and if > slime and swank still work fine, could you send an updated patch? > Thanks. Hi Guillaume, Thanks for pointing that out. Please find the updated patches attached. From ef9e74ddf74fb336748529ce6bcc508ef245712c Mon Sep 17 00:00:00 2001 From: "Andre A. Gomes" Date: Tue, 24 Oct 2023 10:28:43 +0300 Subject: [PATCH 2/2] gnu: sbcl-slime-swank: Update to 2.28-0.0cc2e73. * gnu/packages/lisp-xyz.scm (sbcl-slime-swank): Update to 2.28-0.0cc2e73. --- gnu/packages/lisp-xyz.scm | 83 ++++++++++++++------------------------- 1 file changed, 29 insertions(+), 54 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e7b603f59d..692142e4a8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3610,76 +3610,51 @@ (define-public ecl-pythonic-string-reader (sbcl-package->ecl-package sbcl-pythonic-string-reader)) (define-public sbcl-slime-swank - (package - (name "sbcl-slime-swank") - (version "2.28") - (source - (origin - (file-name (git-file-name "cl-slime-swank" version)) - (method git-fetch) - (uri (git-reference - (url "https://github.com/slime/slime/") - (commit (string-append "v" version)))) - (sha256 - (base32 "1acmm4w1mv1qzpnkgc4wyiilbx8l0dk16sx8wv815ri5ks289rll")) - (modules '((guix build utils))) + (let ((commit "0cc2e736112a0bc2a048ef6efd11dd67e3fbf7ad") + (revision "0")) + (package + (name "sbcl-slime-swank") + (version (git-version "2.28" revision commit)) + (source + (origin + (file-name (git-file-name "cl-slime-swank" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/slime/slime/") + (commit commit))) + (sha256 + (base32 "0iq9r4007rrnabj290y79i926x2m4j20j6b0x701pkywz926sn02")) + (modules '((guix build utils))) (snippet ;; The doc folder drags `gawk' into the closure. Doc is already ;; provided by emacs-slime. `(begin (delete-file-recursively "doc") #t)))) - (build-system asdf-build-system/sbcl) - (arguments - '(#:asd-systems '("swank") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-fasl-directory - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib-dir (string-append out "/lib/common-lisp/" - (%lisp-type) - "/slime-swank/"))) - ;; Use the ASDF registry instead of Swank's default that places - ;; the .fasl files in ~/.slime. - (substitute* "swank.asd" - (("\\(load \\(asdf::component-pathname f\\)\\)" all) - (string-append - all "\n" - "(setf (symbol-value" - "(read-from-string \"swank-loader::*fasl-directory*\"))" - "\"" lib-dir "\")"))) + (build-system asdf-build-system/sbcl) + (arguments + '(#:asd-systems '("swank" "swank/exts") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-fasl-directory + (lambda* (#:key outputs #:allow-other-keys) (substitute* "swank-loader.lisp" (("\\(probe-file fasl\\)" all) ;; Do not try to delete Guix store files. (string-append all "\n" " (not (equal (subseq (pathname-directory fasl) 1 3)" - " '(\"gnu\" \"store\"))) ; XXX: GUIX PATCH"))))))))) - (home-page "https://github.com/slime/slime") - (synopsis "Common Lisp Swank server") - (description - "This is only useful if you want to start a Swank server in a Lisp + " '(\"gnu\" \"store\"))) ; XXX: GUIX PATCH")))))))) + (home-page "https://github.com/slime/slime") + (synopsis "Common Lisp Swank server") + (description + "This is only useful if you want to start a Swank server in a Lisp processes that doesn't run under Emacs. Lisp processes created by @command{M-x slime} automatically start the server.") - (license (list license:gpl2+ license:public-domain)))) + (license (list license:gpl2+ license:public-domain))))) (define-public cl-slime-swank - (let ((pkg (sbcl-package->cl-source-package sbcl-slime-swank))) - (package - (inherit pkg) - (arguments - (substitute-keyword-arguments (package-arguments pkg) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'revert-asd-patch - ;; We do not want to include the Guix patch in the cl- package - ;; since it would include the sbcl- package in the closure. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (source-path (string-append out "/share/common-lisp/source/"))) - (substitute* (string-append source-path "/cl-slime-swank/swank.asd") - ((".*fasl-directory.*") "")))))))))))) + (sbcl-package->cl-source-package sbcl-slime-swank)) (define-public ecl-slime-swank (sbcl-package->ecl-package sbcl-slime-swank)) -- 2.41.0