From patchwork Tue Mar 7 04:43:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 47764 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 206BC16DA8; Tue, 7 Mar 2023 04:44:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED 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 A8C2616A59 for ; Tue, 7 Mar 2023 04:44:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZPBH-0005x0-48; Mon, 06 Mar 2023 23:44:07 -0500 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 1pZPBD-0005wT-Ti for guix-patches@gnu.org; Mon, 06 Mar 2023 23:44:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZPBD-0007Xp-IH for guix-patches@gnu.org; Mon, 06 Mar 2023 23:44:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZPBD-0003kn-9R for guix-patches@gnu.org; Mon, 06 Mar 2023 23:44:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62025] [PATCH] gnu: Add cl-eazy-gnuplot. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Mar 2023 04:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62025@debbugs.gnu.org Cc: "Paul A. Patience" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167816419814370 (code B ref -1); Tue, 07 Mar 2023 04:44:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Mar 2023 04:43:18 +0000 Received: from localhost ([127.0.0.1]:44245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZPAT-0003ji-7y for submit@debbugs.gnu.org; Mon, 06 Mar 2023 23:43:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:59142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZPAP-0003jX-Od for submit@debbugs.gnu.org; Mon, 06 Mar 2023 23:43:15 -0500 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 1pZPAP-0005nL-A1 for guix-patches@gnu.org; Mon, 06 Mar 2023 23:43:13 -0500 Received: from mail-4018.proton.ch ([185.70.40.18]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZPAM-0007V8-6f for guix-patches@gnu.org; Mon, 06 Mar 2023 23:43:12 -0500 Date: Tue, 07 Mar 2023 04:43:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail; t=1678164186; x=1678423386; bh=fYaXBjjU18b0Ho2oDHmy74wjqTUUcSs217xYeNtatQw=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=W2LfbM+uzyJ2wNju4tujF0eFriTLuztEsx6P7XtO8JrOOqL1zHtkTHhRnkAXkpUuP fHd5Yx7sHnC6NdHdUrdIRZ/L3AoWnZ8mAFs9tMDYbent8VqrGx5rMtokR10bgNAA2c SMPUfJekp4E5CKZjq3ql8++VHcYTF0mGbZbOCeznNvb5O3BNGi7hJpTawGggYCQ5Y8 SXW16Gv+Cd6SL7e2JzHx9nMJec5BSFbbtrD9GIUqmCFc9s5krR9h1nlMTrIXu4Ki1c hWpKvqpqc4jM01aDi/1ggCtPBumRCmzeHSaiGvBkMaQry7hJTXq0exDF399ErpH6HM dw6wTmCgkPf5g== From: "Paul A. Patience" Message-ID: <20230307044257.61605-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.18; envelope-from=paul@apatience.com; helo=mail-4018.proton.ch 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 * gnu/packages/lisp-xyz.scm (sbcl-eazy-gnuplot, cl-eazy-gnuplot, ecl-eazy-gnuplot): New variables. * gnu/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/lisp-xyz.scm | 47 +++++++++++++++++++ .../sbcl-eazy-gnuplot-skip-path-check.patch | 14 ++++++ 3 files changed, 62 insertions(+) create mode 100644 gnu/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch -- 2.39.2 diff --git a/gnu/local.mk b/gnu/local.mk index 70dab40087..6c5a9ce024 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1834,6 +1834,7 @@ dist_patch_DATA = \ %D%/packages/patches/sbcl-aserve-fix-rfe12668.patch \ %D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch \ %D%/packages/patches/sbcl-clml-fix-types.patch \ + %D%/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch \ %D%/packages/patches/sbcl-png-fix-sbcl-compatibility.patch \ %D%/packages/patches/scalapack-gcc-10-compilation.patch \ %D%/packages/patches/scheme48-tests.patch \ diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b06a3b88f9..472201116f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9992,6 +9992,53 @@ (define-public sbcl-cl-ana (define-public cl-ana (sbcl-package->cl-source-package sbcl-cl-ana)) +(define-public sbcl-eazy-gnuplot + (let ((commit "2eb900fe2557e6c066a9851c166e572c25bc0996") + (revision "0")) + (package + (name "sbcl-eazy-gnuplot") + (version (git-version "0.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/guicho271828/eazy-gnuplot") + (commit commit))) + (file-name (git-file-name "cl-eazy-gnuplot" version)) + (sha256 + (base32 "0mpkx1z52riahydzvqv7kk15p0pv2k7k5a7j65fg571kcxmssx8s")) + (patches (search-patches "sbcl-eazy-gnuplot-skip-path-check.patch")))) + (build-system asdf-build-system/sbcl) + (native-inputs + (list sbcl-fiveam)) + (inputs + (list gnuplot + sbcl-alexandria + sbcl-iterate + sbcl-trivia)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda _ + (substitute* "src/package.lisp" + (("\"gnuplot\"") + (string-append "\"" (which "gnuplot") "\"")))))))) + (home-page "https://github.com/guicho271828/eazy-gnuplot") + (synopsis "Common Lisp interface to gnuplot") + (description + "Eazy-Gnuplot is a Common Lisp interface to gnuplot which eschews CFFI, +CLOS and structures. It communicates with @command{gnuplot} via +@code{*standard-output*}, and users can plot data by printing to that +stream.") + (license license:llgpl)))) + +(define-public cl-eazy-gnuplot + (sbcl-package->cl-source-package sbcl-eazy-gnuplot)) + +(define-public ecl-eazy-gnuplot + (sbcl-package->ecl-package sbcl-eazy-gnuplot)) + (define-public sbcl-archive (let ((commit "631271c091ed02994bec3980cb288a2cf32c7cdc") (revision "1")) diff --git a/gnu/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch b/gnu/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch new file mode 100644 index 0000000000..ccc9c09fb9 --- /dev/null +++ b/gnu/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch @@ -0,0 +1,14 @@ +Don't check whether gnuplot is present in $PATH, because we know it is. + +diff --git a/eazy-gnuplot.asd b/eazy-gnuplot.asd +index 7b1c09b..4657cd6 100644 +--- a/eazy-gnuplot.asd ++++ b/eazy-gnuplot.asd +@@ -37,7 +37,4 @@ + :fill-pointer t))) + (setf (fill-pointer seq) (read-sequence seq stream)) + seq))) +- :perform (load-op :before (op c) +- (unless (zerop (nth-value 2 (uiop:run-program "which gnuplot" :ignore-error-status t))) +- (warn "Could not find GNUPLOT in $PATH"))) + :in-order-to ((test-op (test-op eazy-gnuplot.test))))