From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id kKQnF2f12mb2RQAAqHPOHw:P1 (envelope-from ) for ; Fri, 06 Sep 2024 12:28:23 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id kKQnF2f12mb2RQAAqHPOHw (envelope-from ) for ; Fri, 06 Sep 2024 14:28:23 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=g7kGZPT+; dkim=fail ("headers rsa verify failed") header.d=fastmail.net header.s=fm1 header.b=CxInoNrG; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=l0LIOmPo; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=fastmail.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725625703; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=nkqCynggYL2OLjug+w18kkjMLp6ka0nsQGcQbjzgF30=; b=IEFr/gXxzcJdgnzLBNA0Qgo6TKVLoek1ZfhqZcj+miXCdXTz0v5WuAfbYBmYasSP/PM4Iq +hNd4ZDf8YPLkC8mADCVYiqw//2E6uqWvC8LRkVbtE2ns6a/7X9EI0axBeWLSNl0pSLjGu 2lyYDu03NalvEJPz+2j+8I3nmazs7muCHWrTYwEZ0kyAT1PHSwsoPyZid8oYcqWr7foF8Z TycqdKZx10u6BLvcQURedJU7vvL4io7CFc8e+JgUCYnEpWeE5dqaOPxuk+NTfDa21i7m5c 8VW2FQveNUCWHu9Sg4fZRPKxPT3IZ953nu35mmC/cn7sxqwqYsAcUnzJpEiOuA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=g7kGZPT+; dkim=fail ("headers rsa verify failed") header.d=fastmail.net header.s=fm1 header.b=CxInoNrG; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=l0LIOmPo; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=fastmail.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725625703; a=rsa-sha256; cv=none; b=Yz4k/zZ/bnsRsD8wQ9QgNhEcsrdPx1dNARPI1LVJTm+tnrsio9yyf+8PLrMpsFRrffcQjl UitKPbpuYWTpr0Dcys4p6nhx7e0W7hYCadt9hKNoXpDrL+j7u2tAarwS/LjXvkgcqS15ex 8IIeD6hI4Hbne/SRUN9KEoiY7Hh8Mz8x83uLOVA9YbWPHpzNAmUDFmMOuqO1SeiCoFDpEx SKF8aBeJw3qELi/PhQ36F2l8EJpCdK1SYEvtAB277r2/JUPDgMVc0gX5OZxY1D6XooB6hA lNrJBrd1QBwqZc90DaCs383tgRTvKyGIBTJiLkV+gZHB0/9s1inMPBPzN7IOIA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F36A53F6CF for ; Fri, 6 Sep 2024 14:28:22 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smY4M-00033f-3i; Fri, 06 Sep 2024 08:28:07 -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 1smY4I-0002c5-Mj for guix-patches@gnu.org; Fri, 06 Sep 2024 08:28:03 -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 1smY4I-0002Ge-Cb for guix-patches@gnu.org; Fri, 06 Sep 2024 08:28:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=nkqCynggYL2OLjug+w18kkjMLp6ka0nsQGcQbjzgF30=; b=g7kGZPT+Uf/8P9s+P+99b3M1tfBIEj65QyTFK5dWe3BYzA5HkA/REGUn7u+d2ePAzbhW689CoSAbiMWIobQwfOphbbJGixfB2aHxFtgwxJsbttPcN4vNRHA2CJX92NcLbd16bvQBl8shHYU7puzs6w5L1rug1lVVlimKyUE53PF205LnxwyMyt1htP0PyZiaPhqVN0XNRy2RtsNcjoF/qDfYfzIuEg8UcxOR0NoPjTmE5/6L/5xhg5a6hTNBVgWeiqLkRoU1Ja6fW2QwejN3nDaG+jHKFamvafSA8hDhkPciv0yUnARKL410Eo+iKFrp6yDCRItzclaiJAy9qxiLGg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smY4H-0003oc-MN for guix-patches@gnu.org; Fri, 06 Sep 2024 08:28:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73057] [PATCH 2/2] gnu: Add sbcl-ciel-repl. Resent-From: Konrad Hinsen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 12:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73057 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73057@debbugs.gnu.org Received: via spool by 73057-submit@debbugs.gnu.org id=B73057.172562567014642 (code B ref 73057); Fri, 06 Sep 2024 12:28:01 +0000 Received: (at 73057) by debbugs.gnu.org; 6 Sep 2024 12:27:50 +0000 Received: from localhost ([127.0.0.1]:52430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smY45-0003o6-Sz for submit@debbugs.gnu.org; Fri, 06 Sep 2024 08:27:50 -0400 Received: from fhigh6-smtp.messagingengine.com ([103.168.172.157]:51839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smY43-0003np-2C for 73057@debbugs.gnu.org; Fri, 06 Sep 2024 08:27:47 -0400 Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfhigh.phl.internal (Postfix) with ESMTP id 8846911401D4; Fri, 6 Sep 2024 08:27:42 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-04.internal (MEProxy); Fri, 06 Sep 2024 08:27:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.net; h= cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm1; t=1725625662; x=1725712062; bh=nkqCynggYL 2OLjug+w18kkjMLp6ka0nsQGcQbjzgF30=; b=CxInoNrGYeXZ27bHw6aXENiLBa Dxu5QFtY11LnjIxGzkMgkrKzYzAa+hZbbxuQQolFeW/WNyMfbQ9YYd3oD/lVIBBa mDnp78Dnn908HjDMq9HiQD4oGRcAhn8HXCFAH6jn432SsakiPBvBPM3ikqL1jjAH yWlRgircCtRPImcbr9rzlYjEHkwBCr623wJr5wsHBpxbxD1qxeQPXER/nI4DIaqD o9SYxs2soVvIGCcjIhyGxDaXX4N0nhFm57G+sG0UcwU8L93qZMdHvvZ8q0yLh0RM 40YkURylj9ecKaqCbiZN1O0ZH4GqIF3bRynFw6yzfFn4IrOigryGMk22ogwQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1725625662; x=1725712062; bh=nkqCynggYL2OLjug+w18kkjMLp6k a0nsQGcQbjzgF30=; b=l0LIOmPoBXyYYSPTMGvyqzPpa/Gf7ISDAAWGhQVMFMne wHga9rRQs2QN4eMKL1vBa8oPY6GjDN4uE53A5apcbDCUNqlxXmGqTd9W6fn1gPn3 YW8TlVisn86/xdfUV1idORmWo2Fg4q6rMMnZP75lEg+P93i5GFpCkvp19bzf+qtD k68EAwsXy3XkZiR44jwcaaSZydnrCkGwmcLz7agZ3JTKrDXdLU2Yzmo14b9Lb8Qu mv8bvcPReWnfbOzMSaVglR/hetDaHC6OD6QmDfF4zvrYP/cQ2/a8+eKBIAQND27n iKxRb8yGcpE8Rs5n4BpXsVhE8aTVO2vHVarQcomXJA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeiuddgheefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffujg hffffkgggtsehttdertddttddtnecuhfhrohhmpefmohhnrhgrugcujfhinhhsvghnuceo khhonhhrrggurdhhihhnshgvnhesfhgrshhtmhgrihhlrdhnvghtqeenucggtffrrghtth gvrhhnpeelleehtddugfelhfegvdeuvdevteeltdffieetieekffdtheevgedugefgheej tdenucffohhmrghinhepghhithhhuhgsrdgtohhmpdgtihgvlhdqlhgrnhhgrdhorhhgne cuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepkhhonhhr rggurdhhihhnshgvnhesfhgrshhtmhgrihhlrdhnvghtpdhnsggprhgtphhtthhopedvpd hmohguvgepshhmthhpohhuthdprhgtphhtthhopegstggtsehkhhhinhhsvghnrdhfrghs thhmrghilhdrnhgvthdprhgtphhtthhopeejfedtheejseguvggssghughhsrdhgnhhurd horhhg X-ME-Proxy: Feedback-ID: i184641e2:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 6 Sep 2024 08:27:41 -0400 (EDT) From: Konrad Hinsen In-Reply-To: <871q1xjfqc.fsf@kitej> References: <871q1xjfqc.fsf@kitej> Date: Fri, 06 Sep 2024 14:27:40 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: F36A53F6CF X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -10.52 X-Spam-Score: -10.52 X-TUID: 2AY3W4T6FDMm * gnu/packages/lisp-xyz.scm (sbcl-ciel-repl): New variable. Change-Id: I85eabe27d35a6d540a634f4121209b59a6c7085b --- gnu/packages/lisp-xyz.scm | 69 ++++++++++++++++++++++++++++ gnu/packages/patches/ciel-repl.patch | 31 +++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 gnu/packages/patches/ciel-repl.patch diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c22d5f6565..3427dbec0f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3563,6 +3563,75 @@ (define-public cl-ciel (define-public ecl-ciel (sbcl-package->ecl-package sbcl-ciel)) +(define-public sbcl-ciel-repl + (let ((commit "0b26d64dcd91a3a2aa962842629a853261dd30fe") + (version "0.2.1")) + (package + (name "sbcl-ciel-repl") + (version version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ciel-lang/CIEL") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gm8slnz4jw98rkijnh2dp6x629xdnfk8z7j35g03j6ypr56v06h")) + (patches (search-patches "ciel-repl.patch")))) + (build-system asdf-build-system/sbcl) + (inputs + (list sbcl-ciel + sbcl-cl-readline + sbcl-lisp-critic + sbcl-magic-ed)) + (arguments + (list + #:asd-systems ''("ciel/repl") + #:phases + #~(modify-phases %standard-phases + ;; The built-in scripts require special care. They are + ;; read from src/scripts in the current directory. + ;; When the binary is built, the current directory is + ;; {out}/bin, so the scripts have to be copied there, + ;; but that copy must be deleted after the binary has been + ;; built, otherwise it would end up in the package. + (add-after 'create-asdf-configuration 'install-scripts + (lambda _ + (let ((dir (string-append #$output "/bin/src/scripts"))) + (for-each (lambda (file) + (install-file file dir)) + (find-files "src/scripts" "\\.lisp$"))))) + (add-after 'install-scripts 'build-program + (lambda* (#:key outputs #:allow-other-keys) + (build-program + (string-append #$output "/bin/ciel") + outputs + #:entry-program '((ciel::main)) + #:dependencies '("ciel/repl") + #:compress? #t))) + (add-after 'build-program 'delete-scripts + (lambda _ + (let ((dir (string-append #$output "/bin/src"))) + (delete-file-recursively dir)))) + ;; Remove everything except the binary. + (add-after 'delete-scripts 'delete-lisp-files + (lambda _ + (let ((dir (string-append #$output "/etc"))) + (delete-file-recursively dir)) + (let ((dir (string-append #$output "/lib"))) + (delete-file-recursively dir)) + (let ((dir (string-append #$output "/share"))) + (delete-file-recursively dir)) + (let ((dir (string-append #$output "/.asd-files"))) + (delete-file-recursively dir))))))) + (home-page "http://ciel-lang.org/") + (synopsis "Terminal REPL for CIEL") + (description + "CIEL as a precompiled binary and a full-featured REPL +for the terminal.") + (license license:expat)))) + (define-public sbcl-circular-streams (let ((commit "e770bade1919c5e8533dd2078c93c3d3bbeb38df") (revision "1")) diff --git a/gnu/packages/patches/ciel-repl.patch b/gnu/packages/patches/ciel-repl.patch new file mode 100644 index 0000000000..ab4dfdd793 --- /dev/null +++ b/gnu/packages/patches/ciel-repl.patch @@ -0,0 +1,31 @@ +The standard CIEL REPL includes Quicklisp. We remove it for packaging +with Guix. + +The default Quicklisp-based build procedure removes one dependency +relation from the system definition for ciel/repl and replaces it by +an explicit load command using Quicklisp, as a workaround to some build +issue. Fortunately we don't have this issue with Guix, so we go back +to letting ASDF manage this dependency relation. + +--- a/repl.lisp ++++ b/repl.lisp +@@ -1,8 +1,5 @@ + ;; #!/usr/bin/sbcl --script +-(load "~/quicklisp/setup") + +-(let ((*standard-output* (make-broadcast-stream))) +- (ql:quickload "cl-readline")) + (uiop:define-package :sbcli + (:use :common-lisp :trivial-package-local-nicknames) + (:import-from :magic-ed +--- a/ciel.asd ++++ b/ciel.asd +@@ -179,7 +179,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + (asdf:defsystem "ciel/repl" + :description "readline REPL for CIEL with quality of life improvements." +- :depends-on (;; :ciel ;; let's avoid, it could run side effects twice (like a defparameter set then reset). ++ :depends-on (:ciel + ;; deps + :cl-readline + :lisp-critic ;; it would be nice to integrate it with Slime. -- 2.45.2