From patchwork Sat Jul 17 13:09:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 233 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C456E27BC6B; Sat, 17 Jul 2021 14:11:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 07E9627BC78 for ; Sat, 17 Jul 2021 14:11:11 +0100 (BST) Received: from localhost ([::1]:46752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4k61-0007iZ-VK for patchwork@mira.cbaines.net; Sat, 17 Jul 2021 09:11:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4k5u-0007i6-8J for guix-patches@gnu.org; Sat, 17 Jul 2021 09:11:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41425) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4k5u-0002vm-0m for guix-patches@gnu.org; Sat, 17 Jul 2021 09:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m4k5t-0006JM-Qu for guix-patches@gnu.org; Sat, 17 Jul 2021 09:11:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48702] [PATCH v3 0/3] Add patatt and update b4 Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Jul 2021 13:11:01 +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 Received: via spool by 48702-submit@debbugs.gnu.org id=B48702.162652742624193 (code B ref 48702); Sat, 17 Jul 2021 13:11:01 +0000 Received: (at 48702) by debbugs.gnu.org; 17 Jul 2021 13:10:26 +0000 Received: from localhost ([127.0.0.1]:52961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4k5F-0006Hq-Ad for submit@debbugs.gnu.org; Sat, 17 Jul 2021 09:10:25 -0400 Received: from out0.migadu.com ([94.23.1.103]:62775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4k5A-0006Hb-NW for 48702@debbugs.gnu.org; Sat, 17 Jul 2021 09:10:20 -0400 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=1626527413; 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=pv5KATCF9i9MqiKKEAynP7WWtbPSwcJX/oJsIoqHKB4=; b=kv2PtSKBeBU1pu4PrMHP+sHzck42n+kGsPyoDS3axjXzeH9WYJ+7St7nccYpL1D2x3ty3F ws0Wfb6wbQOTKZDe6c53mvmzDVKih2KtZBynTlWe9XWhyrZUfEzzD1f/gopMfDr5XB/wcd ciCPXy2e//P4ujttO5HAeNRW0B5YTE6a1oo/i4Qrun7Lb3XVPLz0trRZnVEe8HyjGSO48S sSxkNDkvhdtkauoe6/zhz7LcR4JAncH08MMJ1vCiDA6q4tvYfbLGTaOxTci3mL9E5Zci6e 7rOUTlDh1KOrN9jEux5tOKTlfxD66mIomPSXgfHE4Mt2p6pYAiJGNZNJ4uIEhg== From: Kyle Meyer Date: Sat, 17 Jul 2021 09:09:38 -0400 Message-Id: <20210717130941.25146-1-kyle@kyleam.com> In-Reply-To: <20210603064009.18820-1-kyle@kyleam.com> References: <20210603064009.18820-1-kyle@kyleam.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: kyle@kyleam.com 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Here's a reroll that 1) deals with conflicts that have popped up in guix/licenses.scm and 2) accounts for patatt and b4 releases that have happened since v2 was sent. --- 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.7.2. gnu/packages/version-control.scm | 37 +++++++++++++++++++++++--------- guix/import/utils.scm | 2 ++ guix/licenses.scm | 10 ++++++++- 3 files changed, 38 insertions(+), 11 deletions(-) Range-diff against v2: 1: 1a4ab70088 ! 1: bda992a993 licenses: Add Expat No Attribution license. @@ guix/import/utils.scm: (define (spdx-string->license str) ## guix/licenses.scm ## @@ - ;;; Copyright © 2020 André Batista ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> ;;; Copyright © 2021 Felix Gruber + ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ guix/licenses.scm: (define-module (guix licenses) - edl1.0 epl1.0 epl2.0 + eupl1.2 - expat + expat expat-0 freetype 2: f9d1ef1ac5 ! 2: 8dec2fae21 gnu: Add patatt. @@ gnu/packages/version-control.scm: (define-public grokmirror +(define-public patatt + (package + (name "patatt") -+ (version "0.4.4") ++ (version "0.4.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "patatt" version)) + (sha256 -+ (base32 "08v7f8rwr0gx21q2igxrw51ydlwkgcjch75xhdg0qvnknn4k1c3z")))) ++ (base32 "06xrbm94a6mzrp6pih7pk4bbcbjh4xrf8y8qjg8va4qbvkhhcl2c")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; No tests. + (propagated-inputs 3: 94b7d5062c ! 3: cb85fcb68c gnu: b4: Update to 0.7.1. @@ Metadata Author: Kyle Meyer ## Commit message ## - gnu: b4: Update to 0.7.1. + gnu: b4: Update to 0.7.2. - * gnu/packages/version-control.scm (b4): Update to 0.7.1. + * gnu/packages/version-control.scm (b4): Update to 0.7.2. [propagated-inputs]: Add patatt. [source]: Drop snippet for issue that is now fixed upstream. @@ gnu/packages/version-control.scm: (define-public patatt (package (name "b4") - (version "0.6.2") -+ (version "0.7.1") ++ (version "0.7.2") (source (origin (method url-fetch) @@ gnu/packages/version-control.scm: (define-public patatt - (substitute* "setup.py" - (("~=") ">=")) - #t)))) -+ (base32 "04hwrqpvb98m6p9qj8mlblb2ynxai7zgzrlm6kbx9q2f9xl16d9z")))) ++ (base32 "1zc75s6ikn5vlv2jhvw00saqyymh3dpr9b8p9w13fwll6v05s9nd")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; No tests. (inputs base-commit: 9cb35c02164d929fcb8929e7f454df215df8cf25