From patchwork Sat Sep 18 16:28:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 332 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 EA22B27BBE4; Sat, 18 Sep 2021 17:31:00 +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_H2,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 5639127BBE3 for ; Sat, 18 Sep 2021 17:31:00 +0100 (BST) Received: from localhost ([::1]:47558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRdEx-0008TR-DC for patchwork@mira.cbaines.net; Sat, 18 Sep 2021 12:30:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRdE4-0008Sd-6J for guix-patches@gnu.org; Sat, 18 Sep 2021 12:30:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53342) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRdE2-0001Ic-UD for guix-patches@gnu.org; Sat, 18 Sep 2021 12:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mRdE2-0004oZ-HC for guix-patches@gnu.org; Sat, 18 Sep 2021 12:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48702] [PATCH v4 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 Sep 2021 16:30: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 Received: via spool by 48702-submit@debbugs.gnu.org id=B48702.163198255518401 (code B ref 48702); Sat, 18 Sep 2021 16:30:02 +0000 Received: (at 48702) by debbugs.gnu.org; 18 Sep 2021 16:29:15 +0000 Received: from localhost ([127.0.0.1]:36645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRdD3-0004lw-4U for submit@debbugs.gnu.org; Sat, 18 Sep 2021 12:29:15 -0400 Received: from out2.migadu.com ([188.165.223.204]:15896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRdD0-0004lj-8z for 48702@debbugs.gnu.org; Sat, 18 Sep 2021 12:29:00 -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=1631982536; 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=JgaYwVg8rFi+nM1ztN8s6Ppw2o/80HWiUSnwU1ZP92g=; b=tQgndzH9VvtYe3dZVPwdAq9rN28jtrOlE8wcXkD3Ygbs5dFrwVxfgSI5frI/12Yk2GPFXr 5vuHl3CztO3D8fJGV3cpznIlbWB9r7vpKcoRyPqRvJvr1r7a2qdWQ1DMnHmZdCcr2fv2FY AC+nE7xO8TuQ31KnyT4hbT42Qm4XucuXOcrGHDykcwyefrawcwYpqU7LYvg+656sOzDw2U dsaLj2tS6KtvnE9FJTvCVkOSKjcefQTVvA6KZ4iaE5AjOhwNazQr4Kk2fA3AJ7gA2zHiSq gkB1h6s/8wTRrM+pK52Rg87lqTvb7ukTnjOfDm3xwq7k0NrgPzGcarJHnQ5byQ== From: Kyle Meyer Date: Sat, 18 Sep 2021 12:28:50 -0400 Message-Id: <20210918162853.25997-1-kyle@kyleam.com> In-Reply-To: <20210717130941.25146-1-kyle@kyleam.com> References: <20210717130941.25146-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 another reroll that 1) deals with conflicts that have popped up in guix/licenses.scm and 2) accounts for patatt and b4 releases that happened since v3 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.8.0. 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 v3: 1: bda992a993 ! 1: 6c2a380249 licenses: Add Expat No Attribution license. @@ Commit message ## guix/import/utils.scm ## @@ - ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Maxim Cournoyer + ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2021 Kyle Meyer ;;; ;;; This file is part of GNU Guix. @@ guix/import/utils.scm: (define (spdx-string->license str) ## guix/licenses.scm ## @@ - ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Xinglu Chen + ;;; Copyright © 2021 Noisytoot +;;; Copyright © 2021 Kyle Meyer ;;; ;;; This file is part of GNU Guix. 2: 8dec2fae21 ! 2: 942db96ac1 gnu: Add patatt. @@ gnu/packages/version-control.scm: (define-public grokmirror +(define-public patatt + (package + (name "patatt") -+ (version "0.4.6") ++ (version "0.4.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "patatt" version)) + (sha256 -+ (base32 "06xrbm94a6mzrp6pih7pk4bbcbjh4xrf8y8qjg8va4qbvkhhcl2c")))) ++ (base32 "1jj3c2rc5lzgsk3x2bq1295g7h59y9y8vi9a0gzqh3aqka00zqak")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; No tests. + (propagated-inputs 3: cb85fcb68c ! 3: 3a3d16e4c3 gnu: b4: Update to 0.7.2. @@ Metadata Author: Kyle Meyer ## Commit message ## - gnu: b4: Update to 0.7.2. + gnu: b4: Update to 0.8.0. - * gnu/packages/version-control.scm (b4): Update to 0.7.2. + * gnu/packages/version-control.scm (b4): Update to 0.8.0. [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.2") ++ (version "0.8.0") (source (origin (method url-fetch) @@ gnu/packages/version-control.scm: (define-public patatt - (substitute* "setup.py" - (("~=") ">=")) - #t)))) -+ (base32 "1zc75s6ikn5vlv2jhvw00saqyymh3dpr9b8p9w13fwll6v05s9nd")))) ++ (base32 "115ysciq15sxc8fd9hf7p0f4wnd5xapcfkmq8g33y1c8nbdxclbx")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; No tests. (inputs base-commit: 511dc6877e0664d83fd800cc601fa94c231a0d0f -- 2.33.0