gnu: pep-engine: Update to 2.1.24.

* gnu/packages/pep.scm(fdik-libetpan): Update to current development head.
  (sequoia4pEp): Remove.
  (pep-engine): Update to 2.1.24. [source]: Change to git repo.

pEp/nightly.scm

@@ -72,177 +72,38 @@ shell provides options to redirect the output into a pipe or a file.")
     (license license:gpl2)))
 
 (define fdik-libetpan
-  (let ((commit "0b80c39dd1504462ba3a39dc53db7c960c3a63f3") ; builds
-	(checksum "0gv3ivaziadybjlf6rfpv1j5z5418243v5cvl4swlxd2njsh7gjk")
-        (revision "5"))
+  ;; pEp Engine requires libetpan with a set of patches that have not been
+  ;; upstreamed yet.
+  (let ((commit "0b80c39dd1504462ba3a39dc53db7c960c3a63f3") ; 2020-11-27
+        (checksum "0gv3ivaziadybjlf6rfpv1j5z5418243v5cvl4swlxd2njsh7gjk")
+        (revision "6"))
    (package
     (inherit libetpan)
     (name "fdik-libetpan")
     (version (string-append "1.6-" revision "." (string-take commit 8)))
-    (source (origin
-              (inherit (package-source libetpan))
-	      (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/fdik/libetpan")
-             (commit commit)))
-       (file-name (string-append name "-" version))
-       (sha256 (base32 checksum)))))))
-
-(define  sequoia4pEp
-  (package/inherit sequoia
-    (name "sequoia")
-    (version "0.19.9-pEp")
     (source
      (origin
+       (inherit (package-source libetpan))
        (method git-fetch)
        (uri (git-reference
-             (url "https://gitlab.com/sequoia-pgp/sequoia.git")
-             (commit "365d00a08bec6a5a48d48a7c7893d78c27092b59")))
-       (sha256
-        (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)))))
-    ))
+             (url "https://gitea.pep.foundation/pEp.foundation/libetpan")
+             (commit commit)))
+       (file-name (string-append name "-" version))
+       (sha256 (base32 checksum)))))))
 
 (define-public pep-engine
   (package
     (name "pep-engine")
-    (version "2.1.10")
+    (version "2.1.24")  ;; 2.1.10 hat noch compliert
     (source
      (origin
-       (method hg-fetch)
-       (uri (hg-reference
-	     (url "https://pep.foundation/dev/repos/pEpEngine")
-	     (changeset "aaffc7213827"))) ;; changeset 5222
-       (file-name (string-append name "-" version "-checkout"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitea.pep.foundation/pEp.foundation/pEpEngine")
+             (commit (string-append "Release_" version))))
+       (file-name (git-file-name name version))
        (sha256
-	(base32 "004aq79420hicbzwmhqcsrcfjmb29z6jl8rqqk1dcwqi40zz1f9v"))))
+        (base32 "1d4gssng55mdyr8jxivibfgv80rbhhm37drfz5iijnm4z4wxkhbh"))))
     (build-system gnu-build-system)
     (arguments
      '(#:parallel-build? #f
@@ -282,7 +143,7 @@ OPENPGP=SEQUOIA
        ("libiconv" ,libiconv)
        ("nettle" ,nettle)
        ("openssl" ,openssl)
-       ("sequoia" ,sequoia4pEp)
+       ("sequoia" ,sequoia)
        ("sqlite3" ,sqlite)
        ("util-linux" ,util-linux "lib") ;; uuid.h
        ("zlib" ,zlib)))