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

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

[Hartmut Goebel]

* 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

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

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 299 bytes --]

I'm assuming the inputs haven't changed. Does sequoia4pEp build with
these changes?

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

[Hartmut Goebel]

Am 03.05.21 um 16:03 schrieb Efraim Flashner:
> I'm assuming the inputs haven't changed. Does sequoia4pEp build with
> these changes?

sequoia4pEp is completely unchanged and still builds (more precisely: still the old version from store is used)

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

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

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 570 bytes --]

On Mon, May 03, 2021 at 09:03:57PM +0200, Hartmut Goebel wrote:
> Am 03.05.21 um 16:03 schrieb Efraim Flashner:
> > I'm assuming the inputs haven't changed. Does sequoia4pEp build with
> > these changes?
> 
> sequoia4pEp is completely unchanged and still builds (more precisely: still the old version from store is used)
> 

Looks good to me then!

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

[Hartmut Goebel]

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 |