GNU bug report logs - #67998
[PATCH 0/2] Remove ed.scm, update ed to 1.19.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 67998 in the body.
You can then email your comments to 67998 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: guix-patches <at> gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 0/2] Remove ed.scm, update ed to 1.19.
Date: Sat, 23 Dec 2023 17:31:31 -0500

This patch-set removes ed.scm and moves the `ed' package to text-editors.scm,
it also updates ed to 1.19. This is similar to patch #67997 which removes nano.scm and moves nano to text-editors.scm.

Jaeme Sifat (2):
  gnu: Remove ed.scm.
  gnu: ed: Update to 1.19.

 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


base-commit: a8196632647b343f8e03c8f12fbdc0cc84ff90f6
--
2.41.0

Message #8 received at 67998 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 67998 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 1/2] gnu: Remove ed.scm.
Date: Sat, 23 Dec 2023 17:36:46 -0500

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 <nikita <at> karetnikov.org>
-;;; Copyright © 2013, 2014 Ludovic Courtès <ludo <at> gnu.org>
-;;; Copyright © 2016, 2019, 2022 Efraim Flashner <efraim <at> flashner.co.il>
-;;;
-;;; 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 <http://www.gnu.org/licenses/>.
-
-(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 <nikita <at> karetnikov.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo <at> gnu.org>
 ;;; Copyright © 2016 José Miguel Sánchez García <jmi2k <at> openmailbox.org>
 ;;; Copyright © 2016 Carlo Zancanaro <carlo <at> zancanaro.id.au>
+;;; Copyright © 2016, 2019, 2022 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2017, 2018, 2020, 2022 Eric Bavier <bavier <at> posteo.net>
 ;;; Copyright © 2017 Feng Shu <tumashu <at> 163.com>
 ;;; Copyright © 2017 Nikita <nikita <at> n0.is>
@@ -24,6 +27,7 @@
 ;;; Copyright © 2022 Andy Tai <atai <at> atai.org>
 ;;; Copyright © 2023 Eidvilas Markevičius <markeviciuseidvilas <at> gmail.com>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2023 Jaeme Sifat <jaeme <at> runbox.com>
 ;;;
 ;;; 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")
-- 
2.41.0

Message #11 received at 67998 <at> debbugs.gnu.org (full text, mbox):

From: Jaeme Sifat <jaeme <at> runbox.com>
To: 67998 <at> debbugs.gnu.org
Cc: Jaeme Sifat <jaeme <at> runbox.com>
Subject: [PATCH 2/2] gnu: ed: Update to 1.19.
Date: Sat, 23 Dec 2023 17:36:47 -0500

* gnu/packages/text-editors.scm (ed): Update to 1.19.

Change-Id: I02ec92086fe122a636d24e8bc3afb3c3f118651c
---
 gnu/packages/text-editors.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 3614d6c31c..2d89fcce59 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -110,14 +110,14 @@ (define-module (gnu packages text-editors)
 (define-public ed
   (package
     (name "ed")
-    (version "1.18")
+    (version "1.19")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/ed/ed-"
                                  version ".tar.lz"))
              (sha256
               (base32
-               "0krb8rsb0cd8mgz0c5pqgnjbbrj7zjl7mf9099r8gi80k2nyza5c"))))
+               "0j6dfznfhll4afvrr714nrz0pp5zkcyvkb4xs2bam42789f2wbyf"))))
     (build-system gnu-build-system)
     (native-inputs (list lzip))
     (arguments
-- 
2.41.0

Message #16 received at 67998-done <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Jaeme Sifat <jaeme <at> runbox.com>
Cc: 67998-done <at> debbugs.gnu.org
Subject: Re: [bug#67998] [PATCH 0/2] Remove ed.scm, update ed to 1.19.
Date: Mon, 25 Dec 2023 17:23:37 +0100

> This patch-set removes ed.scm and moves the `ed' package to
> text-editors.scm, it also updates ed to 1.19. This is similar to patch
> #67997 which removes nano.scm and moves nano to text-editors.scm.

Applied, thanks,

Mathieu

Message #19 received at 67998 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: 67998 <at> debbugs.gnu.org, othacehe <at> gnu.org, jaeme <at> runbox.com
Subject: Re: bug#67998: [PATCH 0/2] Remove ed.scm, update ed to 1.19.
Date: Mon, 25 Dec 2023 20:09:38 +0200

[Message part 1 (text/plain, inline)]

On Mon, Dec 25, 2023 at 05:23:37PM +0100, Mathieu Othacehe wrote:
> 
> > This patch-set removes ed.scm and moves the `ed' package to
> > text-editors.scm, it also updates ed to 1.19. This is similar to patch
> > #67997 which removes nano.scm and moves nano to text-editors.scm.
> 
> Applied, thanks,
> 
> Mathieu

I had to revert the ed patch since it caused more than 5000 package
rebuilds per architecture.

-- 
Efraim Flashner   <efraim <at> flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[signature.asc (application/pgp-signature, inline)]

Message #22 received at 67998 <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Efraim Flashner <efraim <at> flashner.co.il>
Cc: jaeme <at> runbox.com, 67998 <at> debbugs.gnu.org
Subject: Re: [bug#67998] [PATCH 0/2] Remove ed.scm, update ed to 1.19.
Date: Mon, 25 Dec 2023 19:16:51 +0100

> I had to revert the ed patch since it caused more than 5000 package
> rebuilds per architecture.

Thanks for taking care of that, `guix refresh` states that it has no
depends other than itself. I wonder what causes this massive rebuild.

Mathieu

Message #25 received at 67998 <at> debbugs.gnu.org (full text, mbox):

From: Giovanni Biscuolo <g <at> xelera.eu>
To: Mathieu Othacehe <othacehe <at> gnu.org>,
 Efraim Flashner <efraim <at> flashner.co.il>
Cc: jaeme <at> runbox.com, 67998 <at> debbugs.gnu.org
Subject: Re: [bug#67998] [PATCH 0/2] Remove ed.scm, update ed to 1.19.
Date: Thu, 11 Jan 2024 13:04:10 +0100

[Message part 1 (text/plain, inline)]

Hi,

Mathieu Othacehe <othacehe <at> gnu.org> writes:

>> I had to revert the ed patch since it caused more than 5000 package
>> rebuilds per architecture.
>
> Thanks for taking care of that, `guix refresh` states that it has no
> depends other than itself. I wonder what causes this massive rebuild.

Actually I get:

--8<---------------cut here---------------start------------->8---

$ guix refresh --list-dependent ed
Building the following 2057 packages would ensure 5320 dependent packages are rebuilt:
[...]

--8<---------------cut here---------------end--------------->8---

and should be treated according to (info "(guix) Managing Patches and
Branches") that is "pushed to a topic branch other than master", right?

I don't know if this means that it should be pushed to a topic branch
named like ed-update or to the core-updates one :-)

Happy hacking! Gio'

-- 
Giovanni Biscuolo

Xelera IT Infrastructures

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.