[PATCH 0/3]: Update iproute and add it to %base-packages.

[PATCH 0/3]: Update iproute and add it to %base-packages.

[Alex Kost]

I think iproute2 should be included in %base-packages as it is a standard
toolset for various networking things.

[PATCH 1/3] gnu: iproute: Use 'modify-phases'.
[PATCH 2/3] gnu: iproute: Update to 4.4.0.
[PATCH 3/3] system: Add iproute to '%base-packages'.

[PATCH 1/3] gnu: iproute: Use 'modify-phases'.

[Alex Kost]

* gnu/packages/linux.scm (iproute)[arguments]: Use 'modify-phases'.
---
 gnu/packages/linux.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e7f7bcd..a6e3ec9 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -887,13 +888,12 @@ packet filter.")
                             (string-append "DOCDIR=" out "/share/doc/"
                                            ,name "-" ,version)
                             (string-append "MANDIR=" out "/share/man")))
-       #:phases (alist-cons-before
-                 'install 'pre-install
-                 (lambda _
-                   ;; Don't attempt to create /var/lib/arpd.
-                   (substitute* "Makefile"
-                     (("^.*ARPDDIR.*$") "")))
-                 %standard-phases)))
+       #:phases (modify-phases %standard-phases
+                  (add-before 'install 'pre-install
+                    (lambda _
+                      ;; Don't attempt to create /var/lib/arpd.
+                      (substitute* "Makefile"
+                        (("^.*ARPDDIR.*$") "")))))))
     (inputs
      `(("iptables" ,iptables)
        ("db4" ,bdb)))
-- 
2.6.3

Re: [PATCH 1/3] gnu: iproute: Use 'modify-phases'.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1971 bytes --]

On Thu, 11 Feb 2016 14:03:17 +0300
Alex Kost <alezost@gmail.com> wrote:

> * gnu/packages/linux.scm (iproute)[arguments]: Use 'modify-phases'.
> ---
>  gnu/packages/linux.scm | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index e7f7bcd..a6e3ec9 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -7,6 +7,7 @@
>  ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
>  ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
>  ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
> +;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -887,13 +888,12 @@ packet filter.")
>                              (string-append "DOCDIR=" out "/share/doc/"
>                                             ,name "-" ,version)
>                              (string-append "MANDIR=" out "/share/man")))
> -       #:phases (alist-cons-before
> -                 'install 'pre-install
> -                 (lambda _
> -                   ;; Don't attempt to create /var/lib/arpd.
> -                   (substitute* "Makefile"
> -                     (("^.*ARPDDIR.*$") "")))
> -                 %standard-phases)))
> +       #:phases (modify-phases %standard-phases
> +                  (add-before 'install 'pre-install
> +                    (lambda _
> +                      ;; Don't attempt to create /var/lib/arpd.
> +                      (substitute* "Makefile"
> +                        (("^.*ARPDDIR.*$") "")))))))
>      (inputs
>       `(("iptables" ,iptables)
>         ("db4" ,bdb)))

LGTM!

-- 
Efraim Flashner   <efraim@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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH 2/3] gnu: iproute: Update to 4.4.0.

[Alex Kost]

* gnu/packages/linux.scm (iproute): Update to 4.4.0.
---
 gnu/packages/linux.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a6e3ec9..16aaed8 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -868,15 +868,15 @@ packet filter.")
 (define-public iproute
   (package
     (name "iproute2")
-    (version "3.12.0")
+    (version "4.4.0")
     (source (origin
-             (method url-fetch)
-             (uri (string-append
-                   "mirror://kernel.org/linux/utils/net/iproute2/iproute2-"
-                   version ".tar.xz"))
-             (sha256
-              (base32
-               "04gi11gh087bg2nlxhj0lxrk8l9qxkpr88nsiil23917bm3h1xj4"))))
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kernel.org/linux/utils/net/iproute2/iproute2-"
+                    version ".tar.xz"))
+              (sha256
+               (base32
+                "05351m4m0whsivlblvs3m0nz5q9v6r06ik80z27gf6ca51kw74dw"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                                ; no test suite
-- 
2.6.3

Re: [PATCH 2/3] gnu: iproute: Update to 4.4.0.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1600 bytes --]

On Thu, 11 Feb 2016 14:03:18 +0300
Alex Kost <alezost@gmail.com> wrote:

> * gnu/packages/linux.scm (iproute): Update to 4.4.0.
> ---
>  gnu/packages/linux.scm | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index a6e3ec9..16aaed8 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -868,15 +868,15 @@ packet filter.")
>  (define-public iproute
>    (package
>      (name "iproute2")
> -    (version "3.12.0")
> +    (version "4.4.0")
>      (source (origin
> -             (method url-fetch)
> -             (uri (string-append
> -                   "mirror://kernel.org/linux/utils/net/iproute2/iproute2-"
> -                   version ".tar.xz"))
> -             (sha256
> -              (base32
> -               "04gi11gh087bg2nlxhj0lxrk8l9qxkpr88nsiil23917bm3h1xj4"))))
> +              (method url-fetch)
> +              (uri (string-append
> +                    "mirror://kernel.org/linux/utils/net/iproute2/iproute2-"
> +                    version ".tar.xz"))
> +              (sha256
> +               (base32
> +                "05351m4m0whsivlblvs3m0nz5q9v6r06ik80z27gf6ca51kw74dw"))))
>      (build-system gnu-build-system)
>      (arguments
>       `(#:tests? #f                                ; no test suite

LGTM!

-- 
Efraim Flashner   <efraim@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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 2/3] gnu: iproute: Update to 4.4.0.

[Alex Kost]

Efraim Flashner (2016-02-11 14:12 +0300) wrote:

> On Thu, 11 Feb 2016 14:03:18 +0300
> Alex Kost <alezost@gmail.com> wrote:
>
>> * gnu/packages/linux.scm (iproute): Update to 4.4.0.
>> ---
>>  gnu/packages/linux.scm | 16 ++++++++--------
>>  1 file changed, 8 insertions(+), 8 deletions(-)
[...]
> LGTM!

Thanks, I've pushed this patch, sorry for stepping on your feet with
this update :-)

-- 
Alex

Re: [PATCH 2/3] gnu: iproute: Update to 4.4.0.

[Andreas Enge]

Hello,

the first two patches look good, assuming that Emacs did the right thing
with respect to the changed indentation. Please push!

For the last one, I am not familiar enough with GuixSD to comment.

Andreas

[PATCH 3/3] system: Add iproute to '%base-packages'.

[Alex Kost]

* gnu/system.scm (%base-packages): Add iproute.
---
 gnu/system.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 9540324..14fea93 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
+;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -362,6 +362,7 @@ explicitly appear in OS."
          ;; many people are familiar with, so keep it around.
          iw wireless-tools
 
+         iproute
          net-tools                        ; XXX: remove when Inetutils suffices
          man-db
          texinfo                               ;for the standalone Info reader
-- 
2.6.3

Re: [PATCH 3/3] system: Add iproute to '%base-packages'.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1499 bytes --]

On Thu, 11 Feb 2016 14:03:19 +0300
Alex Kost <alezost@gmail.com> wrote:

> * gnu/system.scm (%base-packages): Add iproute.
> ---
>  gnu/system.scm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/system.scm b/gnu/system.scm
> index 9540324..14fea93 100644
> --- a/gnu/system.scm
> +++ b/gnu/system.scm
> @@ -1,7 +1,7 @@
>  ;;; GNU Guix --- Functional package management for GNU
>  ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
>  ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
> -;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
> +;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -362,6 +362,7 @@ explicitly appear in OS."
>           ;; many people are familiar with, so keep it around.
>           iw wireless-tools
>  
> +         iproute
>           net-tools                        ; XXX: remove when Inetutils suffices
>           man-db
>           texinfo                               ;for the standalone Info reader

Should this be iproute2? I ran `guix size iproute` to see if it might pull in
too much other stuff and got back "guix size: error: iproute: package not
found"

Otherwise this looks good too!

-- 
Efraim Flashner   <efraim@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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 3/3] system: Add iproute to '%base-packages'.

[Alex Kost]

Efraim Flashner (2016-02-11 14:15 +0300) wrote:

> On Thu, 11 Feb 2016 14:03:19 +0300
> Alex Kost <alezost@gmail.com> wrote:
>
>> * gnu/system.scm (%base-packages): Add iproute.
>> ---
>>  gnu/system.scm | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>> 
>> diff --git a/gnu/system.scm b/gnu/system.scm
>> index 9540324..14fea93 100644
>> --- a/gnu/system.scm
>> +++ b/gnu/system.scm
>> @@ -1,7 +1,7 @@
>>  ;;; GNU Guix --- Functional package management for GNU
>>  ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
>>  ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
>> -;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
>> +;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
>>  ;;;
>>  ;;; This file is part of GNU Guix.
>>  ;;;
>> @@ -362,6 +362,7 @@ explicitly appear in OS."
>>           ;; many people are familiar with, so keep it around.
>>           iw wireless-tools
>>  
>> +         iproute
>>           net-tools                        ; XXX: remove when Inetutils suffices
>>           man-db
>>           texinfo                               ;for the standalone Info reader
>
> Should this be iproute2? I ran `guix size iproute` to see if it might pull in
> too much other stuff and got back "guix size: error: iproute: package not
> found"

No it shouldn't as it is a variable not a package name (Ludovic did
this mistake once¹; fixed by Mark²).  I'm currently using a system with
this change.

¹ http://git.savannah.gnu.org/cgit/guix.git/commit/?id=d43002f64599fb80294d4c00e3a682a2776c885c
² http://git.savannah.gnu.org/cgit/guix.git/commit/?id=f8facc18eddbcf31700214fe224cbbf3add6fede

-- 
Alex

Re: [PATCH 3/3] system: Add iproute to '%base-packages'.

[Alex Kost]

Alex Kost (2016-02-11 14:03 +0300) wrote:

> * gnu/system.scm (%base-packages): Add iproute.
> ---
>  gnu/system.scm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Since there were no objections, I've committed this.

-- 
Alex