From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wIDNCtlXjmBCagAAgWs5BA (envelope-from ) for ; Sun, 02 May 2021 09:42:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id IE5ZBtlXjmAkRAAAbx9fmQ (envelope-from ) for ; Sun, 02 May 2021 07:42:17 +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 912AA2065C for ; Sun, 2 May 2021 09:42:16 +0200 (CEST) Received: from localhost ([::1]:60636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ld6k3-0004qk-J1 for larch@yhetil.org; Sun, 02 May 2021 03:42:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ld6jq-0004q5-Ji for guix-patches@gnu.org; Sun, 02 May 2021 03:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57920) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ld6jq-0008Cp-3M for guix-patches@gnu.org; Sun, 02 May 2021 03:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ld6jq-0001Lz-27 for guix-patches@gnu.org; Sun, 02 May 2021 03:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48154] [PATCH] gnu: sequoia: Update to 1.1.0. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 May 2021 07:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48154 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48154@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16199413015194 (code B ref -1); Sun, 02 May 2021 07:42:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 May 2021 07:41:41 +0000 Received: from localhost ([127.0.0.1]:41231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ld6jT-0001Li-Tn for submit@debbugs.gnu.org; Sun, 02 May 2021 03:41:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:33478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ld6jS-0001LY-BG for submit@debbugs.gnu.org; Sun, 02 May 2021 03:41:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ld6jS-0004bq-3p for guix-patches@gnu.org; Sun, 02 May 2021 03:41:38 -0400 Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:60526) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ld6jP-0007we-2H for guix-patches@gnu.org; Sun, 02 May 2021 03:41:37 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4FXyj76nMCz1rynZ for ; Sun, 2 May 2021 09:41:31 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4FXyj75rwMz1qqkt for ; Sun, 2 May 2021 09:41:31 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id l-Yf5bpY_Ydd for ; Sun, 2 May 2021 09:41:30 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-142.dynamic.mnet-online.de [188.174.60.142]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Sun, 2 May 2021 09:41:30 +0200 (CEST) Received: from thisbe.fritz.box (thisbe.fritz.box [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 39D726034B; Sun, 2 May 2021 09:44:12 +0200 (CEST) From: Hartmut Goebel Date: Sun, 2 May 2021 09:41:27 +0200 Message-Id: <2de6a8e0ec4d2b6121ff58155fc530d76fbd550f.1619941234.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.4 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2001:a60:0:28:0:1:25:1; envelope-from=h.goebel@crazy-compilers.com; helo=mail-out.m-online.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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=1619941336; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZfYRz0ykesSG/3SBOCTArAIQR8PZwtVrYui0h4ZCzxs=; b=enHRg/77D/Dpuh1j7mvZOcwQjx1YKrqMitEq131NLfobtmjuODLHO8F/GRBKN7kv6sNH9b js2+JMAcyZ0rtNMjZwmy/GckkqalaNUZsHMqeBMiDhvUdpxnh9rJeL0wBO4N7rLGUufdts 3yad2fDElZT+I4S1fpTaMqDcNOZxe2Lup3MxhXcN28TAVvhXijx3V9KKei0GXxQ7D3NjkP mQqy5m8pI5WTVyedRaGLYsiCgE3wDkBBIsa1HVo9a+rNNr28jF1p68KhDOhIndk/ECiCm9 XY0uaymEjliGJhmh9i3NK4yv/V9ZpNsq4Gr2atJQGQ1zWP1UpRBjIa98qgI1Fg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1619941336; a=rsa-sha256; cv=none; b=o2h1so6gmONaQUeD7doI9bwmzruCI/A1aXS/Xl2FbxhQ/D0RNtRKUtUN8gqqIcRp67LsNQ WH3WJug1yvioDmwILaqOdlMp8SAUBa0TmTwou8EKz9hSiOAMpJkKVnfQxkSY8OaHEDXqWy Pk4e/FIvsoF0pSNEdh2UDOrPc3CjAn8guthM3BL7JHHHkhk8Um3xP+imCOXY/wUd9RgMTM QZSxbLd3nQH0KppEFFHGezuU5bZfleRAfzkitEkEeupBUL/pKmRtiJqwjZyMdZFJvzBMu5 cNM/liYwSfYL4wAgs1lVUnnI5r8TZKDhbRf+g6pQIrECJPeRzjX6IfzEmb6kBQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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: 2.54 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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: 912AA2065C X-Spam-Score: 2.54 X-Migadu-Scanner: scn0.migadu.com X-TUID: 0NZPKlqMEYiy * gnu/packages/sequoia.scm (sequoia): Update to 1.1.0. [arguments]: Remove phase "package", add phases "fix-rand-dependency" and "fix-permissions". --- gnu/packages/sequoia.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index b75a622c64..b1d78dad0a 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -42,15 +42,15 @@ (define-public sequoia (package (name "sequoia") - (version "1.0.0") + (version "1.1.0") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.com/sequoia-pgp/sequoia.git") - (commit (string-append "v" version)))) + (commit (string-append "openpgp/v" version)))) (sha256 - (base32 "0y80bl786m29ww3272qsl1ql0xc3pwd6iiqlkv3nmhnjsmygbn0d")) + (base32 "0knkm0nw1h4ww51vks4jnnp1yc45llfi7j0i70f6vf2bcknnbmci")) (file-name (git-file-name name version)))) (build-system cargo-build-system) (outputs '("out" "python")) @@ -140,12 +140,25 @@ ;; Run make instead of using the rust build system, as ;; suggested by the installation instructions (replace 'build (lambda _ (invoke "make" "build-release") #t)) + (delete 'package) ;; cargo can't package a multi-crate workspace (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-rand-dependency + (lambda _ + (substitute* "ipc/Cargo.toml" + ;; required: enable rand::rngs::OsRng in rand >= 0.8 + (("(^rand =.*,) default-features = false(.*)" _ a b) + (string-append a " features = [\"getrandom\"]" b))) + #t)) + (add-after 'unpack 'fix-permissions + (lambda _ + (chmod "sq/src/sq-usage.rs" #o644) + (chmod "sqv/src/sqv-usage.rs" #o644) + #t)) (add-after 'unpack 'fix-environment (lambda* (#:key outputs #:allow-other-keys) ;; adjust prefix -- 2.21.4