Browse Source

Update sequoia to 0.19.9-pEp branch.

This is a few, minor commits behind sequoia 0.20.0.
main
Hartmut Goebel 2 years ago
parent
commit
1319da71a4
1 changed files with 137 additions and 8 deletions
  1. +137
    -8
      pEp/nightly.scm

+ 137
- 8
pEp/nightly.scm View File

@ -37,6 +37,8 @@
#:use-module (gnu packages libevent)
#:use-module (gnu packages linux)
#:use-module (gnu packages mail) ; for libetpan
#:use-module (gnu packages rust)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages python)
#:use-module (gnu packages nettle)
#:use-module (gnu packages pkg-config)
@ -89,31 +91,158 @@ shell provides options to redirect the output into a pipe or a file.")
(define sequoia4pEp
(package/inherit sequoia
(name "sequoia")
(version "0.17.0-pEp")
(version "0.19.9-pEp")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.com/sequoia-pgp/sequoia.git")
(commit "b5b783f58c9b6fdb26163cb7b236ee71cfef339e")))
(commit "365d00a08bec6a5a48d48a7c7893d78c27092b59")))
(sha256
(base32 "0j3l5l2spgb5pgjx4nb1pdbgdm80ahg2hy8ii3qq9h825lgf58sm"))
(file-name (git-file-name name version))))))
(base32 "032scnbqpx51wmfv4g2nzr05s08nvwzkk3mkbllls36g2yy0qffj"))
(file-name (git-file-name name version))))
(arguments
`(#:tests? #f ;; building the tests requires 9.7GB total
#:rust ,rust-1.46
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1.0)
("rust-backtrace" ,rust-backtrace-0.3)
("rust-base64" ,rust-base64-0.12)
;;("rust-buffered-reader" included
("rust-bzip2" ,rust-bzip2-0.3)
("rust-capnp" ,rust-capnp-0.10)
("rust-capnp-rpc" ,rust-capnp-rpc-0.10)
("rust-capnpc" ,rust-capnpc-0.10)
("rust-chrono" ,rust-chrono-0.4) ;; for sqv, sop
("rust-clap" ,rust-clap-2) ;; for sqv
("rust-colored" ,rust-colored-1.9.1)
("rust-crossterm" ,rust-crossterm-0.13)
("rust-ctor" ,rust-ctor-0.1)
("rust-dirs" ,rust-dirs-2.0)
("rust-dyn-clone" ,rust-dyn-clone-1)
("rust-ed25519-dalek" ,rust-ed25519-dalek-1)
;;("rust-failure" included
("rust-filetime" ,rust-filetime-0.2)
("rust-flate2" ,rust-flate2-1)
("rust-fs2" ,rust-fs2-0.4)
("rust-futures" ,rust-futures-0.1)
("rust-http" ,rust-http-0.1)
("rust-hyper" ,rust-hyper-0.12)
("rust-hyper-tls" ,rust-hyper-tls-0.3)
("rust-idna" ,rust-idna-0.2)
("rust-itertools" ,rust-itertools-0.9) ;; for sq
("rust-lalrpop" ,rust-lalrpop-0.19)
("rust-lalrpop-util" ,rust-lalrpop-util-0.19)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
("rust-memsec" ,rust-memsec-0.6)
("rust-native-tls" ,rust-native-tls-0.2)
("rust-nettle" ,rust-nettle-7)
("rust-num-bigint-dig" ,rust-num-bigint-dig-0.6)
("rust-parity-tokio-ipc" ,rust-parity-tokio-ipc-0.4)
("rust-percent-encoding" ,rust-percent-encoding-2)
("rust-prettytable-rs" ,rust-prettytable-rs-0.8) ;; for sq
("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quickcheck" ,rust-quickcheck-0.9)
("rust-rand" ,rust-rand-0.7)
("rust-regex" ,rust-regex-1)
("rust-rusqlite" ,rust-rusqlite-0.24)
("rust-structopt" ,rust-structopt-0.3) ;; for sop
("rust-tempfile" ,rust-tempfile-3) ;; for sq
("rust-thiserror" ,rust-thiserror-1)
("rust-tokio" ,rust-tokio-0.1)
("rust-tokio-core" ,rust-tokio-core-0.1)
("rust-unicode-normalization" ,rust-unicode-normalization-0.1)
("rust-url" ,rust-url-2)
("rust-win-crypto-ng" ,rust-win-crypto-ng-0.2)
("rust-winapi" ,rust-winapi-0.3)
("rust-zbase32" ,rust-zbase32-0.1))
#:cargo-development-inputs
(("rust-assert-cli" ,rust-assert-cli-0.6) ;; dev-dep for for sq, sqv
("rust-bindgen" ,rust-bindgen-0.51) ;; FIXME for nettle-sys and rusqlite
;;("rust-lalrpop" ,rust-lalrpop-0.19)
("rust-quickcheck" ,rust-quickcheck-0.9)
("rust-rand" ,rust-rand-0.7)
("rust-rpassword" ,rust-rpassword-5))
#:phases
(modify-phases %standard-phases
;; Run make instead of using the rust build system, as
;; suggested by the installation instructions
(replace 'build (lambda _ (invoke "make" "build-release") #t))
(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-environment
(lambda* (#:key outputs #:allow-other-keys)
;; adjust prefix
(setenv "PREFIX" (assoc-ref outputs "out"))
;; fix install script detection
(setenv "INSTALL" "install")
#t))
(add-after 'unpack 'fix-fo-python-output
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(pyout (assoc-ref outputs "python")))
(substitute* "ffi/lang/python/Makefile"
;; adjust prefix for python package
(("PREFIX\\s*\\??=.*")
(string-append "PREFIX = " pyout "\n"))
;; fix rpath to include the main package
(("\\WLDFLAGS=" text)
(string-append text "'-Wl,-rpath=" out "/lib '"))
;; make setuptools install into the prefix, see
;; guix/build/python-build-system.scm for explanation
(("\\ssetup.py\\s+install\\s")
" setup.py install --root=/ --single-version-externally-managed "))
#t)))
(add-after 'unpack 'fix-pkgconfig-file-substitutes
;; preempt Makefiles replacing PREFIX by pwd
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* "ffi/sequoia.pc.in"
(("PREFIX") out))
(substitute* "openpgp-ffi/sequoia-openpgp.pc.in"
(("PREFIX") out))
#t)))
(add-after 'unpack 'keep-SOURCE_DATE_EPOCH
(lambda _
;; preempt Makefiles replacing SOURCE_DATE_EPOCH
(substitute* "Makefile"
(("SOURCE_DATE_EPOCH\\s=" line)
(string-append "#" line)))
#t))
(add-after 'unpack 'set-missing-env-vars
(lambda* (#:key inputs #:allow-other-keys)
;; FIXME: why do we need to set this here?
(setenv "LIBCLANG_PATH"
(string-append (assoc-ref inputs "clang") "/lib"))
#t))
(add-after 'unpack 'unpin-deps
(lambda _
;; As the comment in that file explains, upstream encourages
;; unpinning, as the pinned version is only to make sure the crate
;; compiles on older versions of rustc
(substitute* '("openpgp/Cargo.toml" "sq/Cargo.toml")
(("= \"=") "= \""))
#t)))))
))
(define-public pep-engine
(package
(name "pep-engine")
(version "2.1.0-rc27")
(version "2.1.10")
(source
(origin
(method hg-fetch)
(uri (hg-reference
(url "https://pep.foundation/dev/repos/pEpEngine")
(changeset "c3e10511c29e"))) ;; r4980
(changeset "aaffc7213827"))) ;; changeset 5222
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32 "1z3yrxf1irdapxmikmf2rzpcn7c969060w342dk5z282gszalw4q"))))
(base32 "004aq79420hicbzwmhqcsrcfjmb29z6jl8rqqk1dcwqi40zz1f9v"))))
(build-system gnu-build-system)
(arguments
'(#:parallel-build? #f


Loading…
Cancel
Save