GNU bug report logs - #41056
[PATCH] gnu: nix: Update to 2.3.4.

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 41056 in the body.
You can then email your comments to 41056 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: goodoldpaul <at> autistici.org
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: nix:  Update to 2.3.4.
Date: Sun, 03 May 2020 17:45:03 +0000

Hi everybody,
I'm sending a couple of patches upgrading Nix to 2.3.4 and adding 
libeditline, a new dependency.

Thanks,

Giacomo

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

From: Giacomo Leidi <goodoldpaul <at> autistici.org>
To: 41056 <at> debbugs.gnu.org
Cc: Giacomo Leidi <goodoldpaul <at> autistici.org>
Subject: [PATCH 1/2] gnu: Add editline.
Date: Sun,  3 May 2020 19:46:19 +0200

* gnu/packages/libedit.scm (editline): New variable.
---
 gnu/packages/libedit.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/libedit.scm b/gnu/packages/libedit.scm
index 37638a2b6a..9ebe987b6c 100644
--- a/gnu/packages/libedit.scm
+++ b/gnu/packages/libedit.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2019 Gábor Boskovits <boskovits <at> gmail.com>
+;;; Copyright © 2020 Giacomo Leidi <goodoldpaul <at> autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,7 +24,9 @@
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages ncurses))
 
 (define-public libedit
@@ -48,3 +51,30 @@ library (libedit).  This Berkeley-style licensed command line editor library
 provides generic line editing, history, and tokenization functions, similar to
 those found in GNU Readline.")
     (license bsd-3)))
+
+(define-public editline
+  (package
+    (name "editline")
+    (version "1.17.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/troglobit/editline.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0y7vis52kfq2km9isrlzakpf7bn1k7v9vf3xg3q1cslla18q6myh"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("automake" ,automake)
+       ("autoconf" ,autoconf)
+       ("libtool" ,libtool)))
+    (home-page "https://troglobit.com/projects/editline/")
+    (synopsis "Small replacement for GNU readline() for UNIX")
+    (description
+     "@{editline} is a small line editing library.  It can be linked into almost
+any program to provide command line editing and history functions.  It is call
+compatible with the FSF @code{readline} library, but at a fraction of the size,
+and as a result fewer features.")
+    (license bsd-4)))
-- 
2.26.2

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

From: Giacomo Leidi <goodoldpaul <at> autistici.org>
To: 41056 <at> debbugs.gnu.org
Cc: Giacomo Leidi <goodoldpaul <at> autistici.org>
Subject: [PATCH 2/2] gnu: nix: Update to 2.3.4.
Date: Sun,  3 May 2020 19:46:20 +0200

* gnu/packages/package-management.scm (nix): Update to 2.3.4,
[native-inputs]: Add autoconf, autoconf-archive, automake, bison and flex,
[inputs]: Add boost, brotli, editline.
---
 gnu/packages/package-management.scm | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 44fcb514b7..253027bbe1 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2018, 2019 Eric Bavier <bavier <at> member.fsf.org>
 ;;; Copyright © 2019, 2020 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
+;;; Copyright © 2020 Giacomo Leidi <goodoldpaul <at> autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,6 +38,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bdw-gc)
   #:use-module (gnu packages bison)
+  #:use-module (gnu packages boost)
   #:use-module (gnu packages bootstrap)          ;for 'bootstrap-guile-origin'
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
@@ -45,6 +47,7 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages dbm)
   #:use-module (gnu packages docbook)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages file)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
@@ -54,6 +57,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages guile-xyz)
+  #:use-module (gnu packages libedit)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lisp)
   #:use-module (gnu packages man)
@@ -480,18 +484,26 @@ out) and returning a package that uses that as its 'source'."
 (define-public nix
   (package
     (name "nix")
-    (version "2.0.4")
+    (version "2.3.4")
     (source (origin
              (method url-fetch)
              (uri (string-append "http://nixos.org/releases/nix/nix-"
                                  version "/nix-" version ".tar.xz"))
              (sha256
               (base32
-               "0ss9svxlh1pvrdmnqjvjyqjmbqmrdbyfarvbb14i9d4bggzl0r8n"))))
+               "03fhbb8088sgz3709zd9n9rydavar79w87l9n4q9iimcw06nlqhw"))))
     (build-system gnu-build-system)
-    (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs `(("curl" ,curl)
+    (native-inputs `(("autoconf" ,autoconf)
+                     ("autoconf-archive" ,autoconf-archive)
+                     ("automake" ,automake)
+                     ("bison" ,bison)
+                     ("flex" ,flex)
+                     ("pkg-config" ,pkg-config)))
+    (inputs `(("boost" ,boost)
+              ("brotli" ,brotli)
               ("bzip2" ,bzip2)
+              ("curl" ,curl)
+              ("editline" ,editline)
               ("libgc" ,libgc)
               ("libseccomp" ,libseccomp)
               ("libsodium" ,libsodium)
-- 
2.26.2

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

From: Marius Bakke <mbakke <at> fastmail.com>
To: Giacomo Leidi <goodoldpaul <at> autistici.org>, 41056 <at> debbugs.gnu.org
Cc: Giacomo Leidi <goodoldpaul <at> autistici.org>
Subject: Re: [bug#41056] [PATCH 1/2] gnu: Add editline.
Date: Tue, 05 May 2020 19:44:31 +0200

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

Giacomo Leidi <goodoldpaul <at> autistici.org> writes:

> * gnu/packages/libedit.scm (editline): New variable.

[...]

> +(define-public editline
> +  (package
> +    (name "editline")
> +    (version "1.17.1")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://github.com/troglobit/editline.git")
> +                    (commit version)))
> +              (file-name (git-file-name name version))
> +              (sha256
> +               (base32
> +                "0y7vis52kfq2km9isrlzakpf7bn1k7v9vf3xg3q1cslla18q6myh"))))

Upstream appears to provide bootstrapped tarballs, can you change to use
those instead?

> +    (build-system gnu-build-system)
> +    (native-inputs
> +     `(("automake" ,automake)
> +       ("autoconf" ,autoconf)
> +       ("libtool" ,libtool)))

Then you can also remove these inputs.

> +    (home-page "https://troglobit.com/projects/editline/")
> +    (synopsis "Small replacement for GNU readline() for UNIX")

Just "Line editing library".  The description has the juicy details.

> +    (description
> +     "@{editline} is a small line editing library.  It can be linked into almost
        ^^^
This should be @code{editline}.

> +any program to provide command line editing and history functions.  It is call
> +compatible with the FSF @code{readline} library, but at a fraction of the size,

s/FSF @code{readline}/GNU Readline/

> +and as a result fewer features.")
> +    (license bsd-4)))

Otherwise LGTM, thanks!

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

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

From: Marius Bakke <mbakke <at> fastmail.com>
To: Giacomo Leidi <goodoldpaul <at> autistici.org>, 41056 <at> debbugs.gnu.org
Cc: Giacomo Leidi <goodoldpaul <at> autistici.org>
Subject: Re: [bug#41056] [PATCH 2/2] gnu: nix: Update to 2.3.4.
Date: Tue, 05 May 2020 19:48:45 +0200

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

Giacomo Leidi <goodoldpaul <at> autistici.org> writes:

> * gnu/packages/package-management.scm (nix): Update to 2.3.4,
> [native-inputs]: Add autoconf, autoconf-archive, automake, bison and flex,
> [inputs]: Add boost, brotli, editline.

The new native-inputs are weird.  Do you know why they are needed?
Typically those are only necessary when building from a git checkout,
not for release tarballs.

LGTM in any case, just curious!  :-)

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

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

From: goodoldpaul <at> autistici.org
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 41056 <at> debbugs.gnu.org
Subject: Re: [bug#41056] [PATCH 2/2] gnu: nix: Update to 2.3.4.
Date: Tue, 05 May 2020 20:53:10 +0000

Hi Marius,

On 2020-05-05 17:48, Marius Bakke wrote:
> Giacomo Leidi <goodoldpaul <at> autistici.org> writes:
> 
>> * gnu/packages/package-management.scm (nix): Update to 2.3.4,
>> [native-inputs]: Add autoconf, autoconf-archive, automake, bison and 
>> flex,
>> [inputs]: Add boost, brotli, editline.
> 
> The new native-inputs are weird.  Do you know why they are needed?
> Typically those are only necessary when building from a git checkout,
> not for release tarballs.

Of course they are strange, I was trying to use the Git checkout 
initially because of the wonderful support offered by SWH in storing Git 
repositories but eventually I changed my mind and forgot to remove them 
:(.

I fixed this and the problems in the other patch and I'm going to send 
an updated version.

Thanks for your review,

Giacomo

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

From: Giacomo Leidi <goodoldpaul <at> autistici.org>
To: 41056 <at> debbugs.gnu.org
Cc: Giacomo Leidi <goodoldpaul <at> autistici.org>
Subject: [PATCH 2/2] gnu: nix: Update to 2.3.4.
Date: Tue,  5 May 2020 22:53:18 +0200

* gnu/packages/package-management.scm (nix): Update to 2.3.4,
[inputs]: Add boost, brotli, editline.
---
 gnu/packages/package-management.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 44fcb514b7..1fbc2baf33 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2018, 2019 Eric Bavier <bavier <at> member.fsf.org>
 ;;; Copyright © 2019, 2020 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
+;;; Copyright © 2020 Giacomo Leidi <goodoldpaul <at> autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,6 +38,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bdw-gc)
   #:use-module (gnu packages bison)
+  #:use-module (gnu packages boost)
   #:use-module (gnu packages bootstrap)          ;for 'bootstrap-guile-origin'
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
@@ -54,6 +56,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages guile-xyz)
+  #:use-module (gnu packages libedit)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lisp)
   #:use-module (gnu packages man)
@@ -480,18 +483,21 @@ out) and returning a package that uses that as its 'source'."
 (define-public nix
   (package
     (name "nix")
-    (version "2.0.4")
+    (version "2.3.4")
     (source (origin
              (method url-fetch)
              (uri (string-append "http://nixos.org/releases/nix/nix-"
                                  version "/nix-" version ".tar.xz"))
              (sha256
               (base32
-               "0ss9svxlh1pvrdmnqjvjyqjmbqmrdbyfarvbb14i9d4bggzl0r8n"))))
+               "03fhbb8088sgz3709zd9n9rydavar79w87l9n4q9iimcw06nlqhw"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs `(("curl" ,curl)
+    (inputs `(("boost" ,boost)
+              ("brotli" ,brotli)
               ("bzip2" ,bzip2)
+              ("curl" ,curl)
+              ("editline" ,editline)
               ("libgc" ,libgc)
               ("libseccomp" ,libseccomp)
               ("libsodium" ,libsodium)
-- 
2.26.2

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

From: Giacomo Leidi <goodoldpaul <at> autistici.org>
To: 41056 <at> debbugs.gnu.org
Cc: Giacomo Leidi <goodoldpaul <at> autistici.org>
Subject: [PATCH 1/2] gnu: Add editline.
Date: Tue,  5 May 2020 22:53:17 +0200

* gnu/packages/libedit.scm (editline): New variable.
---
 gnu/packages/libedit.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/libedit.scm b/gnu/packages/libedit.scm
index 37638a2b6a..38da02572a 100644
--- a/gnu/packages/libedit.scm
+++ b/gnu/packages/libedit.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2019 Gábor Boskovits <boskovits <at> gmail.com>
+;;; Copyright © 2020 Giacomo Leidi <goodoldpaul <at> autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -48,3 +49,24 @@ library (libedit).  This Berkeley-style licensed command line editor library
 provides generic line editing, history, and tokenization functions, similar to
 those found in GNU Readline.")
     (license bsd-3)))
+
+(define-public editline
+  (package
+    (name "editline")
+    (version "1.17.1")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append
+            "https://ftp.troglobit.com/editline/editline-" version ".tar.xz"))
+      (sha256
+       (base32 "03pw3z6pz590v8xfnjx0yynnzij2sb9xwjbvqvdzsid56crkn8nz"))))
+    (build-system gnu-build-system)
+    (home-page "https://troglobit.com/projects/editline/")
+    (synopsis "Line editing library")
+    (description
+     "@code{editline} is a small line editing library.  It can be linked into almost
+any program to provide command line editing and history functions.  It is call
+compatible with the GNU Readline library, but at a fraction of the size,
+and as a result fewer features.")
+    (license bsd-4)))
-- 
2.26.2

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

From: Marius Bakke <mbakke <at> fastmail.com>
To: goodoldpaul <at> autistici.org
Cc: 41056-done <at> debbugs.gnu.org
Subject: Re: [bug#41056] [PATCH 2/2] gnu: nix: Update to 2.3.4.
Date: Wed, 06 May 2020 22:46:49 +0200

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

goodoldpaul <at> autistici.org writes:

> Hi Marius,
>
> On 2020-05-05 17:48, Marius Bakke wrote:
>> Giacomo Leidi <goodoldpaul <at> autistici.org> writes:
>> 
>>> * gnu/packages/package-management.scm (nix): Update to 2.3.4,
>>> [native-inputs]: Add autoconf, autoconf-archive, automake, bison and 
>>> flex,
>>> [inputs]: Add boost, brotli, editline.
>> 
>> The new native-inputs are weird.  Do you know why they are needed?
>> Typically those are only necessary when building from a git checkout,
>> not for release tarballs.
>
> Of course they are strange, I was trying to use the Git checkout 
> initially because of the wonderful support offered by SWH in storing Git 
> repositories but eventually I changed my mind and forgot to remove them 
> :(.

Easy mistake to make :-) good thing we have patch review processes to
catch such issues!

> I fixed this and the problems in the other patch and I'm going to send 
> an updated version.

Applied both patches, thank you!

[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.