bug#48154: closed ([PATCH] gnu: sequoia: Update to 1.1.0.)

[GNU bug Tracking System]

Your message dated Tue, 4 May 2021 10:13:50 +0200
with message-id <b3a832c8-14d2-f76d-f2dc-5a4315eb67a7@crazy-compilers.com>
and subject line Re: [bug#48154] [PATCH] gnu: sequoia: Update to 1.1.0.
has caused the debbugs.gnu.org bug report #48154,
regarding [PATCH] gnu: sequoia: Update to 1.1.0.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
48154: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=48154
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: sequoia: Update to 1.1.0.
>
>
>
>
> Date: 
>
> Sun,  2 May 2021 09:41:27 +0200
>
>
>
>
> * gnu/packages/sequoia.scm (sequoia): Update to 1.1.0. [arguments]: Remove
>   phase "package", add phases "fix-rand-dependency" and "fix-permissions".
> ---
>  gnu/packages/sequoia.scm | 19 ++++++++++++++++---
>  1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm
> index b75a622c64..b1d78dad0a 100644
> --- a/gnu/packages/sequoia.scm
> +++ b/gnu/packages/sequoia.scm
> @@ -42,15 +42,15 @@
>  (define-public sequoia
>    (package
>      (name "sequoia")
> -    (version "1.0.0")
> +    (version "1.1.0")
>      (source
>       (origin
>         (method git-fetch)
>         (uri (git-reference
>               (url "https://gitlab.com/sequoia-pgp/sequoia.git";)
> -             (commit (string-append "v" version))))
> +             (commit (string-append "openpgp/v" version))))
>         (sha256
> -        (base32 "0y80bl786m29ww3272qsl1ql0xc3pwd6iiqlkv3nmhnjsmygbn0d"))
> +        (base32 "0knkm0nw1h4ww51vks4jnnp1yc45llfi7j0i70f6vf2bcknnbmci"))
>         (file-name (git-file-name name version))))
>      (build-system cargo-build-system)
>      (outputs '("out" "python"))
> @@ -140,12 +140,25 @@
>           ;; Run make instead of using the rust build system, as
>           ;; suggested by the installation instructions
>           (replace 'build (lambda _ (invoke "make" "build-release") #t))
> +         (delete 'package)  ;; cargo can't package a multi-crate workspace
>           (replace 'check
>             (lambda* (#:key tests?  #:allow-other-keys)
>               (if tests?
>                   (invoke "make" "check")
>                   #t)))
>           (replace 'install (lambda _ (invoke "make" "install") #t))
> +         (add-after 'unpack 'fix-rand-dependency
> +           (lambda _
> +             (substitute* "ipc/Cargo.toml"
> +               ;; required: enable rand::rngs::OsRng in rand >= 0.8
> +               (("(^rand =.*,) default-features = false(.*)" _ a b)
> +                (string-append a " features = [\"getrandom\"]" b)))
> +             #t))
> +         (add-after 'unpack 'fix-permissions
> +           (lambda _
> +             (chmod "sq/src/sq-usage.rs" #o644)
> +             (chmod "sqv/src/sqv-usage.rs" #o644)
> +             #t))
>           (add-after 'unpack 'fix-environment
>             (lambda* (#:key outputs #:allow-other-keys)
>               ;; adjust prefix
> -- 
> 2.21.4
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#48154] [PATCH] gnu: sequoia: Update to 1.1.0.
>
>
>
>
> Date: 
>
> Tue, 4 May 2021 10:13:50 +0200
>
>
>
>
> User-agent: 
>
> Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0
>
>
>
>
> Pushed as ec4012c5820fb139d07dee492f8b0d492ec1c042
>
> Thanks for reviewing.
>
> --
> Regards
> Hartmut Goebel
>
> | Hartmut Goebel          | h.goebel@crazy-compilers.com               |
> | www.crazy-compilers.com | compilers which you thought are impossible |
>
>
>
> --- End Message ---