From patchwork Mon Jul 4 04:59:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 40504 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 B4D5127BBE9; Mon, 4 Jul 2022 06:00:48 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 41CB027BBEA for ; Mon, 4 Jul 2022 06:00:48 +0100 (BST) Received: from localhost ([::1]:47996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8ECV-0006Ud-BQ for patchwork@mira.cbaines.net; Mon, 04 Jul 2022 01:00:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8EBr-0006QO-SC for guix-patches@gnu.org; Mon, 04 Jul 2022 01:00:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51933) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o8EBn-0007Jq-VC for guix-patches@gnu.org; Mon, 04 Jul 2022 01:00:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o8EBn-0004NQ-Tw for guix-patches@gnu.org; Mon, 04 Jul 2022 01:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56368] [PATCH v2 1/4] gnu: Use 'license:' prefix in (gnu packages gawk). Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Jul 2022 05:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56368 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56368@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 56368-submit@debbugs.gnu.org id=B56368.165691078216723 (code B ref 56368); Mon, 04 Jul 2022 05:00:03 +0000 Received: (at 56368) by debbugs.gnu.org; 4 Jul 2022 04:59:42 +0000 Received: from localhost ([127.0.0.1]:45820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8EBS-0004La-Il for submit@debbugs.gnu.org; Mon, 04 Jul 2022 00:59:42 -0400 Received: from mail-40136.proton.ch ([185.70.40.136]:51777) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8EBO-0004Ky-9C for 56368@debbugs.gnu.org; Mon, 04 Jul 2022 00:59:39 -0400 Date: Mon, 04 Jul 2022 04:59:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1656910772; x=1657169972; bh=lrKH8SUsNNx26E3IIIH/9J/Aj0d5qMvFbLXAmMTy/XE=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=DeIvvjUDGTn55eEGp4UUtPceThTeGlNRx5F0qagu+3GA1R/4EwdMuBjbWJTNh73ew 01iJJFLuZjpLpBgkD44LN357/XhM2stum0+/J706X1Fq/k+t+hoS8cgHagD23Rq1uD OokzXfSHL4OextThaBYSixbAdvAV99h7W7BWAyPIWakvWJPqXSDBFexw7ZI2NKltwF +rafo/vlI0OlKdjKtiSkWNtWrUvyZitKvDegQlv3eWKcQYHEpqrRQIUkw3Kiv1Oa6U RiFgC5SUl3DXTysVtzlWsWb9IiOLiuPF2ZUicCsn062iIytb812A3wtf2m+XllfIi1 wz0M+MR2FNGCQ== From: "Paul A. Patience" Message-ID: <20220704045918.967590-2-paul@apatience.com> In-Reply-To: <20220704045918.967590-1-paul@apatience.com> References: <20220704045918.967590-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gawk.scm: Import (guix licenses) with 'license:' prefix. (gawk, mawk)[license]: Prefix with 'license:'. --- gnu/packages/gawk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.36.1 diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 1935e73ab7..91252094b5 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -20,7 +20,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages gawk) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages bash) #:use-module (gnu packages libsigsegv) @@ -93,7 +93,7 @@ (define-public gawk language for the easy manipulation of formatted text, such as tables of data. Gawk features many extensions beyond the traditional implementation, including network access, sorting, and large libraries.") - (license gpl3+))) + (license license:gpl3+))) (define-public mawk (package @@ -120,4 +120,4 @@ (define-public mawk "@command{mawk} is an interpreter for the Awk programming language. This version aims to be smaller and faster than GNU Awk, at the expense of fewer features and extensions.") - (license gpl2))) ;version 2 only + (license license:gpl2))) ;version 2 only From patchwork Mon Jul 4 04:59:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 40502 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 770BA27BBEA; Mon, 4 Jul 2022 06:00:46 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 2C53327BBE9 for ; Mon, 4 Jul 2022 06:00:46 +0100 (BST) Received: from localhost ([::1]:47942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8ECT-0006R6-83 for patchwork@mira.cbaines.net; Mon, 04 Jul 2022 01:00:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8EBr-0006QR-Tb for guix-patches@gnu.org; Mon, 04 Jul 2022 01:00:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51932) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o8EBn-0007JI-D4 for guix-patches@gnu.org; Mon, 04 Jul 2022 01:00:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o8EBn-0004NI-Ai for guix-patches@gnu.org; Mon, 04 Jul 2022 01:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56368] [PATCH v2 2/4] gnu: Add gawk-mpfr. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Jul 2022 05:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56368 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56368@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 56368-submit@debbugs.gnu.org id=B56368.165691078216717 (code B ref 56368); Mon, 04 Jul 2022 05:00:03 +0000 Received: (at 56368) by debbugs.gnu.org; 4 Jul 2022 04:59:42 +0000 Received: from localhost ([127.0.0.1]:45818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8EBS-0004LT-9i for submit@debbugs.gnu.org; Mon, 04 Jul 2022 00:59:42 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:36252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8EBO-0004Kx-2u for 56368@debbugs.gnu.org; Mon, 04 Jul 2022 00:59:38 -0400 Date: Mon, 04 Jul 2022 04:59:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1656910771; x=1657169971; bh=CU9Z9gH6WaFRVqJ9vzLTahYoHTZt/UIZhg0Di6uoPYA=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=emKPwmOW4Vubd0e0XyWLRf9+rmv9S9g9VrRfFkQca0WhPc2EUAHEPZIXUq8A1Qvtq /NkQmjyFJcGotdG+bcer46HtPKCMlPipzf9xwT0jU585BwaVq6UazrD4Jy8dCO6sZv aFumw/dRe0JexOdR1dJFAVr9D0O6jAfVvu+Yick/bqoEk4eWtS8ACt2E41gvrkrcAH A5GugRg8hYUVE2hv4pm6HhtMdVtATNMrpoWfX+H0i4DXvXx6K7Ygiof/eiWgWy2Bqp BtMIBMd3mVp1seAzcoW+3BXFK4N84A+Al2Q+1inQjXrETelIDy7jVRUtJsZNqTIdzP rcMO3rsDzzZEg== From: "Paul A. Patience" Message-ID: <20220704045918.967590-3-paul@apatience.com> In-Reply-To: <20220704045918.967590-1-paul@apatience.com> References: <20220704045918.967590-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gawk.scm (gawk-mpfr): New variable. --- gnu/packages/gawk.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.36.1 diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 91252094b5..52ac66f9bb 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2021 Marius Bakke +;;; Copyright © 2022 Paul A. Patience ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages gawk) #:use-module (gnu packages) #:use-module (gnu packages bash) #:use-module (gnu packages libsigsegv) + #:use-module (gnu packages multiprecision) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) @@ -95,6 +97,14 @@ (define-public gawk including network access, sorting, and large libraries.") (license license:gpl3+))) +;; Separate from gawk to facilitate bootstrapping. +(define-public gawk-mpfr + (package/inherit gawk + (name "gawk-mpfr") + (inputs + (modify-inputs (package-inputs gawk) + (prepend mpfr))))) + (define-public mawk (package (name "mawk") From patchwork Mon Jul 4 04:59:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 40503 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 9E44D27BBEB; Mon, 4 Jul 2022 06:00:48 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 1C55E27BBE9 for ; Mon, 4 Jul 2022 06:00:48 +0100 (BST) Received: from localhost ([::1]:47958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8ECV-0006TA-6g for patchwork@mira.cbaines.net; Mon, 04 Jul 2022 01:00:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52538) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8EBr-0006QS-Te for guix-patches@gnu.org; Mon, 04 Jul 2022 01:00:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51935) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o8EBo-0007Jt-Tv for guix-patches@gnu.org; Mon, 04 Jul 2022 01:00:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o8EBo-0004Ng-Sj for guix-patches@gnu.org; Mon, 04 Jul 2022 01:00:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56368] [PATCH v2 3/4] gnu: Add egawk-next. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Jul 2022 05:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56368 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56368@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 56368-submit@debbugs.gnu.org id=B56368.165691078716751 (code B ref 56368); Mon, 04 Jul 2022 05:00:04 +0000 Received: (at 56368) by debbugs.gnu.org; 4 Jul 2022 04:59:47 +0000 Received: from localhost ([127.0.0.1]:45828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8EBX-0004M2-7h for submit@debbugs.gnu.org; Mon, 04 Jul 2022 00:59:47 -0400 Received: from mail-4323.proton.ch ([185.70.43.23]:49080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8EBT-0004L4-Kg for 56368@debbugs.gnu.org; Mon, 04 Jul 2022 00:59:45 -0400 Date: Mon, 04 Jul 2022 04:59:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1656910777; x=1657169977; bh=aD9uGVkc80yrT3XTiHJmGX4qT8GjalzBYcxyNWVPfeI=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=nd7qRQaEojyoaZiQZOGk0uc0BlkLg1dibgz/z5WC7gDwWFOU1tCxUxK3vhl1EtdNJ RhUau80gqjU8cNkEbt9fCqgdu10t0lnPb22WcE+1bpIEP1TduQHgRBIoH+GSu1hh3g pkxGGaAW0H4gsZTcuXIs3Huia1w1AFzYXWCn6CMsTqibWMgs8HpXxUgdCHdA+OOdCb AJGDCgMZTEhEjIqphlPThZIkdMO+HrWpB7JINuAJmP8L7eK95+gH0YiptWizpBt6Il eNC+x7tj9V8Yajkh9qaJwSuaqnKGrX73lCLn2AxOLXo2JIxgcgJmzyXDwOFyOsLhjy eMHT3hbTltq3Q== From: "Paul A. Patience" Message-ID: <20220704045918.967590-4-paul@apatience.com> In-Reply-To: <20220704045918.967590-1-paul@apatience.com> References: <20220704045918.967590-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gawk.scm (egawk-next): New variable. --- gnu/packages/gawk.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) -- 2.36.1 diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 52ac66f9bb..6b905f6654 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -28,6 +28,7 @@ (define-module (gnu packages gawk) #:use-module (gnu packages multiprecision) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu)) (define-public gawk @@ -105,6 +106,34 @@ (define-public gawk-mpfr (modify-inputs (package-inputs gawk) (prepend mpfr))))) +;; Suffixed with -next because, similarly to Emacs, development versions are +;; numbered x.y.60+z, and also there are no tagged versions of egawk yet. +;; (However, though egawk's --version lists 5.1.60, it is actually forked from +;; a development version of gawk 5.1.1.) +(define-public egawk-next + (let ((commit "f00e74ffc73f6ba6fe74fb7a26319770b8c3792c") + (revision "0")) + (package + (inherit gawk-mpfr) + (name "egawk-next") + (version (git-version "5.1.60" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://www.kylheku.com/git/egawk") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bmfbw6k1aiyiardnk7ha5zlpkvavj013mm4n7wwj2vdcgrs6p1f")))) + (home-page "https://www.kylheku.com/cgit/egawk/") + (synopsis "Enhanced GNU Awk") + (description + "@command{egawk} is Enhanced GNU Awk. It is a fork of GNU Awk with +some enhancements designed and implemented by Kaz Kylheku. In particular, +Enhanced GNU Awk provides the @code{@@let} statement for declaring +block-scoped lexical variables.")))) + (define-public mawk (package (name "mawk") From patchwork Mon Jul 4 04:59:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 40505 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 A4BE427BBEA; Mon, 4 Jul 2022 06:01:01 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 0B91C27BBE9 for ; Mon, 4 Jul 2022 06:01:01 +0100 (BST) Received: from localhost ([::1]:48858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8ECi-000757-6N for patchwork@mira.cbaines.net; Mon, 04 Jul 2022 01:01:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8EBr-0006QQ-TN for guix-patches@gnu.org; Mon, 04 Jul 2022 01:00:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o8EBo-0007Js-Dt for guix-patches@gnu.org; Mon, 04 Jul 2022 01:00:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o8EBo-0004NX-DT for guix-patches@gnu.org; Mon, 04 Jul 2022 01:00:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56368] [PATCH v2 4/4] gnu: Add cppawk and cppawk-egawk. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Jul 2022 05:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56368 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56368@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 56368-submit@debbugs.gnu.org id=B56368.165691078716745 (code B ref 56368); Mon, 04 Jul 2022 05:00:04 +0000 Received: (at 56368) by debbugs.gnu.org; 4 Jul 2022 04:59:47 +0000 Received: from localhost ([127.0.0.1]:45826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8EBW-0004M0-Sn for submit@debbugs.gnu.org; Mon, 04 Jul 2022 00:59:47 -0400 Received: from mail-4022.proton.ch ([185.70.40.22]:32910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8EBU-0004LN-WE for 56368@debbugs.gnu.org; Mon, 04 Jul 2022 00:59:45 -0400 Date: Mon, 04 Jul 2022 04:59:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1656910778; x=1657169978; bh=oWws71zOSKDJVbekW5EB773tVLpEpO4xSnu/uxusAtY=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=LGT73n0kCkNrlToP8JZCwyke4DKg1zSL4UmxQ69/PABDoJzLObK9alrXbWiv7Cpsu OGWkoNeTSpCKA/QojVzxhzcCyGdQCsumAUBXYh8Mo994EaywRShnqQ2j2E06TaRx8r iqyHBWxkWlnUI25g2LF1FXwp0junjLEVBUOWQy3Btoy8Iz/ECVsg1mDHfeygijoDDw RLxJ5gly7fRflAEojzU3bELWFmW89xTdbZKLsaV3UnZ8KXtBH0JVooHOO+vHet4itq j9FYcTtfUKM3UJJvG3rWeLjk46yyaHiR6xtnXaQ+/pXYmfWevoiGQSWzMoObe/tZqT KS1daiEIWL9kw== From: "Paul A. Patience" Message-ID: <20220704045918.967590-5-paul@apatience.com> In-Reply-To: <20220704045918.967590-1-paul@apatience.com> References: <20220704045918.967590-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gawk.scm (cppawk, cppawk-egawk): New variables. --- gnu/packages/gawk.scm | 85 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) -- 2.36.1 diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 6b905f6654..9feaf059fb 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -23,12 +23,16 @@ (define-module (gnu packages gawk) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages gcc) #:use-module (gnu packages libsigsegv) #:use-module (gnu packages multiprecision) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix utils) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu)) (define-public gawk @@ -160,3 +164,84 @@ (define-public mawk This version aims to be smaller and faster than GNU Awk, at the expense of fewer features and extensions.") (license license:gpl2))) ;version 2 only + +(define-public cppawk + (package + (name "cppawk") + (version "20220703") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://www.kylheku.com/git/cppawk") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0b09757q81sz4gn62k3mv5bgllyb2v5m64346s8fc99mqqif70cx")))) + (build-system copy-build-system) + (arguments + `(#:install-plan '(("bin/cppawk" "bin/cppawk") + ("share/cppawk/include" "share/cppawk/include") + ("./" "share/man/man1" #:include-regexp (".*\\.1$"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda _ + (substitute* "bin/cppawk" + (("/bin/bash") (which "bash")) + (("dirname") (which "dirname")) + (("mktemp") (which "mktemp")) + ;; Extra space to prevent matching Awk's printf. + (("printf ") (string-append (which "printf") " ")) + (("rm -f") (string-append (which "rm") " -f")) + (("prepro=cpp") (string-append "prepro=" (which "cpp"))) + (("sed -e") (string-append (which "sed") " -e"))))) + (add-after 'fix-paths 'fix-awk-paths + (lambda _ + (substitute* "bin/cppawk" + (("awk=gawk") (string-append "awk=" (which "gawk"))) + (("awk '") (string-append (which "gawk") " '"))))) + (add-after 'build 'check + (lambda _ + (invoke "./runtests")))))) + (native-inputs + ;; For tests + (list mawk)) + (inputs + (list coreutils ; For dirname, mktemp, printf, rm + gawk-mpfr ; Default variant, but supports others + gcc ; For cpp + sed)) + (home-page "https://www.kylheku.com/cgit/cppawk/") + (synopsis "Wrapper script that adds C preprocessing to Awk") + (description + "@command{cppawk} is a shell script that invokes the C preprocessor +(@command{cpp}) on Awk code and calls Awk (by default GNU Awk) on the result. + +@command{cppawk} understands the basic Awk options like @option{-F} and +@option{-v}, and also understands common @command{cpp} options like +@option{-I} and @option{-Dmacro=value}. + +@command{cppawk} has no dependencies beyond Awk, @command{cpp}, @command{sed} +and some GNU core utilities (including @command{printf}). Preprocessed +programs can be captured and transferred to systems that have Awk but not +@command{cpp} or @command{cppawk}.") + (license license:bsd-2))) + +(define-public cppawk-egawk + (package/inherit cppawk + (name "cppawk-egawk") + (arguments + (substitute-keyword-arguments (package-arguments cppawk) + ((#:phases phases) + `(modify-phases ,phases + (replace 'fix-awk-paths + (lambda _ + (substitute* "bin/cppawk" + (("awk=gawk") (string-append "awk=" (which "egawk"))) + (("awk '") (string-append (which "egawk") " '"))))))))) + (inputs + (modify-inputs (package-inputs cppawk) + (delete "gawk-mpfr") + (prepend egawk-next))) + (synopsis "cppawk that calls Enhanced GNU Awk by default")))