From patchwork Sat Dec 23 22:36:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jaeme Sifat X-Patchwork-Id: 58017 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 15C0A27BBEA; Sat, 23 Dec 2023 22:39:17 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 C8B8B27BBE2 for ; Sat, 23 Dec 2023 22:39:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rHAe4-0006ud-UF; Sat, 23 Dec 2023 17:39:00 -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 1rHAe3-0006uE-Dw for guix-patches@gnu.org; Sat, 23 Dec 2023 17:38:59 -0500 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 1rHAe3-0000Hx-6B for guix-patches@gnu.org; Sat, 23 Dec 2023 17:38:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rHAe5-0008Nc-Kk for guix-patches@gnu.org; Sat, 23 Dec 2023 17:39:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67998] [PATCH 1/2] gnu: Remove ed.scm. Resent-From: Jaeme Sifat Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Dec 2023 22:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67998 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67998@debbugs.gnu.org Cc: Jaeme Sifat Received: via spool by 67998-submit@debbugs.gnu.org id=B67998.170337109232143 (code B ref 67998); Sat, 23 Dec 2023 22:39:01 +0000 Received: (at 67998) by debbugs.gnu.org; 23 Dec 2023 22:38:12 +0000 Received: from localhost ([127.0.0.1]:51444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHAdH-0008MM-W2 for submit@debbugs.gnu.org; Sat, 23 Dec 2023 17:38:12 -0500 Received: from mailtransmit04.runbox.com ([2a0c:5a00:149::25]:36908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHAdF-0008M5-2B for 67998@debbugs.gnu.org; Sat, 23 Dec 2023 17:38:10 -0500 Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1rHAd3-007tY1-FI for 67998@debbugs.gnu.org; Sat, 23 Dec 2023 23:37:57 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=selector2; h=Content-Transfer-Encoding:Content-Type:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From; bh=6Arskzp5fyILO3ovRZWn/YBiuiwdinlydddJkPAuj1Y=; b=Czg9JrtAqOvP4uTeNM8c2ELSqN iU9h/lvpoBC+BRl3zgQP2qbfOkgt9ucsZu3Kf0GEaPFmr+vJeERwKZ+DTbs1P3JExAqeWioG8nrQN vt+o/AhHZrJoKGHpdUcijv32drob/+o1kubu8VS/ciyC560tNAd9H9ON6cMNmvMU2/onjCD/U19HY osGiNTEn43bBoO3q2u170eVzfi67rGbxXI7BsIlqF2eq/9uxyTJiAaD1yeLMmXXxHG1XK8WxTp9f7 XweNQwwdY8+wjuuTSNtv7TrhJB8TloEbxYDotxWIBHzoEfYAaTEkX7L6UBC5mZDhqZG89enQP8VMo vEHPSNUQ==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1rHAd3-00031B-3h for 67998@debbugs.gnu.org; Sat, 23 Dec 2023 23:37:57 +0100 Received: by submission02.runbox with esmtpsa [Authenticated ID (1176697)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rHAcs-001XTn-6d; Sat, 23 Dec 2023 23:37:46 +0100 Date: Sat, 23 Dec 2023 17:36:46 -0500 Message-ID: <765fcd37ebf8fe450369a6d5d96aba0d40980b39.1703370677.git.jaeme@runbox.com> 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: , Reply-to: Jaeme Sifat X-ACL-Warn: , Jaeme Sifat via Guix-patches X-Patchwork-Original-From: Jaeme Sifat via Guix-patches via From: Jaeme Sifat 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 Remove ed.scm and move the `ed' package to text-editors.scm. * gnu/local.mk (GNU_SYSTEM_MODULES): Remove ed.scm from build. * gnu/packages/ed.scm: Delete file. * gnu/packages/text-editors.scm (ed): New variable. [copyright header]: Transfer copyright notices from ed.scm to text-editors.scm. Change-Id: I827a2943f4849085186f2a25a9c8676cf4b6a7fd --- gnu/local.mk | 1 - gnu/packages/ed.scm | 58 ----------------------------------- gnu/packages/text-editors.scm | 36 ++++++++++++++++++++++ 3 files changed, 36 insertions(+), 59 deletions(-) delete mode 100644 gnu/packages/ed.scm diff --git a/gnu/local.mk b/gnu/local.mk index a472c62acb..8fe17d15ce 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -240,7 +240,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/dvtm.scm \ %D%/packages/easyrpg.scm \ %D%/packages/ebook.scm \ - %D%/packages/ed.scm \ %D%/packages/education.scm \ %D%/packages/efi.scm \ %D%/packages/electronics.scm \ diff --git a/gnu/packages/ed.scm b/gnu/packages/ed.scm deleted file mode 100644 index 31c41fa5ef..0000000000 --- a/gnu/packages/ed.scm +++ /dev/null @@ -1,58 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2013, 2014 Ludovic Courtès -;;; Copyright © 2016, 2019, 2022 Efraim Flashner -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages ed) - #:use-module (guix licenses) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix utils) - #:use-module (guix build-system gnu) - #:use-module (gnu packages compression)) - -(define-public ed - (package - (name "ed") - (version "1.18") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/ed/ed-" - version ".tar.lz")) - (sha256 - (base32 - "0krb8rsb0cd8mgz0c5pqgnjbbrj7zjl7mf9099r8gi80k2nyza5c")))) - (build-system gnu-build-system) - (native-inputs (list lzip)) - (arguments - `(#:configure-flags (list ,(string-append "CC=" (cc-for-target))) - #:phases - (modify-phases %standard-phases - (add-before 'patch-source-shebangs 'patch-test-suite - (lambda _ - (substitute* "testsuite/check.sh" - (("/bin/sh") (which "sh")))))))) - (home-page "https://www.gnu.org/software/ed/") - (synopsis "Line-oriented text editor") - (description - "Ed is a line-oriented text editor: rather than offering an overview of -a document, ed performs editing one line at a time. It can be executed both -interactively and via shell scripts. Its method of command input allows -complex tasks to be performed in an automated way. GNU ed offers several -extensions over the standard utility.") - (license gpl3+))) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index f5714e934a..3614d6c31c 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1,6 +1,9 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2012 Nikita Karetnikov +;;; Copyright © 2013, 2014 Ludovic Courtès ;;; Copyright © 2016 José Miguel Sánchez García ;;; Copyright © 2016 Carlo Zancanaro +;;; Copyright © 2016, 2019, 2022 Efraim Flashner ;;; Copyright © 2017, 2018, 2020, 2022 Eric Bavier ;;; Copyright © 2017 Feng Shu ;;; Copyright © 2017 Nikita @@ -24,6 +27,7 @@ ;;; Copyright © 2022 Andy Tai ;;; Copyright © 2023 Eidvilas Markevičius ;;; Copyright © 2023 Maxim Cournoyer +;;; Copyright © 2023 Jaeme Sifat ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,6 +66,7 @@ (define-module (gnu packages text-editors) #:use-module (gnu packages base) #:use-module (gnu packages boost) #:use-module (gnu packages code) + #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages crates-io) #:use-module (gnu packages curl) @@ -102,6 +107,37 @@ (define-module (gnu packages text-editors) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) +(define-public ed + (package + (name "ed") + (version "1.18") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/ed/ed-" + version ".tar.lz")) + (sha256 + (base32 + "0krb8rsb0cd8mgz0c5pqgnjbbrj7zjl7mf9099r8gi80k2nyza5c")))) + (build-system gnu-build-system) + (native-inputs (list lzip)) + (arguments + `(#:configure-flags (list ,(string-append "CC=" (cc-for-target))) + #:phases + (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'patch-test-suite + (lambda _ + (substitute* "testsuite/check.sh" + (("/bin/sh") (which "sh")))))))) + (home-page "https://www.gnu.org/software/ed/") + (synopsis "Line-oriented text editor") + (description + "Ed is a line-oriented text editor: rather than offering an overview of +a document, ed performs editing one line at a time. It can be executed both +interactively and via shell scripts. Its method of command input allows +complex tasks to be performed in an automated way. GNU ed offers several +extensions over the standard utility.") + (license license:gpl3+))) + (define-public vis (package (name "vis")