From patchwork Sat Dec 23 22:11:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jaeme Sifat X-Patchwork-Id: 58015 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 D1BC627BBE2; Sat, 23 Dec 2023 22:14:23 +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=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 E574A27BBE9 for ; Sat, 23 Dec 2023 22:14:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rHAFq-0004GB-FM; Sat, 23 Dec 2023 17:13:58 -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 1rHAFo-0004Fr-Iv for guix-patches@gnu.org; Sat, 23 Dec 2023 17:13:56 -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 1rHAFo-0008Vc-AE for guix-patches@gnu.org; Sat, 23 Dec 2023 17:13:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rHAFt-0002YQ-Nb for guix-patches@gnu.org; Sat, 23 Dec 2023 17:14:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67997] [PATCH] gnu: Remove nano.scm. Resent-From: Jaeme Sifat Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Dec 2023 22:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67997@debbugs.gnu.org Cc: Jaeme Sifat X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17033696119773 (code B ref -1); Sat, 23 Dec 2023 22:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Dec 2023 22:13:31 +0000 Received: from localhost ([127.0.0.1]:51426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHAFO-0002XY-Ky for submit@debbugs.gnu.org; Sat, 23 Dec 2023 17:13:31 -0500 Received: from lists.gnu.org ([2001:470:142::17]:50240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHAFM-0002XK-6F for submit@debbugs.gnu.org; Sat, 23 Dec 2023 17:13:29 -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 1rHAFA-0004CI-BX for guix-patches@gnu.org; Sat, 23 Dec 2023 17:13:16 -0500 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rHAF8-0008LD-0E for guix-patches@gnu.org; Sat, 23 Dec 2023 17:13:16 -0500 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1rHAF1-007kPV-94 for guix-patches@gnu.org; Sat, 23 Dec 2023 23:13:07 +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: Message-ID:Date:Subject:Cc:To:From; bh=iesXbYq60lXsP9lOEtmzf79vNwmlU9xrNIjVtjfW8YA=; b=gogWrB3xyLZxg2bTCScjSXs4zD vDZaN8nyNi8DQOSIYugX/MpnAO5EfPuv4DtDbGGnrDCc5YhQ+kfSKChBSRebEdRbiC4N6L9+unHeT VHf3IYglrrkdy6uMHMRbbGgNfUbj+HUspIJfhfm7DQQhmJmxFPkTZYAdTD9vEAbVdXPh9/ATpx8KL YAzUmSbVClohpnpZJ44g13JWswyxbkPD/fNPCul38t9CRedXdMvvAIkRSp4yTtJNm8cmUSGQLli9q cN6ePZfgL/seRNM0QVIErdpWDQRw39OlbYcCVplKAlvCHT0sD34WYneMZIP75FQWIpJ/UYZqldFsM gaGwp6ug==; Received: from [10.9.9.72] (helo=submission01.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1rHAF0-0003H8-Re for guix-patches@gnu.org; Sat, 23 Dec 2023 23:13:07 +0100 Received: by submission01.runbox with esmtpsa [Authenticated ID (1176697)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1rHAEm-000Znj-8w; Sat, 23 Dec 2023 23:12:52 +0100 Date: Sat, 23 Dec 2023 17:11:53 -0500 Message-ID: <02c7ee476240d1e960fcff9b9e30cffdf35a15d9.1703369513.git.jaeme@runbox.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a0c:5a00:149::26; envelope-from=jaeme@runbox.com; helo=mailtransmit05.runbox.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , 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 Removes nano.scm and places the `nano' package within text-editors.scm. * gnu/local.mk (GNU_SYSTEM_MODULES): Remove nano.scm from build. * gnu/packages/nano.scm: Delete file. * gnu/packages/text-editors.scm (nano): New variable. [copyright header]: Transfer copyright notices from nano.scm to text-editors.scm. Change-Id: I257f68a3072481f556db208bd1bd34e6eec79b47 --- gnu/local.mk | 1 - gnu/packages/nano.scm | 51 ----------------------------------- gnu/packages/text-editors.scm | 27 +++++++++++++++++++ 3 files changed, 27 insertions(+), 52 deletions(-) delete mode 100644 gnu/packages/nano.scm base-commit: a8196632647b343f8e03c8f12fbdc0cc84ff90f6 diff --git a/gnu/local.mk b/gnu/local.mk index a472c62acb..672aa2fa19 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -456,7 +456,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/musl.scm \ %D%/packages/mtools.scm \ %D%/packages/myrddin.scm \ - %D%/packages/nano.scm \ %D%/packages/ncdu.scm \ %D%/packages/ncurses.scm \ %D%/packages/netpbm.scm \ diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm deleted file mode 100644 index 0fd08f8031..0000000000 --- a/gnu/packages/nano.scm +++ /dev/null @@ -1,51 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2015-2022 Efraim Flashner -;;; Copyright © 2016 Rene Saavedra -;;; Copyright © 2018–2021 Tobias Geerinckx-Rice -;;; Copyright © 2022 Jai Vetrivelan -;;; -;;; 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 nano) - #:use-module (guix licenses) - #:use-module (gnu packages gettext) - #:use-module (gnu packages ncurses) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu)) - -(define-public nano - (package - (name "nano") - (version "7.2") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) - (sha256 - (base32 "09j5gb44yiv18fvn0iy17jnl9d5lh3gkry4kqv776a5xd0kl9ww6")))) - (build-system gnu-build-system) - (inputs - (list gettext-minimal ncurses)) - (home-page "https://www.nano-editor.org/") - (synopsis "Small, user-friendly console text editor") - (description - "GNU nano is a small and simple text editor for use in a terminal. Besides -basic editing, it supports: undo/redo, syntax highlighting, spell checking, -justifying, auto-indentation, bracket matching, interactive search-and-replace -(with regular expressions), and the editing of multiple files.") - (license gpl3+))) ; some files are under GPLv2+ diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index f5714e934a..370a078668 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 © 2015-2022 Efraim Flashner ;;; Copyright © 2016 José Miguel Sánchez García ;;; Copyright © 2016 Carlo Zancanaro +;;; Copyright © 2016 Rene Saavedra ;;; Copyright © 2017, 2018, 2020, 2022 Eric Bavier ;;; Copyright © 2017 Feng Shu ;;; Copyright © 2017 Nikita @@ -20,10 +23,12 @@ ;;; Copyright © 2022 Luis Henrique Gomes Higino ;;; Copyright © 2022 Foo Chuan Wei ;;; Copyright © 2022 zamfofex +;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022 jgart ;;; Copyright © 2022 Andy Tai ;;; Copyright © 2023 Eidvilas Markevičius ;;; Copyright © 2023 Maxim Cournoyer +;;; Copyright © 2023 Jaeme Sifat ;;; ;;; This file is part of GNU Guix. ;;; @@ -562,6 +567,28 @@ (define-public mg OpenBSD team.") (license license:public-domain))) +(define-public nano + (package + (name "nano") + (version "7.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) + (sha256 + (base32 "09j5gb44yiv18fvn0iy17jnl9d5lh3gkry4kqv776a5xd0kl9ww6")))) + (build-system gnu-build-system) + (inputs + (list gettext-minimal ncurses)) + (home-page "https://www.nano-editor.org/") + (synopsis "Small, user-friendly console text editor") + (description + "GNU nano is a small and simple text editor for use in a terminal. Besides +basic editing, it supports: undo/redo, syntax highlighting, spell checking, +justifying, auto-indentation, bracket matching, interactive search-and-replace +(with regular expressions), and the editing of multiple files.") + (license license:gpl3+))) ; some files are under GPLv2+ + (define-public qemacs (package (name "qemacs")