[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
313/472: gnu: Remove libsequoia.
From: |
guix-commits |
Subject: |
313/472: gnu: Remove libsequoia. |
Date: |
Tue, 18 Jul 2023 14:09:19 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit f3a912801adcbd6b3010e2665e79730c0376658a
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon May 22 17:47:19 2023 +0300
gnu: Remove libsequoia.
* gnu/packages/sequoia.scm (libsequoia): Remove variable.
---
gnu/packages/sequoia.scm | 117 -----------------------------------------------
1 file changed, 117 deletions(-)
diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm
index ad84904758..6e09bb2e9c 100644
--- a/gnu/packages/sequoia.scm
+++ b/gnu/packages/sequoia.scm
@@ -21,23 +21,17 @@
#:use-module (guix build-system cargo)
#:use-module (guix build-system trivial)
#:use-module (guix download)
- #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages base) ; glibc
- #:use-module (gnu packages check) ;; python-pytest
#:use-module (gnu packages crates-io)
- #:use-module (gnu packages libffi) ;; python-cffi
#:use-module (gnu packages llvm)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages nettle)
#:use-module (gnu packages pkg-config)
- #:use-module (gnu packages python)
- #:use-module (gnu packages python-build) ;python-setuptools
- #:use-module (gnu packages rust)
#:use-module (gnu packages tls))
(define-public rust-sequoia-autocrypt-0.25
@@ -541,117 +535,6 @@ constraints on the signature into account.
This Guix package is built to use the nettle cryptographic library.")
(license license:lgpl2.0+)))
-(define (sequoia-package-origin version)
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/sequoia-pgp/sequoia.git")
- (commit (string-append "openpgp/v" version))))
- (sha256
- (base32 "1cq1xgvllbpii5hfl3wlia2ayznpvhv8lq8g8ygwxga86ijg98lq"))
- (file-name (git-file-name "sequoia" version))
- (patches (search-patches "libsequoia-remove-store.patch"
- "libsequoia-fix-ffi-Makefile.patch"))))
-
-(define-public libsequoia
- (package
- (name "libsequoia")
- (version "0.22.0")
- (source (sequoia-package-origin "1.6.0"))
- (build-system cargo-build-system)
- (outputs '("out" "python"))
- (native-inputs
- (list clang pkg-config python-pytest python-pytest-runner
- python-wrapper))
- (inputs
- (list gmp nettle openssl python python-cffi))
- (arguments
- (list
- #:tests? #f ;; TODO make python tests find the shared object file
- #:cargo-inputs
- `(("rust-anyhow" ,rust-anyhow-1)
- ("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-proc-macro2" ,rust-proc-macro2-1) ;; for ffi-macros
- ("rust-quote" ,rust-quote-1) ;; for ffi-macros
- ("rust-sequoia-ipc" ,rust-sequoia-ipc-0.26)
- ("rust-sequoia-net" ,rust-sequoia-net-0.23)
- ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)
- ("rust-sha2" ,rust-sha2-0.8) ;; for ffi-macros
- ("rust-tokio" ,rust-tokio-1))
- #:cargo-development-inputs
- `(("rust-filetime" ,rust-filetime-0.2))
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'configure 'set-PREFIX
- (lambda _
- (setenv "PREFIX" #$output)))
- (replace 'build
- (lambda _
- (invoke "make" "-C" "openpgp-ffi" "build-release")
- (invoke "make" "-C" "ffi" "build-release")))
- (delete 'package) ;; cargo can't package a multi-crate workspace
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (begin
- (invoke "make" "-C" "openpgp-ffi" "check")
- (invoke "make" "-C" "ffi" "check")))))
- (replace 'install
- (lambda _
- (invoke "make" "-C" "openpgp-ffi" "install")
- (invoke "make" "-C" "ffi" "install")))
- (add-after 'configure 'fix-build-environment
- (lambda _
- (delete-file "Cargo.toml")
- (symlink "../.cargo" "openpgp-ffi/.cargo")
- (symlink "../.cargo" "ffi/.cargo")
- (for-each delete-file-recursively
- (find-files "guix-vendor" "^sequoia-[0-9]+\\.*"
- #:directories? #t))))
- (add-after 'unpack 'fix-for-python-output
- (lambda _
- (substitute* "ffi/lang/python/Makefile"
- ;; adjust prefix for python package
- (("PREFIX\\s*\\??=.*")
- (string-append "PREFIX = " (pk #$output:python) "\n"))
- ;; fix rpath to include the main package
- (("\\WLDFLAGS=" text)
- (string-append text "'-Wl,-rpath=" #$output "/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 "))))
- (add-after 'unpack 'fix-Makefiles
- (lambda _
- (substitute* '("openpgp-ffi/Makefile")
- (("^check-headers: force-build") "check-headers:"))))
- (add-after 'unpack 'remove-other-crypto-features
- (lambda _
- (substitute* '("openpgp-ffi/Cargo.toml" "ffi/Cargo.toml")
- (("^crypto-cng =" line) (string-append "# " line))
- (("^crypto-rust =" line) (string-append "# " line)))))
- (add-after 'unpack 'fix-missing-feature
- (lambda _
- (substitute* '("ffi/Cargo.toml")
- (("^(tokio = .* features = \\[)" line)
- (string-append line "\"net\", ")))))
- (add-after 'unpack 'unbundle-crates
- (lambda _
- (substitute* '("openpgp-ffi/Cargo.toml" "ffi/Cargo.toml")
- (("path = \"\\.\\./(openpgp|store|net|ipc)\",") "")))))))
- (home-page "https://sequoia-pgp.org")
- (synopsis "C/FFI interfaces for Sequoia-PGP")
- (description "This package provides a C and FFI interface to both the
-low-level and a high-level API of Sequoia-PGP.
-
-Use with caution: This is an \"unofficial\" package, which are not officially
-released, but part of the Sequoia-PGP v1.6.0 archive. So this package might
-even go away.")
- (license license:lgpl2.0+)))
-
(define-public sequoia
(package
(name "sequoia")
- 277/472: gnu: Add rust-object-0.30., (continued)
- 277/472: gnu: Add rust-object-0.30., guix-commits, 2023/07/18
- 279/472: gnu: rust-pest-2: Update to 2.6.0., guix-commits, 2023/07/18
- 280/472: gnu: rust-pest-derive-2: Update to 2.6.0., guix-commits, 2023/07/18
- 282/472: gnu: rust-pest-meta-2: Update to 2.6.0., guix-commits, 2023/07/18
- 283/472: gnu: Add rust-pkcs1-0.7., guix-commits, 2023/07/18
- 287/472: gnu: Add rust-rsa-0.9., guix-commits, 2023/07/18
- 288/472: gnu: Add rust-rpassword-6., guix-commits, 2023/07/18
- 292/472: gnu: rust-sha-1-0.10: Update to 0.10.5., guix-commits, 2023/07/18
- 291/472: gnu: Add rust-serde-yaml-0.9., guix-commits, 2023/07/18
- 312/472: gnu: rust-sequoia-openpgp-1: Update to 1.16.0., guix-commits, 2023/07/18
- 313/472: gnu: Remove libsequoia.,
guix-commits <=
- 310/472: gnu: Add rust-sequoia-net-0.27., guix-commits, 2023/07/18
- 319/472: gnu: Add rust-wycheproof-0.5., guix-commits, 2023/07/18
- 324/472: gnu: Add rust-trust-dns-client-0.22., guix-commits, 2023/07/18
- 337/472: gnu: Add rust-option-ext-0.2., guix-commits, 2023/07/18
- 325/472: gnu: Add rust-test-log-0.2., guix-commits, 2023/07/18
- 339/472: gnu: Add rust-no-std-compat-0.4., guix-commits, 2023/07/18
- 352/472: gnu: Add rust-curve25519-dalek-ng-4., guix-commits, 2023/07/18
- 346/472: gnu: Add rust-file-diff-1., guix-commits, 2023/07/18
- 353/472: gnu: Add rust-colorchoice-1., guix-commits, 2023/07/18
- 351/472: gnu: Add rust-cvt-0.1., guix-commits, 2023/07/18