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

  • Done
  • quality assurance status badge
Details
2 participants
  • Christopher Baines
  • Bruno Victal
Owner
unassigned
Submitted by
Bruno Victal
Severity
normal
B
B
Bruno Victal wrote on 20 Jan 2023 17:48
(address . guix-patches@gnu.org)(name . Bruno Victal)(address . mirai@makinata.eu)
cover.1674233232.git.mirai@makinata.eu
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
B
B
Bruno Victal wrote on 20 Jan 2023 17:51
[PATCH 1/3] gnu: vnstat: Update to 2.10.
(address . 60967@debbugs.gnu.org)(name . Bruno Victal)(address . mirai@makinata.eu)
9791d35bb7c06446741efcffeaeb936c4f5246d5.1674233232.git.mirai@makinata.eu
* gnu/packages/networking.scm (vnstat): Update to 2.10.
---
gnu/packages/networking.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
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
B
B
Bruno Victal wrote on 20 Jan 2023 17:51
[PATCH 3/3] gnu: vnstat: Build vnstati.
(address . 60967@debbugs.gnu.org)(name . Bruno Victal)(address . mirai@makinata.eu)
26da96d877bca48ce0fdf16fd6116ee422350f43.1674233232.git.mirai@makinata.eu
* gnu/packages/networking.scm (vnstat)[inputs]: Add gd.
---
gnu/packages/networking.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
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
B
B
Bruno Victal wrote on 20 Jan 2023 17:51
[PATCH 2/3] gnu: vnstat: Use G-Expressions.
(address . 60967@debbugs.gnu.org)(name . Bruno Victal)(address . mirai@makinata.eu)
a9f6858d74aaaf8a3f27f4f177a304cf2e6d95de.1674233232.git.mirai@makinata.eu
* gnu/packages/networking.scm (vnstat): Use G-Expressions.
---
gnu/packages/networking.scm | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)

Toggle diff (32 lines)
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
C
C
Christopher Baines wrote on 1 Feb 2023 09:48
Re: [bug#60967] [PATCH 0/3] Update vnstat to 2.10 and build vnstati.
(name . Bruno Victal)(address . mirai@makinata.eu)
87pmatpy86.fsf@cbaines.net
Bruno Victal <mirai@makinata.eu> writes:

Toggle quote (8 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmPaJ3lfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XeCbw/7BKBEIrRhLNCcnp8AtOw2sDlQrg0UwQdo
veXrPeUdUJY0jqzmsFSZmEFuSXaMLd97fA/5/N9MwloS0X2YY6NLKFuFBlKUssRZ
EdL5Qu3HHChf9s+lp2t6NxcIohGd/KK8Gws0HLzrHkfh2LnVFyBw6FqDtZ1k4JwI
bjoyOXcElzcwexF87sL3z0giVsYKSzTUJAbONcA7kzaGr3RBR60ZDG+wYCljnBhN
Wium0sbE3hMYQeC0mImJpbs1b4L0yqvbIiA7K9sVrZIy6Nywr2fFkF7kKSXOrYID
UmErwNthrAfH051/gaWlQnNGmkSZLQbqqzudikQUhFdSY+ewNB6baStUEIkc6TgX
EUwV8Qx4OSGIbVcQl7aUaNbKRUFpMhPdfLFJlvpTTMYzVRyJ+tJkyZdgeLRZ1Lll
NRRjAFtO5ynV5MIG+Gj3ElYtw4G8/kA2+VE/exasjnGlk70LRcREXijg8HRS2vfP
HUelaAKEwFb820jURFzqXYNHoqAG/SFm7sNtyeNTDS80jchR03FpBSMgJe8YMhux
Hyb7PF+rI7E5Zre+1T+vPr30tStob8wn6TK7aS6C0+ZBXRZwWcytLXIcdQxryZ2X
MR/RB5gK7RaQQyyzac1J5WyfaLVBgsZGAtPt8c2Rkj2qb9CTRXTmXjJt2fABIYL+
lD/6Jk2oCzc=
=uiCx
-----END PGP SIGNATURE-----

?