Subject: Re: [PATCH 04/11] gnu: Add tinydir.

From: Liliana Marie Prikler <[email-masked]>
Date: Fri, 07 Oct 2022 17:13:56 +0200

Am Freitag, dem 07.10.2022 um 15:11 +0000 schrieb David Elsing:
> Liliana Marie Prikler <[email-masked]> writes:
> 
> > Am Montag, dem 03.10.2022 um 00:19 +0000 schrieb David Elsing:
> > > * gnu/packages/cpp.scm (tinydir): New variable.
> > > ---
> > >  gnu/packages/cpp.scm | 38 ++++++++++++++++++++++++++++++++++++++
> > >  1 file changed, 38 insertions(+)
> > > 
> > > diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
> > > index 7bfa3d6cdf..4819f36052 100644
> > > --- a/gnu/packages/cpp.scm
> > > +++ b/gnu/packages/cpp.scm
> > > @@ -2020,3 +2020,41 @@ (define-public sajson
> > >        (description "sajson is a high-performance, in-place JSON
> > > parser
> > >  header-only library.")
> > >        (license license:expat))))
> > > +
> > > +(define-public tinydir
> > > +  (package
> > > +    (name "tinydir")
> > > +    (version "1.2.5")
> > > +    (source (origin
> > > +              (method git-fetch)
> > > +              (uri (git-reference
> > > +                    (url "https://github.com/cxong/tinydir")
> > > +                    (commit version)))
> > > +              (file-name (git-file-name name version))
> > > +              (sha256
> > > +               (base32
> > > +               
> > > "1nprgdfx4i8wzc1idw6chan4fjfa75b5ll8kghdc0q2278pny259"))
> > > +              (modules '((guix build utils)))
> > > +              (snippet '(delete-file-recursively
> > > "tests/cbehave"))))
> > > +    (build-system cmake-build-system)
> > > +    (arguments
> > > +     (list
> > > +      ;; Tests require cbehave and rlutil
> > > +      #:tests? #f
> > Then those should be packaged.
> The problem is that the tests include a non-trivially modified
> fork of cbehave, which uses an older (bundled) copy of rlutil for
> color output. How should I deal with that?
> > 
You could try to make the tests run with the upstream version and
disable those that don't.  Alternatively, you could package "for-
tinydir" variants of those packages, which inherit as much from
upstream as possible.

Cheers