From 4d0fe40f65e096a4d07f4cc8c95139a4dda96c53 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Mar 2021 09:54:02 +0200 Subject: [PATCH] gnu: sequoia4pEp: Move to sequoia.scm. Don't have cross module package inheritance. * gnu/packages/pep.scm (sequoia4pEp): Move to ... * gnu/packages/sequoia.scm (sequoia4pEp): ... here. Hide package. --- gnu/packages/pep.scm | 15 --------------- gnu/packages/sequoia.scm | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index 2bcedf9979..289796a377 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -81,21 +81,6 @@ (define fdik-libetpan (file-name (string-append name "-" version)) (sha256 (base32 checksum))))))) -(define sequoia4pEp - ;; Currently pEp Engine requires sequoia in not-so-current version - (package/inherit sequoia - (name "sequoia") - (version "0.15.0-pEp") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/sequoia-pgp/sequoia.git") - (commit "0eb1b6cd846ea8c36b3dfdf01ec88383fc64f2fe"))) - (sha256 - (base32 "06dqs9whwp9lfibwp8dqm0aw4nm3s3v4jp2n4fz51zcvsld40nfh")) - (file-name (git-file-name name version)))))) - (define-public pep-engine (package (name "pep-engine") diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index bd8c6248d9..c8b4abf0f5 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -203,3 +203,19 @@ (define-public sequoia several crates, providing both a low-level and a high-level API for dealing with OpenPGP data.") (license license:gpl2+))) + +(define-public sequoia4pEp + ;; Currently pEp Engine requires sequoia in not-so-current version + (package/inherit sequoia + (name "sequoia") + (version "0.15.0-pEp") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/sequoia-pgp/sequoia.git") + (commit "0eb1b6cd846ea8c36b3dfdf01ec88383fc64f2fe"))) + (sha256 + (base32 "06dqs9whwp9lfibwp8dqm0aw4nm3s3v4jp2n4fz51zcvsld40nfh")) + (file-name (git-file-name name version)))) + (properties `((hidden? . #t)))))