[bug#60967] [PATCH 0/3] Update vnstat to 2.10 and build vnstati.

[bug#60967] [PATCH 0/3] Update vnstat to 2.10 and build vnstati.

[Bruno Victal]

Bruno Victal (3):
  gnu: vnstat: Update to 2.10.
  gnu: vnstat: Use G-Expressions.
  gnu: vnstat: Build vnstati.

 gnu/packages/networking.scm | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)


base-commit: ec3226c3985d5ec168d45499f12dfcf87f0f5c94
-- 
2.38.1

[bug#60967] [PATCH 1/3] gnu: vnstat: Update to 2.10.

[Bruno Victal]

* gnu/packages/networking.scm (vnstat): Update to 2.10.
---
 gnu/packages/networking.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index a7b51ed1ff..0bdd38f703 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4523,7 +4523,7 @@ (define-public putty
 (define-public vnstat
   (package
    (name "vnstat")
-   (version "2.9")
+   (version "2.10")
    (source
     (origin
       (method url-fetch)
@@ -4531,7 +4531,7 @@ (define-public vnstat
                           version ".tar.gz"))
       (sha256
        (base32
-        "1iwxmnpabfljvyng7c8k3z83yw1687i66z5s1980c5x9vrsi98hi"))))
+        "09bx8mz9jdq94i0mpmjbc7dis0klvjx85lml5mp3d36dwm21gim9"))))
    (build-system gnu-build-system)
    (inputs (list sqlite))
    (native-inputs (list pkg-config check))
-- 
2.38.1

[bug#60967] [PATCH 2/3] gnu: vnstat: Use G-Expressions.

[Bruno Victal]

* gnu/packages/networking.scm (vnstat): Use G-Expressions.
---
 gnu/packages/networking.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 0bdd38f703..0565d997b2 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4536,15 +4536,16 @@ (define-public vnstat
    (inputs (list sqlite))
    (native-inputs (list pkg-config check))
    (arguments
-    `(#:phases
-      (modify-phases %standard-phases
-        (add-before 'check 'disable-id-tests
-          (lambda _
-            (substitute*
-                '("Makefile" "tests/vnstat_tests.c")
-              (("tests/id_tests.c \\$") "\\")
-              (("tests/id_tests.h h") "h")
-              (("^.*id_tests.*$") "")))))))
+    (list
+     #:phases
+     #~(modify-phases %standard-phases
+         (add-before 'check 'disable-id-tests
+           (lambda _
+             (substitute*
+                 '("Makefile" "tests/vnstat_tests.c")
+               (("tests/id_tests.c \\$") "\\")
+               (("tests/id_tests.h h") "h")
+               (("^.*id_tests.*$") "")))))))
    (home-page "https://humdi.net/vnstat/")
    (synopsis "Network traffic monitoring tool")
    (description "vnStat is a console-based network traffic monitor that keeps
-- 
2.38.1

[bug#60967] [PATCH 3/3] gnu: vnstat: Build vnstati.

[Bruno Victal]

* gnu/packages/networking.scm (vnstat)[inputs]: Add gd.
---
 gnu/packages/networking.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 0565d997b2..d0d915604f 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -111,6 +111,7 @@ (define-module (gnu packages networking)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gd)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
@@ -4533,7 +4534,7 @@ (define-public vnstat
        (base32
         "09bx8mz9jdq94i0mpmjbc7dis0klvjx85lml5mp3d36dwm21gim9"))))
    (build-system gnu-build-system)
-   (inputs (list sqlite))
+   (inputs (list sqlite gd))
    (native-inputs (list pkg-config check))
    (arguments
     (list
-- 
2.38.1

bug#60967: [PATCH 0/3] Update vnstat to 2.10 and build vnstati.

[Christopher Baines]

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


Bruno Victal <mirai@makinata.eu> writes:

> Bruno Victal (3):
>   gnu: vnstat: Update to 2.10.
>   gnu: vnstat: Use G-Expressions.
>   gnu: vnstat: Build vnstati.
>
>  gnu/packages/networking.scm | 26 ++++++++++++++------------
>  1 file changed, 14 insertions(+), 12 deletions(-)

Thanks Bruno, I've gone ahead and pushed these to master as
b6b0291918ed690f82df4f412a9558fc9f3299b7.

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]