diff mbox

[4/6] gnu: Add gpgscm.

Message ID 20160718221630.GA28641@jasmine
State New
Headers show

Commit Message

Leo Famulari July 18, 2016, 10:16 p.m. UTC
On Mon, Jul 18, 2016 at 01:44:07PM -0400, Leo Famulari wrote:
> On Sun, Jul 17, 2016 at 11:19:41PM +0000, ng0 wrote:
> > Whoever wants to fix how this looks in code can change it before
> > commit, like it is now it works and serves its purpose (run the
> > gnupg tests).
> > Commented parts included for people who want to make it smaller,
> > if you make it smaller in size the code size on our side will
> > grow.
> 
> Thank you for beginning this!
> 
> It looks as if the gpgscm executable is built in our build phase, and
> then used in our check phase. So, I will try patching the shebangs of
> the tests in between the build and check phases.

The attached patch series works for me, when I put it on top of your
GnuPG-related library updates.

Comments

non such July 18, 2016, 11:10 p.m. UTC | #1
Hi,

thanks for picking up the work.

Leo Famulari writes:

> On Mon, Jul 18, 2016 at 01:44:07PM -0400, Leo Famulari wrote:
>> On Sun, Jul 17, 2016 at 11:19:41PM +0000, ng0 wrote:
>> > Whoever wants to fix how this looks in code can change it before
>> > commit, like it is now it works and serves its purpose (run the
>> > gnupg tests).
>> > Commented parts included for people who want to make it smaller,
>> > if you make it smaller in size the code size on our side will
>> > grow.
>> 
>> Thank you for beginning this!
>> 
>> It looks as if the gpgscm executable is built in our build phase, and
>> then used in our check phase. So, I will try patching the shebangs of
>> the tests in between the build and check phases.
>
> The attached patch series works for me, when I put it on top of your
> GnuPG-related library updates.

On top of all 5 of the updates I did in gnupg.scm and sent in or
what are the GnuPG-related library updates you mean?

I will test this series tomorrow. If it works and I can remove
the gpgscm package, is master okay or should it go into
core-updates and if so why should it go into core-updates when it
works on master?

> From 474fd1807a0870a7156a22200b763e89997c10a6 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Mon, 18 Jul 2016 14:47:50 -0400
> Subject: [PATCH 1/4] gnu: gnupg: Use modify-phases syntax.
>
> * gnu/packages/gnupg.scm (gnupg)[arguments]: Use modify-phases syntax.
> ---
>  gnu/packages/gnupg.scm | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 444c60a..5b61881 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -233,14 +233,13 @@ compatible to GNU Pth.")
>         ("readline" ,readline)
>         ("sqlite" ,sqlite)
>         ("zlib" ,zlib)))
> -   (arguments
> -    `(#:phases
> -       (alist-cons-before
> -        'configure 'patch-config-files
> -        (lambda _
> -          (substitute* "tests/openpgp/defs.inc"
> -            (("/bin/pwd") (which "pwd"))))
> -       %standard-phases)))
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-after 'configure 'patch-config-files
> +           (lambda _
> +             (substitute* "tests/openpgp/defs.inc"
> +               (("/bin/pwd") (which "pwd"))))))))
>      (home-page "http://gnupg.org/")
>      (synopsis "GNU Privacy Guard")
>      (description
> -- 
> 2.9.1
>
>
> From 379b84a09e22312a6d777bc2dc30b97199265229 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Mon, 18 Jul 2016 14:48:24 -0400
> Subject: [PATCH 2/4] gnu: gnupg-2.0: Use modify-phases syntax.
>
> * gnu/packages/gnupg.scm (gnupg-2.0)[arguments]: Use modify-phases syntax.
> ---
>  gnu/packages/gnupg.scm | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 5b61881..1958462 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -278,12 +278,11 @@ libskba (working with X.509 certificates and CMS data).")
>         ("readline" ,readline)))
>     (arguments
>      `(#:phases
> -       (alist-cons-before
> -        'configure 'patch-config-files
> -        (lambda _
> -          (substitute* "tests/openpgp/Makefile.in"
> -            (("/bin/sh") (which "bash"))))
> -       %standard-phases)))))
> +      (modify-phases %standard-phases
> +        (add-after 'configure 'patch-config-files
> +          (lambda _
> +            (substitute* "tests/openpgp/Makefile.in"
> +              (("/bin/sh") (which "bash"))))))))))
>  
>  (define-public gnupg-1
>    (package (inherit gnupg)
> -- 
> 2.9.1
>
>
> From 728e0bf170547b9cfa721d5770e75a7699644f05 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Mon, 18 Jul 2016 14:48:55 -0400
> Subject: [PATCH 3/4] gnu: gnupg-1: Use modify-phases syntax.
>
> * gnu/packages/gnupg.scm (gnupg-1)[arguments]: Use modify-phases syntax.
> ---
>  gnu/packages/gnupg.scm | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 1958462..8ef98a8 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -302,12 +302,12 @@ libskba (working with X.509 certificates and CMS data).")
>         ("readline" ,readline)
>         ("libgpg-error" ,libgpg-error)))
>      (arguments
> -     `(#:phases (alist-cons-after
> -                 'unpack 'patch-check-sh
> -                 (lambda _
> -                   (substitute* "checks/Makefile.in"
> -                     (("/bin/sh") (which "bash"))))
> -                 %standard-phases)))))
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'patch-check-sh
> +           (lambda _
> +             (substitute* "checks/Makefile.in"
> +               (("/bin/sh") (which "bash"))))))))))
>  
>  (define-public gpgme
>    (package
> -- 
> 2.9.1
>
>
> From 0d9b1e5d922ad9c4efb3ae751b36b764a09e1edb Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Mon, 18 Jul 2016 18:13:48 -0400
> Subject: [PATCH 4/4] gnu: gnupg: Patch test shebangs.
>
> * gnu/packages/gnupg.scm (gnupg)[arguments]: Add 'patch-scheme-tests' phase.
> ---
>  gnu/packages/gnupg.scm | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 8ef98a8..d3ad8e7 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -208,14 +208,14 @@ compatible to GNU Pth.")
>  (define-public gnupg
>    (package
>      (name "gnupg")
> -    (version "2.1.13")
> +    (version "2.1.14")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
>                                    ".tar.bz2"))
>                (sha256
>                 (base32
> -                "0xcn46vcb5x5qx0bc803vpzhzhnn6wfhp7x71w9n1ahx4ak877ag"))))
> +                "0hmsiscpdpdqd8kcjpzkz2gzcc3cnrvswk9p1jzi4sivd7lxwl4l"))))
>      (build-system gnu-build-system)
>      (native-inputs
>       `(("pkg-config" ,pkg-config)))
> @@ -239,7 +239,12 @@ compatible to GNU Pth.")
>           (add-after 'configure 'patch-config-files
>             (lambda _
>               (substitute* "tests/openpgp/defs.inc"
> -               (("/bin/pwd") (which "pwd"))))))))
> +               (("/bin/pwd") (which "pwd")))))
> +         (add-after 'build 'patch-scheme-tests
> +           (lambda _
> +             (substitute* (find-files "tests" ".\\.scm$")
> +               (("/usr/bin/env gpgscm")
> +                (string-append (getcwd) "/tests/gpgscm/gpgscm"))))))))
>      (home-page "http://gnupg.org/")
>      (synopsis "GNU Privacy Guard")
>      (description
Leo Famulari July 19, 2016, 3:58 a.m. UTC | #2
On Mon, Jul 18, 2016 at 11:10:00PM +0000, ng0 wrote:
> On top of all 5 of the updates I did in gnupg.scm and sent in or
> what are the GnuPG-related library updates you mean?

Yes, I'm referring to the updates you sent.

> I will test this series tomorrow. If it works and I can remove
> the gpgscm package, is master okay or should it go into
> core-updates and if so why should it go into core-updates when it
> works on master?

gnupg-2.1.14 requires libgcrypt >= 1.7.0 [0] and libgpg-error >= 1.24.
Those are both core packages. `guix refresh -l` reports that 2206 and
2214 packages will need to be rebuilt, respectively, if those packages
are changed.

I added a few more packages to the HTTPS home-page patch. I pushed it
along with the libassuan update.
Andreas Enge July 19, 2016, 7:14 a.m. UTC | #3
On Mon, Jul 18, 2016 at 11:58:03PM -0400, Leo Famulari wrote:
> gnupg-2.1.14 requires libgcrypt >= 1.7.0 [0] and libgpg-error >= 1.24.
> Those are both core packages. `guix refresh -l` reports that 2206 and
> 2214 packages will need to be rebuilt, respectively, if those packages
> are changed.

So maybe core-updates-next? I still have the hope that we can merge
core-updates as soon as we will have recovered from the hydra outage.

Andreas
diff mbox

Patch

From 0d9b1e5d922ad9c4efb3ae751b36b764a09e1edb Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 18 Jul 2016 18:13:48 -0400
Subject: [PATCH 4/4] gnu: gnupg: Patch test shebangs.

* gnu/packages/gnupg.scm (gnupg)[arguments]: Add 'patch-scheme-tests' phase.
---
 gnu/packages/gnupg.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 8ef98a8..d3ad8e7 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -208,14 +208,14 @@  compatible to GNU Pth.")
 (define-public gnupg
   (package
     (name "gnupg")
-    (version "2.1.13")
+    (version "2.1.14")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
                                   ".tar.bz2"))
               (sha256
                (base32
-                "0xcn46vcb5x5qx0bc803vpzhzhnn6wfhp7x71w9n1ahx4ak877ag"))))
+                "0hmsiscpdpdqd8kcjpzkz2gzcc3cnrvswk9p1jzi4sivd7lxwl4l"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
@@ -239,7 +239,12 @@  compatible to GNU Pth.")
          (add-after 'configure 'patch-config-files
            (lambda _
              (substitute* "tests/openpgp/defs.inc"
-               (("/bin/pwd") (which "pwd"))))))))
+               (("/bin/pwd") (which "pwd")))))
+         (add-after 'build 'patch-scheme-tests
+           (lambda _
+             (substitute* (find-files "tests" ".\\.scm$")
+               (("/usr/bin/env gpgscm")
+                (string-append (getcwd) "/tests/gpgscm/gpgscm"))))))))
     (home-page "http://gnupg.org/")
     (synopsis "GNU Privacy Guard")
     (description
-- 
2.9.1