From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id MAcpGFOjWmA6FwAA0tVLHw (envelope-from ) for ; Wed, 24 Mar 2021 02:26:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 6LLTE1OjWmAAVwAAbx9fmQ (envelope-from ) for ; Wed, 24 Mar 2021 02:26:27 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C881612573 for ; Wed, 24 Mar 2021 03:26:26 +0100 (CET) Received: from localhost ([::1]:39316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOtE1-0000fi-Mi for larch@yhetil.org; Tue, 23 Mar 2021 22:26:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOtDe-0000ad-CX for guix-patches@gnu.org; Tue, 23 Mar 2021 22:26:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50220) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOtDe-0008E8-4P for guix-patches@gnu.org; Tue, 23 Mar 2021 22:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lOtDd-0007UM-VM for guix-patches@gnu.org; Tue, 23 Mar 2021 22:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47274] Linphone Packages Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Mar 2021 02:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47274 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Raghav Gururajan Cc: 47274@debbugs.gnu.org, Danny Milosavljevic Received: via spool by 47274-submit@debbugs.gnu.org id=B47274.161655274428758 (code B ref 47274); Wed, 24 Mar 2021 02:26:01 +0000 Received: (at 47274) by debbugs.gnu.org; 24 Mar 2021 02:25:44 +0000 Received: from localhost ([127.0.0.1]:33533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOtDM-0007Tm-2w for submit@debbugs.gnu.org; Tue, 23 Mar 2021 22:25:44 -0400 Received: from mail-qt1-f180.google.com ([209.85.160.180]:38640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lOtDK-0007TU-Bt for 47274@debbugs.gnu.org; Tue, 23 Mar 2021 22:25:42 -0400 Received: by mail-qt1-f180.google.com with SMTP id j7so16553442qtx.5 for <47274@debbugs.gnu.org>; Tue, 23 Mar 2021 19:25:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=7UOneg1NK673RkmakvQ6bCzAR/JEOhzuDGHa4sBOb9A=; b=B1vG0Zpv21A9gxx+pw4qnQWn2enwi+5me7OvDoGW7G8wRlpDWaPi4IL7jC3bDe3WfL UN+SVonn8zk+pc9Mt4laqunRk4tvTGk4p4R4v3N4GisVYtkBf97jI8OafTuAOugSELp8 tAFY97l7tPxrN2257IBTTzawqQHWs1ik4LNLj0ZOzTRVL2j8Ik/8NnCBUqX9Gd7CKzkM zsi4DPIkPiEQE/2lKBhPC02BF5ZWA/GZuA9noap7npFCuWnv7KWOBgWRVJYyolvYTVO2 r6yr7wcmqkBHXvX43mkH0QyAaR2hd7/L9FDSVzuwcNUXofPDpZ+vpSEI3OhjcHC9q/X7 w5Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=7UOneg1NK673RkmakvQ6bCzAR/JEOhzuDGHa4sBOb9A=; b=EkMe4Jv65nuqejSE0PNSh+Pg8hE0SB+IMxXE3/VN/MuO5DZmCO4DDkp4L7ANh3Rwhk ILK6Cbmfa+GjqVzuD2KVkVURrW/p88xjFW7qSOT7E97ZVz8ufNkG4eXR8MfqGowd+jIy XeZcwYxnW6n7LXwmNb1UbKZfyAzKTx5Cmen5J4nQ7w1TpxswBuM+lyZgYCLhLIxXaK3Q KatAt4uEuKVy93qAs6UxWwt9C1xKUHakPnmy3dX9gP97L7Tq2fE+PsSOhhHmPxAVdpsQ EcHqHjv/bsyYNjUZZwJCg9HWqH78VyMvZZ3SRAI16RFqPNNXNmr/cRTp70/wa0N38SqU tV4g== X-Gm-Message-State: AOAM531vTbSA8zLLXcTkS0K10T8LrNzcr2JkmyMue0Skz1f8sR8+PBDs jJyTjknK7+rBcxKB+nvpseQ= X-Google-Smtp-Source: ABdhPJxTF0d4NprU4xzACRyodvxYuYqcvlaNhYeAofMfkclgS55+58E/cx3Y9mqEuii2E3bhtFuTzg== X-Received: by 2002:ac8:4e10:: with SMTP id c16mr1183476qtw.268.1616552736764; Tue, 23 Mar 2021 19:25:36 -0700 (PDT) Received: from hurd (mtl.savoirfairelinux.net. [208.88.110.46]) by smtp.gmail.com with ESMTPSA id d84sm704612qke.53.2021.03.23.19.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 19:25:36 -0700 (PDT) From: Maxim Cournoyer References: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> Date: Tue, 23 Mar 2021 22:25:35 -0400 In-Reply-To: <2f3561d8-dfbd-992a-53c0-0856680a8552@raghavgururajan.name> (Raghav Gururajan's message of "Sat, 20 Mar 2021 00:26:42 -0400") Message-ID: <871rc5uw2o.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1616552787; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=7UOneg1NK673RkmakvQ6bCzAR/JEOhzuDGHa4sBOb9A=; b=Vv97jOHq/aIygA5oPaYd9mR9MA9jr22/uKCjul6pWZh6INggqKVgXF5HIjApTFiNEONPwx OAPzQXjFuMEMupa4LkBA1v6Cfs3H3ppaVP+UQ/9BA3/gF53M3oNYn3HcBWCIP64/2zotq2 ojyjASJANxtxHEoa7EGjBtz88s/sCed0fdjsp1VPBwhBkVUTjD8v72b4Pmxtuu5gDgRLiA gO+dpFezgfZg+oC5feQQIWSDNYSmM7hpyz4aNhyHSvOwC+QAOYXWSY2uAbzE8D1woOorwP eq3OZne+wsKQjqvu07Sd3+5sTsxZEsjVlape6ogMDdQQ/wC0tcdDQIol9+qLHA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1616552787; a=rsa-sha256; cv=none; b=YY+GFv36tebkYkKIhGSXH5DHvbYqFW3dupVtw82dfe87n1qOT4IxsqvVWBO8AjR8LBkfz0 A3NSLwpYzKr6BSKMSQi2bLedS6lPBma7RrCfn5KZdxRYKwLmi8f3aP3GfvOEYzBQdjrvLU bS0HPi3BqUT1S9dwuBcw/AzMGyLkUXNdKaazrXQ7iFipVvBEOQSO2knv8j6MVV9JG0+qEV s/HuZMrUqnNP5zbdHkYnlaI/aWSe2V5T5oAIxK7mMTKb6Wq9t9CKanHCvDc/r4s3gkKzbo 8LclhS/VPGVgFm9r1QE0e/UTqnjMyvwUZ790BNmWg+PvS0nMXEPfRuBITrWkpg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=B1vG0Zpv; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=B1vG0Zpv; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C881612573 X-Spam-Score: -1.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: 5RGBXeF9KUHv Hi! Raghav Gururajan writes: > * gnu/packages/crypto.scm (libdecaf): New variable. > --- > gnu/packages/crypto.scm | 63 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 63 insertions(+) > > diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm > index 0000e7fbf2..3959464d56 100644 > --- a/gnu/packages/crypto.scm > +++ b/gnu/packages/crypto.scm > @@ -47,9 +47,11 @@ > #:use-module (gnu packages compression) > #:use-module (gnu packages crates-io) > #:use-module (gnu packages cryptsetup) > + #:use-module (gnu packages documentation) > #:use-module (gnu packages gettext) > #:use-module (gnu packages gnupg) > #:use-module (gnu packages golang) > + #:use-module (gnu packages graphviz) > #:use-module (gnu packages image) > #:use-module (gnu packages kerberos) > #:use-module (gnu packages libbsd) > @@ -88,6 +90,67 @@ > #:use-module (srfi srfi-1) > #:use-module (srfi srfi-26)) > > +(define-public libdecaf > + (package > + (name "libdecaf") > + (version "1.0.1") > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "git://git.code.sf.net/p/ed448goldilocks/code") > + (commit > + (string-append "v" version)))) > + (file-name > + (git-file-name name version)) > + (sha256 > + (base32 "1ajgmyvc6a4m1h2hg1g4wz7ibx10x1xys9m6ancnmmf1f2srlfly")))) > + (build-system cmake-build-system) > + (outputs '("out" "python" "doc")) > + (arguments > + `(#:configure-flags '("-DENABLE_STATIC=OFF") > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'patch-python-binding > + (lambda _ > + (substitute* "python/setup.py" > + (("gmake") > + "make") > + (("'\\.\\.', 'build', 'lib', 'libdecaf\\.so'") > + "'..', '..', 'build', 'src', 'libdecaf.so'")) > + #t)) Ending phases with #t is no longer required on core-updates, and we can stop doing it on master and staging already too, to save us the hassle of editing them out at some later point in time :-) > + (add-after 'install 'install-python-binding > + (lambda* (#:key outputs #:allow-other-keys) > + (with-directory-excursion "../source/python" > + (invoke "python" "setup.py" "install" > + (string-append "--prefix=" (assoc-ref outputs "python")) > + "--root=/")) > + #t)) > + (add-after 'install-python-binding 'install-documentation > + (lambda* (#:key outputs #:allow-other-keys) > + (invoke "make" "doc") > + (let* ((doc (assoc-ref outputs "doc")) > + (dest (string-append doc "/share/doc"))) > + (copy-recursively "doc" dest)) > + #t))))) > + (native-inputs > + `(("dot" ,graphviz) > + ("doxygen" ,doxygen) > + ("python" ,python-wrapper))) > + (inputs > + `(("python2" ,python-2.7) > + ("python3" ,python))) This inputs field seems unnecessary, especially we don't want to add a dependency to Python 2, which is slowly being carved out of Guix. > + (synopsis "Decaf Elliptic Curve Library") > + (description "The libdecaf library is an implementation of elliptic curve > +cryptography using the Montgomery and Edwards curves Curve25519, Ed25519, > +Ed448-Goldilocks and Curve448, using the Decaf encoding.") > + (home-page "http://ed448goldilocks.sourceforge.net/") > + (license > + (list > + ;; Library. > + license:expat > + ;; Binding. > + license:bsd-2)))) I personally prefer the more compact (and common?) indentation of the licenses list as: (license (list license:expat ;library license:bsd-2)))) ;python bindings It's down to personal preferences, but I tend to value compactness in thousand lines long modules :-). I've made the following changes: --8<---------------cut here---------------start------------->8--- 1 file changed, 5 insertions(+), 15 deletions(-) gnu/packages/crypto.scm | 20 +++++--------------- modified gnu/packages/crypto.scm @@ -116,40 +116,30 @@ (("gmake") "make") (("'\\.\\.', 'build', 'lib', 'libdecaf\\.so'") - "'..', '..', 'build', 'src', 'libdecaf.so'")) - #t)) + "'..', '..', 'build', 'src', 'libdecaf.so'")))) (add-after 'install 'install-python-binding (lambda* (#:key outputs #:allow-other-keys) (with-directory-excursion "../source/python" (invoke "python" "setup.py" "install" (string-append "--prefix=" (assoc-ref outputs "python")) - "--root=/")) - #t)) + "--root=/")))) (add-after 'install-python-binding 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (invoke "make" "doc") (let* ((doc (assoc-ref outputs "doc")) (dest (string-append doc "/share/doc"))) - (copy-recursively "doc" dest)) - #t))))) + (copy-recursively "doc" dest))))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen) ("python" ,python-wrapper))) - (inputs - `(("python2" ,python-2.7) - ("python3" ,python))) (synopsis "Decaf Elliptic Curve Library") (description "The libdecaf library is an implementation of elliptic curve cryptography using the Montgomery and Edwards curves Curve25519, Ed25519, Ed448-Goldilocks and Curve448, using the Decaf encoding.") (home-page "http://ed448goldilocks.sourceforge.net/") - (license - (list - ;; Library. - license:expat - ;; Binding. - license:bsd-2)))) + (license (list license:expat ;library + license:bsd-2)))) ;python bindings (define-public libsodium (package --8<---------------cut here---------------end--------------->8--- And pushed as commit c221d49510. Thank you! Maxim