[PATCH 0/5] Update skarnet packages

[PATCH 0/5] Update skarnet packages

[Eric Le Bihan]

Hi!

This small patch series updates the skalibs and execline packages and adds new
ones: s6, s6-dns and s6-networking.

Eric Le Bihan (5):
  gnu: skalibs: Update to 2.3.10.0.
  gnu: execline: Update to 2.1.5.0.
  gnu: Add s6.
  gnu: Add s6-dns.
  gnu: Add s6-networking.

 gnu/packages/skarnet.scm | 121 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 117 insertions(+), 4 deletions(-)

--
2.4.11

[PATCH 1/5] gnu: skalibs: Update to 2.3.10.0.

[Eric Le Bihan]

* gnu/packages/skarnet.scm (skalibs): Update to 2.3.10.0.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
 gnu/packages/skarnet.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm
index e1518fe..a5e9913 100644
--- a/gnu/packages/skarnet.scm
+++ b/gnu/packages/skarnet.scm
@@ -26,7 +26,7 @@
 (define-public skalibs
   (package
     (name "skalibs")
-    (version "2.3.5.1")
+    (version "2.3.10.0")
     (source
      (origin
       (method url-fetch)
@@ -34,7 +34,7 @@
                           version ".tar.gz"))
       (sha256
        (base32
-        "1m31wph4qr4mqgv51nzwd9nw0x5vmpkcxr48i216wn3dpy3mvxwy"))))
+        "0i7af224kl1crxgml09wx0x6q8ab79vnyrllfwv2lnq585wi9mg4"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--enable-force-devr") ; do not analyze /dev/random
-- 
2.4.11

[PATCH 2/5] gnu: execline: Update to 2.1.5.0.

[Eric Le Bihan]

* gnu/packages/skarnet.scm (execline): Update to 2.1.5.0.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
 gnu/packages/skarnet.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm
index a5e9913..6d6239d 100644
--- a/gnu/packages/skarnet.scm
+++ b/gnu/packages/skarnet.scm
@@ -51,7 +51,7 @@ and file system operations.  It is used by all skarnet.org software.")
 (define-public execline
   (package
     (name "execline")
-    (version "2.1.2.2")
+    (version "2.1.5.0")
     (source
      (origin
       (method url-fetch)
@@ -59,7 +59,7 @@ and file system operations.  It is used by all skarnet.org software.")
                           version ".tar.gz"))
       (sha256
        (base32
-        "01pckac5zijf6icrhwicbmq92yq68gfkf1yl03rr2v4q3cn8r85f"))))
+        "0hhirdmyh3sj9qagkis7addmmdvyic717wkb6ym3n63kvfk0adla"))))
     (build-system gnu-build-system)
     (inputs `(("skalibs" ,skalibs)))
     (arguments
-- 
2.4.11

[PATCH 3/5] gnu: Add s6.

[Eric Le Bihan]

* gnu/packages/skarnet.scm (s6): New variable.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
 gnu/packages/skarnet.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm
index 6d6239d..3678cc8 100644
--- a/gnu/packages/skarnet.scm
+++ b/gnu/packages/skarnet.scm
@@ -90,3 +90,43 @@ It features conditional loops, getopt-style option handling, file name
 globbing, redirection and other shell concepts, expressed as discrete commands
 rather than in special syntax, minimizing runtime footprint and
 complexity.")))
+
+(define-public s6
+  (package
+   (name "s6")
+   (version "2.3.0.0")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append "http://skarnet.org/software/s6/s6-"
+                         version ".tar.gz"))
+     (sha256
+      (base32
+       "1rp8i228zxzbia1799pdav1kkzdk96fax9bcfyf2gilkdm3s1ja9"))))
+   (build-system gnu-build-system)
+   (inputs `(("skalibs" ,skalibs)
+             ("execline" ,execline)))
+   (arguments
+    '(#:configure-flags (list
+                        (string-append "--with-lib="
+                                       (assoc-ref %build-inputs "skalibs")
+                                       "/lib/skalibs")
+                        (string-append "--with-lib="
+                                       (assoc-ref %build-inputs "execline")
+                                       "/lib/execline")
+                        (string-append "--with-sysdeps="
+                                       (assoc-ref %build-inputs "skalibs")
+                                       "/lib/skalibs/sysdeps"))
+      #:tests? #f))
+   (home-page "http://skarnet.org/software/s6")
+   (license isc)
+   (synopsis "Small suite of programs for process supervision")
+   (description
+    "s6 is a small suite of programs for UNIX, designed to allow process
+supervision (a.k.a service supervision), in the line of daemontools and runit,
+as well as various operations on processes and daemons. It is meant to be a
+toolbox for low-level process and service administration, providing different
+sets of independent tools that can be used within or without the framework, and
+that can be assembled together to achieve powerful functionality with a very
+small amount of code.")))
+
-- 
2.4.11

[PATCH 4/5] gnu: Add s6-dns.

[Eric Le Bihan]

* gnu/packages/skarnet.scm (s6-dns): New variable.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
 gnu/packages/skarnet.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm
index 3678cc8..9df367a 100644
--- a/gnu/packages/skarnet.scm
+++ b/gnu/packages/skarnet.scm
@@ -130,3 +130,33 @@ sets of independent tools that can be used within or without the framework, and
 that can be assembled together to achieve powerful functionality with a very
 small amount of code.")))
 
+(define-public s6-dns
+  (package
+   (name "s6-dns")
+   (version "2.0.1.0")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append "http://skarnet.org/software/s6-dns/s6-dns-"
+                         version ".tar.gz"))
+     (sha256
+      (base32
+       "1ji47iy8czx4jmi763dxd6lgjbnp4vqqgcijh46ym65l0a97z04w"))))
+    (build-system gnu-build-system)
+    (inputs `(("skalibs" ,skalibs)))
+    (arguments
+     '(#:configure-flags (list
+                          (string-append "--with-lib="
+                                         (assoc-ref %build-inputs "skalibs")
+                                         "/lib/skalibs")
+                          (string-append "--with-sysdeps="
+                                         (assoc-ref %build-inputs "skalibs")
+                                         "/lib/skalibs/sysdeps"))
+       #:tests? #f))
+    (home-page "http://skarnet.org/software/s6-dns")
+    (license isc)
+    (synopsis "Suite of DNS client programs")
+    (description
+     "s6-dns is a suite of DNS client programs and libraries for Unix systems,
+as an alternative to the BIND, djbdns or other DNS clients.")))
+
-- 
2.4.11

[PATCH 5/5] gnu: Add s6-networking.

[Eric Le Bihan]

* gnu/packages/skarnet.scm (s6-networking): New variable.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
 gnu/packages/skarnet.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm
index 9df367a..6723862 100644
--- a/gnu/packages/skarnet.scm
+++ b/gnu/packages/skarnet.scm
@@ -160,3 +160,46 @@ small amount of code.")))
      "s6-dns is a suite of DNS client programs and libraries for Unix systems,
 as an alternative to the BIND, djbdns or other DNS clients.")))
 
+(define-public s6-networking
+  (package
+   (name "s6-networking")
+   (version "2.1.1.0")
+   (source
+    (origin
+     (method url-fetch)
+     (uri (string-append "http://skarnet.org/software/s6-networking/s6-networking-"
+                         version ".tar.gz"))
+     (sha256
+      (base32
+       "0r8gfv0l2k449nacjy919gqlgn25q7fjxaqra5r37k7kiikkgqfw"))))
+    (build-system gnu-build-system)
+    (inputs `(("skalibs" ,skalibs)
+              ("execline" ,execline)
+              ("s6" ,s6)
+              ("s6-dns" ,s6-dns)))
+    (arguments
+     '(#:configure-flags (list
+                          (string-append "--with-lib="
+                                         (assoc-ref %build-inputs "skalibs")
+                                         "/lib/skalibs")
+                          (string-append "--with-lib="
+                                         (assoc-ref %build-inputs "execline")
+                                         "/lib/execline")
+                          (string-append "--with-lib="
+                                         (assoc-ref %build-inputs "s6")
+                                         "/lib/s6")
+                          (string-append "--with-lib="
+                                         (assoc-ref %build-inputs "s6-dns")
+                                         "/lib/s6-dns")
+                          (string-append "--with-sysdeps="
+                                         (assoc-ref %build-inputs "skalibs")
+                                         "/lib/skalibs/sysdeps"))
+       #:tests? #f))
+    (home-page "http://skarnet.org/software/s6-networking")
+    (license isc)
+    (synopsis "Suite of network utilities for Unix systems")
+    (description
+     "s6-networking is a suite of small networking utilities for Unix systems.
+It includes command-line client and server management, TCP access control,
+privilege escalation across UNIX domain sockets, IDENT protocol management and
+clock synchronization.")))
-- 
2.4.11

Re: [PATCH 0/5] Update skarnet packages

[Vincent Legoll]

> This small patch series updates the skalibs and execline packages and adds new
> ones: s6, s6-dns and s6-networking.
>
> Eric Le Bihan (5):
>   gnu: skalibs: Update to 2.3.10.0.
>   gnu: execline: Update to 2.1.5.0.
>   gnu: Add s6.
>   gnu: Add s6-dns.
>   gnu: Add s6-networking.

Hello,

Looks like we are in similarly-shaped boats, I'm doing musl+sinit...
:-)

Would you tell us a bit more on your usage of s6, how do you configure
guixsd to use it, for example...

-- 
Vincent Legoll

Re: [PATCH 1/5] gnu: skalibs: Update to 2.3.10.0.

[Ludovic Courtès]

Eric Le Bihan <eric.le.bihan.dev@free.fr> skribis:

> * gnu/packages/skarnet.scm (skalibs): Update to 2.3.10.0.

Applied, thanks.

Re: [PATCH 2/5] gnu: execline: Update to 2.1.5.0.

[Ludovic Courtès]

Eric Le Bihan <eric.le.bihan.dev@free.fr> skribis:

> * gnu/packages/skarnet.scm (execline): Update to 2.1.5.0.
>
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>

Applied.

Re: [PATCH 3/5] gnu: Add s6.

[Ludovic Courtès]

Eric Le Bihan <eric.le.bihan.dev@free.fr> skribis:

> * gnu/packages/skarnet.scm (s6): New variable.
>
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>

Fixed the two-space-after-period issue reported by ‘guix lint’ and
applied.

Re: [PATCH 4/5] gnu: Add s6-dns.

[Ludovic Courtès]

Eric Le Bihan <eric.le.bihan.dev@free.fr> skribis:

> * gnu/packages/skarnet.scm (s6-dns): New variable.

Applied, and added a copyright line for you.

Re: [PATCH 5/5] gnu: Add s6-networking.

[Ludovic Courtès]

Eric Le Bihan <eric.le.bihan.dev@free.fr> skribis:

> * gnu/packages/skarnet.scm (s6-networking): New variable.
>
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>

Applied.  Thank you for this patch series!

Ludo’.

Re: [PATCH 0/5] Update skarnet packages

[Eric Le Bihan]

Le Fri, 29 Jul 2016 13:33:01 +0200,
Vincent Legoll <vincent.legoll@gmail.com> a écrit :

> > This small patch series updates the skalibs and execline packages
> > and adds new ones: s6, s6-dns and s6-networking.
> >
> > Eric Le Bihan (5):
> >   gnu: skalibs: Update to 2.3.10.0.
> >   gnu: execline: Update to 2.1.5.0.
> >   gnu: Add s6.
> >   gnu: Add s6-dns.
> >   gnu: Add s6-networking.  
> 
> Hello,
> 
> Looks like we are in similarly-shaped boats, I'm doing musl+sinit...
> :-)
> 
> Would you tell us a bit more on your usage of s6, how do you configure
> guixsd to use it, for example...
> 

I bumped/added these packages because I needed them to prototype
stuff. I've discovered Guix a few weeks ago and it is becoming the
easiest way for me to deploy the latest versions of some programs at
home and $DAY_JOB, where machines with various flavors of GNU/Linux are
used.

I haven't looked at GuixSD too deeply. Are you trying to use s6 as init
system for a Guix-based set-up? If so, I'll post a patch to add s6-rc
[1], the service manager for s6-based systems, to complete the skarnet
stack.

Note that the author of s6 only provides mechanisms for managing
services, not policies. So, you'll still need to write the later. You
may find more information and examples in my attempt to use s6 as init
for embedded systems [2].

[1] http://skarnet.org/software/s6-rc/
[2] https://github.com/elebihan/buildroot-s6

Best regards,
-- 
ELB

Re: [PATCH 0/5] Update skarnet packages

[Vincent Legoll]

Hello,

> I haven't looked at GuixSD too deeply. Are you trying to use s6 as init
> system for a Guix-based set-up? If so, I'll post a patch to add s6-rc
> [1], the service manager for s6-based systems, to complete the skarnet
> stack.

I've read about s6 in the past, but still never tried it, so when I saw your
posts, I thought maybe now is the time...

But my digging in guix/guixsd is, as yours, only started a few weeks ago,
and the learning curve is kind of steep as I also am starting with scheme
at the same time.

> Note that the author of s6 only provides mechanisms for managing
> services, not policies. So, you'll still need to write the later. You
> may find more information and examples in my attempt to use s6 as init
> for embedded systems [2].

Thanks, I'll have a look...

-- 
Vincent Legoll