me
/
guix
Archived
1
0
Fork 0
Code

gnu: sequoia: Update to 1.1.0. 

* gnu/packages/sequoia.scm (sequoia): Update to 1.1.0. [arguments]: Remove
  phase "package", add phases "fix-rand-dependency" and "fix-permissions".
master
Hartmut Goebel 2021-05-01 20:31:53 +02:00
parent fcd002ccfa
commit ec4012c582
No known key found for this signature in database
GPG Key ID: 634A8DFFD3F631DF
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/packages/sequoia.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2019, 2020, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -42,15 +42,15 @@
(define-public sequoia (define-public sequoia
(package (package
(name "sequoia") (name "sequoia")
(version "1.0.0") (version "1.1.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.com/sequoia-pgp/sequoia.git") (url "https://gitlab.com/sequoia-pgp/sequoia.git")
(commit (string-append "v" version)))) (commit (string-append "openpgp/v" version))))
(sha256 (sha256
(base32 "0y80bl786m29ww3272qsl1ql0xc3pwd6iiqlkv3nmhnjsmygbn0d")) (base32 "0knkm0nw1h4ww51vks4jnnp1yc45llfi7j0i70f6vf2bcknnbmci"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cargo-build-system) (build-system cargo-build-system)
(outputs '("out" "python")) (outputs '("out" "python"))
@ -140,12 +140,25 @@
;; Run make instead of using the rust build system, as ;; Run make instead of using the rust build system, as
;; suggested by the installation instructions ;; suggested by the installation instructions
(replace 'build (lambda _ (invoke "make" "build-release") #t)) (replace 'build (lambda _ (invoke "make" "build-release") #t))
(delete 'package) ;; cargo can't package a multi-crate workspace
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(if tests? (if tests?
(invoke "make" "check") (invoke "make" "check")
#t))) #t)))
(replace 'install (lambda _ (invoke "make" "install") #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 (add-after 'unpack 'fix-environment
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; adjust prefix ;; adjust prefix