From patchwork Sun Oct 15 17:47:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54843 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 0554127BBE2; Sun, 15 Oct 2023 18:47:59 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 785D827BBEA for ; Sun, 15 Oct 2023 18:47:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qs5DJ-0005rA-IZ; Sun, 15 Oct 2023 13:47:41 -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 1qs5DG-0005qV-M7 for guix-patches@gnu.org; Sun, 15 Oct 2023 13:47:38 -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 1qs5DG-0001TC-Eb for guix-patches@gnu.org; Sun, 15 Oct 2023 13:47:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qs5De-00072o-N6 for guix-patches@gnu.org; Sun, 15 Oct 2023 13:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66566] [PATCH 1/3] gnu: poke: Revise package definition. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Oct 2023 17:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66566 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66566@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 66566-submit@debbugs.gnu.org id=B66566.169739206926995 (code B ref 66566); Sun, 15 Oct 2023 17:48:02 +0000 Received: (at 66566) by debbugs.gnu.org; 15 Oct 2023 17:47:49 +0000 Received: from localhost ([127.0.0.1]:54076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs5DR-00071L-FU for submit@debbugs.gnu.org; Sun, 15 Oct 2023 13:47:49 -0400 Received: from smtpm3.myservices.hosting ([185.26.105.234]:33616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs5DJ-00070f-38 for 66566@debbugs.gnu.org; Sun, 15 Oct 2023 13:47:48 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm3.myservices.hosting (Postfix) with ESMTP id 347E121084 for <66566@debbugs.gnu.org>; Sun, 15 Oct 2023 19:47:14 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 64E7B80095; Sun, 15 Oct 2023 19:47:11 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 2dc0_7h7oJFT; Sun, 15 Oct 2023 19:47:11 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id C449B8005B; Sun, 15 Oct 2023 19:47:10 +0200 (CEST) From: Bruno Victal Date: Sun, 15 Oct 2023 18:47:06 +0100 Message-ID: <7e36201bf26dc13369aeac84d533ebfa15726040.1697391346.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 Rewrite package using G-Expressions. Remove obsolete comments, options and unused dependencies [1]. [1]: GNU poke commit: c17b0fb7d9d0b97398c664c882d6ef1e732bc66a * gnu/packages/engineering.scm (poke)[inputs]: Remove json-c. [arguments]: Use G-Expression. Remove obsolete comments and configure-flags. --- gnu/packages/engineering.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index c9aec482da..46937384e4 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3248,18 +3248,15 @@ (define-public poke (delete-file "libpoke/pvm-vm1.c") (delete-file "libpoke/pvm-vm2.c"))))) (build-system gnu-build-system) - ;; The GUI, which we elide, requires tcl and tk. (native-inputs (list bison dejagnu flex libtool pkg-config)) ;; FIXME: Enable NBD support by adding `libnbd' (currently unpackaged). - (inputs (list json-c libgc readline libtextstyle)) + (inputs (list libgc readline libtextstyle)) (arguments - ;; To build the GUI, add the `--enable-gui' configure flag. - ;; To enable the "hyperlink server", add the `--enable-hserver' flag. - `(#:configure-flags - '("--enable-mi" - "--disable-static" - ;; The emacs files are provided in emacs-poke. - "--with-lispdir=/tmp/share/emacs"))) + (list + #:configure-flags + #~(list "--disable-static" + ;; The emacs files are provided in emacs-poke. + "--with-lispdir=/tmp/share/emacs"))) (home-page "https://www.gnu.org/software/poke/#documentation") (synopsis "Editing of arbitrary binary data") (description "GNU poke is an interactive, extensible editor for binary data. From patchwork Sun Oct 15 17:47:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54841 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 3330D27BBEC; Sun, 15 Oct 2023 18:47:58 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 60DF027BBE2 for ; Sun, 15 Oct 2023 18:47:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qs5DH-0005qd-UN; Sun, 15 Oct 2023 13:47:39 -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 1qs5DG-0005qA-7E for guix-patches@gnu.org; Sun, 15 Oct 2023 13:47:38 -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 1qs5DF-0001Sx-V0 for guix-patches@gnu.org; Sun, 15 Oct 2023 13:47:37 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qs5Dd-00072U-Ri for guix-patches@gnu.org; Sun, 15 Oct 2023 13:48:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66566] [PATCH 2/3] gnu: poke: Install emacs modes. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Oct 2023 17:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66566 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66566@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 66566-submit@debbugs.gnu.org id=B66566.169739206426970 (code B ref 66566); Sun, 15 Oct 2023 17:48:01 +0000 Received: (at 66566) by debbugs.gnu.org; 15 Oct 2023 17:47:44 +0000 Received: from localhost ([127.0.0.1]:54072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs5DL-00070q-DH for submit@debbugs.gnu.org; Sun, 15 Oct 2023 13:47:44 -0400 Received: from smtpm4.myservices.hosting ([185.26.105.235]:42386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs5DI-00070e-JW for 66566@debbugs.gnu.org; Sun, 15 Oct 2023 13:47:41 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm4.myservices.hosting (Postfix) with ESMTP id 77EDE20D69 for <66566@debbugs.gnu.org>; Sun, 15 Oct 2023 19:47:15 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id D79F380098; Sun, 15 Oct 2023 19:47:14 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id B4a05T8uH-RE; Sun, 15 Oct 2023 19:47:14 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 502A18005B; Sun, 15 Oct 2023 19:47:14 +0200 (CEST) From: Bruno Victal Date: Sun, 15 Oct 2023 18:47:07 +0100 Message-ID: <4d53f537e30cc18a084e24b3fabec4e15bbb4288.1697391346.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/engineering.scm (poke)[arguments]<#:configure-flags>: Correctly set lispdir for emacs. --- gnu/packages/engineering.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 46937384e4..112417b30e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3253,10 +3253,16 @@ (define-public poke (inputs (list libgc readline libtextstyle)) (arguments (list + #:imported-modules `((guix build emacs-build-system) + (guix build emacs-utils) + ,@%gnu-build-system-modules) + #:modules '((guix build gnu-build-system) + ((guix build emacs-build-system) #:prefix emacs:) + (guix build utils)) #:configure-flags #~(list "--disable-static" - ;; The emacs files are provided in emacs-poke. - "--with-lispdir=/tmp/share/emacs"))) + (string-append "--with-lispdir=" + (emacs:elpa-directory #$output))))) (home-page "https://www.gnu.org/software/poke/#documentation") (synopsis "Editing of arbitrary binary data") (description "GNU poke is an interactive, extensible editor for binary data. From patchwork Sun Oct 15 17:47:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54842 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 1EB9427BBEA; Sun, 15 Oct 2023 18:48:00 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 4B3A527BBEB for ; Sun, 15 Oct 2023 18:47:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qs5DI-0005qv-6f; Sun, 15 Oct 2023 13:47: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 1qs5DG-0005qB-9D for guix-patches@gnu.org; Sun, 15 Oct 2023 13:47:38 -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 1qs5DG-0001Sz-0v for guix-patches@gnu.org; Sun, 15 Oct 2023 13:47:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qs5De-00072f-AJ for guix-patches@gnu.org; Sun, 15 Oct 2023 13:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66566] [PATCH 3/3] gnu: Remove emacs-poke. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Oct 2023 17:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66566 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66566@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 66566-submit@debbugs.gnu.org id=B66566.169739206626980 (code B ref 66566); Sun, 15 Oct 2023 17:48:02 +0000 Received: (at 66566) by debbugs.gnu.org; 15 Oct 2023 17:47:46 +0000 Received: from localhost ([127.0.0.1]:54074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs5DO-000716-5w for submit@debbugs.gnu.org; Sun, 15 Oct 2023 13:47:46 -0400 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:52054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qs5DK-00070n-Rf for 66566@debbugs.gnu.org; Sun, 15 Oct 2023 13:47:43 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id CB03320BCC for <66566@debbugs.gnu.org>; Sun, 15 Oct 2023 19:47:17 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 42E9780060; Sun, 15 Oct 2023 19:47:17 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id W2vQL6Fsuv7z; Sun, 15 Oct 2023 19:47:17 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id CF14E8005B; Sun, 15 Oct 2023 19:47:16 +0200 (CEST) From: Bruno Victal Date: Sun, 15 Oct 2023 18:47:08 +0100 Message-ID: <8f333d4832350044e64b9107af6fa28c4468ec69.1697391346.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 This naming conflicts with the ELPA 'poke' package, a emacs interface to GNU poke. * gnu/packages/engineering.scm (emacs-poke): Remove variable. --- gnu/packages/engineering.scm | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 112417b30e..a00c098f90 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3271,24 +3271,6 @@ (define-public poke data structures and to operate on them.") (license license:gpl3+))) -(define-public emacs-poke - (package - (inherit poke) - (name "emacs-poke") - (build-system emacs-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-before 'expand-load-path 'change-working-directory - (lambda _ (chdir "etc")))))) - (inputs '()) - (native-inputs '()) - (synopsis "GNU Poke major modes for Emacs") - (description - "This package provides two Emacs major modes for working with GNU Poke: -@code{Poke Ras mode} and @code{Poke Map mode}."))) - (define-public pcb2gcode (package (name "pcb2gcode")