From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GEHLOrmIvWFUgAAAgWs5BA (envelope-from ) for ; Sat, 18 Dec 2021 08:07:37 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id KGaQNrmIvWHFEwAAB5/wlQ (envelope-from ) for ; Sat, 18 Dec 2021 07:07:37 +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 434991AF5B for ; Sat, 18 Dec 2021 08:07:37 +0100 (CET) Received: from localhost ([::1]:57996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myToe-00070Q-C4 for larch@yhetil.org; Sat, 18 Dec 2021 02:07:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myTo8-0006yX-JY for guix-patches@gnu.org; Sat, 18 Dec 2021 02:07:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57838) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myTo6-000726-P1 for guix-patches@gnu.org; Sat, 18 Dec 2021 02:07:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myTo6-00085q-FQ for guix-patches@gnu.org; Sat, 18 Dec 2021 02:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48702] [PATCH v5 0/3] Add patatt and update b4 Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Dec 2021 07:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48702 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48702@debbugs.gnu.org Cc: Xinglu Chen , Aleksandr Vityazev Received: via spool by 48702-submit@debbugs.gnu.org id=B48702.163981122231107 (code B ref 48702); Sat, 18 Dec 2021 07:07:02 +0000 Received: (at 48702) by debbugs.gnu.org; 18 Dec 2021 07:07:02 +0000 Received: from localhost ([127.0.0.1]:41149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myTo5-00085a-FT for submit@debbugs.gnu.org; Sat, 18 Dec 2021 02:07:01 -0500 Received: from out2.migadu.com ([188.165.223.204]:44566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myTo2-00085O-Lf for 48702@debbugs.gnu.org; Sat, 18 Dec 2021 02:07:00 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1639811216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SJvvq4rU63CaD6yCIR83GE0d1oS+/GF8WsQCLtV0tLU=; b=wFJNW5NRXSSlIkvV6B/x06YGIidMLvyCQJ0VWZ8SbRkboegucu06mJow8Ew81gtbbzEiyo TpKBpgl+wKbMr0hsIaJNrFvdnBLqhkInAhtcIuoVpdIaDST7E1hrxuaC82OfN1v+CpWjto TqAnrgWaXQBb6599TePAWy9PME5K/oL7Z7gRNnnLeBA+KJGGjJzvIrzjzfKQ8y5KrY66BW Skkz4GZ0OxkYT4BEgrn+kKz1kyI6IBJRg8vyS7SE40wtmYkEdKpO8NfRVgRyAAfAwY+ETJ aqoFuce0LL0khWjM+QH+tMd7n8x0F+AWPqXaWYpNX2j+CW0krpHbQge3VGyVHA== From: Kyle Meyer Date: Sat, 18 Dec 2021 02:06:45 -0500 Message-Id: <20211218070648.278181-1-kyle@kyleam.com> In-Reply-To: <20210918162853.25997-1-kyle@kyleam.com> References: <20210918162853.25997-1-kyle@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1639811257; 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: content-transfer-encoding:content-transfer-encoding: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=SJvvq4rU63CaD6yCIR83GE0d1oS+/GF8WsQCLtV0tLU=; b=Tx4kwSd0sTJJ6NyjhsYfdtglb/gU6UQuk6ivKfF56xXNRTV5cf73J9k6sInglgk37HMzJO k+aWQ0JS/pQR7DeduQwHgZMoa3fjAq/0uZpClHFgTOhYCLmZ2eP32iJKGs3BGZriurBlPX fzi6vdQvbGtM8hbXZ+ZBjO1KiSMipHeLMEQh6fkaYAF7uNXb+pRTrhZXuSBTjlnSF382ja inFrgQHzKtu9yG41Wi+sLC6pGmvtRGmZ+ZF2jWHsp4rw3FVGZjuvnzyDqfBxTcGFQip5Ae j6+3R1Tn0QQ5EJAEXIyBMBaiUs3wzdHuPbLOYKXK4pmxC8T1SNWjmJ2R7K8nbg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1639811257; a=rsa-sha256; cv=none; b=PFPUXnWH88PVqERd4fKmJd8ZgLRWoRBIJkTmebDrpKnR4s8gyvl+LswNHpVt969ZN9VA2I CTgDYtC+a76e0RHSbOPQ3DaWQBlEc68d1O2dyYjF37YLcDHLpRLMFcveM32lqBtDKg4ppM 0DMMZflnR5u4umLEAsq2tf0+n+1zp9zb+Zu2c6shaE0OFFRMnlLPAhFukuAvOaLyYiUcpX s0JOoN8mZidibfMhAey+6cc0bMG23lphco62wHP9DqDeOB6DqsAwbnJXQpRVBIv7s08HRt b3ENimr4P0LpzfnI3YIDbuY/IDg5iWUpzcxICSEz0Y70gBLfOPwg2Q2cBashoQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kyleam.com header.s=key1 header.b=wFJNW5NR; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kyleam.com header.s=key1 header.b=wFJNW5NR; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 434991AF5B X-Spam-Score: -1.30 X-Migadu-Scanner: scn0.migadu.com X-TUID: WxZGCVumIyWJ Here's another reroll that 1) deals with conflicts that have popped up in guix/import/utils.scm 2) increases the patatt version to account for release that happened since v5 was sent 3) updates inputs according to `guix style' Note that updating b4 to 0.8.0 resolves the b4 build failure reported in bug#52553 (<87ilvo7h5t.fsf@posteo.org>). --- This series updates b4 to the latest version. b4 now uses a separate tool for patch attestation (added in patch 2), which in turn uses a license that's not in guix/licenses.scm (added in patch 1). [1/3] licenses: Add Expat No Attribution license. [2/3] gnu: Add patatt. [3/3] gnu: b4: Update to 0.8.0. gnu/packages/version-control.scm | 36 +++++++++++++++++++++++--------- guix/import/utils.scm | 2 ++ guix/licenses.scm | 10 ++++++++- 3 files changed, 37 insertions(+), 11 deletions(-) Range-diff against v4: 1: 5ce84815bc ! 1: 7b932e8ea4 licenses: Add Expat No Attribution license. @@ Commit message ## guix/import/utils.scm ## @@ - ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Sarah Morgensen + ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Kyle Meyer ;;; ;;; This file is part of GNU Guix. @@ guix/import/utils.scm: (define (spdx-string->license str) ("MIT" 'license:expat) + ("MIT-0" 'license:expat-0) ("FTL" 'license:freetype) + ("Freetype" 'license:freetype) ("GFDL-1.1" 'license:fdl1.1+) - ("GFDL-1.2" 'license:fdl1.2+) ## guix/licenses.scm ## @@ 2: 1cfd954f31 ! 2: 12b48f1bdb gnu: Add patatt. @@ Commit message * gnu/packages/version-control.scm (patatt): New variable. ## gnu/packages/version-control.scm ## -@@ gnu/packages/version-control.scm: (define-module (gnu packages version-control) - #:use-module (gnu packages python) - #:use-module (gnu packages python-build) - #:use-module (gnu packages python-check) -+ #:use-module (gnu packages python-crypto) - #:use-module (gnu packages python-web) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages readline) @@ gnu/packages/version-control.scm: (define-public grokmirror based on a manifest file published by servers.") (license license:gpl3+))) @@ gnu/packages/version-control.scm: (define-public grokmirror +(define-public patatt + (package + (name "patatt") -+ (version "0.4.8") ++ (version "0.4.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "patatt" version)) + (sha256 -+ (base32 "1jj3c2rc5lzgsk3x2bq1295g7h59y9y8vi9a0gzqh3aqka00zqak")))) ++ (base32 "0fpbkmdlnz9s1lakw11jlrzpz4mb6f4dksdiir9g1ppq0g34sy58")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; No tests. + (propagated-inputs -+ `(("python-pynacl" ,python-pynacl))) ++ (list python-pynacl)) + (home-page "https://git.kernel.org/pub/scm/utils/patatt/patatt.git") + (synopsis "Tool for cryptographic patch attestation") + (description "This utility provides end-to-end cryptographic attestation 3: 520fbecd62 ! 3: 93595c3c8f gnu: b4: Update to 0.8.0. @@ gnu/packages/version-control.scm: (define-public patatt (build-system python-build-system) (arguments '(#:tests? #f)) ; No tests. (inputs - `(("python-dkimpy" ,python-dkimpy) - ("python-dnspython" ,python-dnspython) - ("python-requests" ,python-requests))) + (list python-dkimpy python-dnspython python-requests)) + (propagated-inputs -+ `(("patatt" ,patatt))) ++ (list patatt)) (home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git") (synopsis "Tool for working with patches in public-inbox archives") (description base-commit: 3b2b42034c42ccb1dd8845bc03dd3a8053b54aca -- 2.34.0