all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Kyle Meyer <kyle@kyleam.com>
To: 48702@debbugs.gnu.org
Cc: Xinglu Chen <public@yoctocell.xyz>
Subject: [bug#48702] [PATCH v4 0/3] Add patatt and update b4
Date: Sat, 18 Sep 2021 12:28:50 -0400	[thread overview]
Message-ID: <20210918162853.25997-1-kyle@kyleam.com> (raw)
In-Reply-To: <20210717130941.25146-1-kyle@kyleam.com>

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 <mjbecze@riseup.net>
      ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
    + ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
     +;;; Copyright © 2021 Kyle Meyer <kyle@kyleam.com>
      ;;;
      ;;; 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 <felgru@posteo.net>
      ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
    + ;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>
     +;;; Copyright © 2021 Kyle Meyer <kyle@kyleam.com>
      ;;;
      ;;; 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 <kyle@kyleam.com>

      ## 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




  parent reply	other threads:[~2021-09-18 16:30 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-27 14:50 [bug#48702] [PATCH 0/3] Add patatt and update b4 Kyle Meyer
2021-05-27 14:54 ` [bug#48702] [PATCH 1/3] licenses: Add Expat No Attribution license Kyle Meyer
2021-05-27 14:54 ` [bug#48702] [PATCH 2/3] gnu: Add patatt Kyle Meyer
2021-05-27 14:54 ` [bug#48702] [PATCH 3/3] gnu: b4: Update to 0.7.0 Kyle Meyer
2021-05-27 21:49 ` [bug#48702] [PATCH 0/3] Add patatt and update b4 Xinglu Chen
2021-05-27 23:05   ` Kyle Meyer
2021-06-03  6:40 ` [bug#48702] [PATCH v2 " Kyle Meyer
2021-06-03  6:40   ` [bug#48702] [PATCH v2 1/3] licenses: Add Expat No Attribution license Kyle Meyer
2021-06-03  6:40   ` [bug#48702] [PATCH v2 2/3] gnu: Add patatt Kyle Meyer
2021-06-03  6:40   ` [bug#48702] [PATCH v2 3/3] gnu: b4: Update to 0.7.1 Kyle Meyer
2021-07-17 13:09   ` [bug#48702] [PATCH v3 0/3] Add patatt and update b4 Kyle Meyer
2021-07-17 13:09     ` [bug#48702] [PATCH v3 1/3] licenses: Add Expat No Attribution license Kyle Meyer
2021-07-17 13:09     ` [bug#48702] [PATCH v3 2/3] gnu: Add patatt Kyle Meyer
2021-07-17 13:09     ` [bug#48702] [PATCH v3 3/3] gnu: b4: Update to 0.7.2 Kyle Meyer
2021-09-18 16:28     ` Kyle Meyer [this message]
2021-09-18 16:28       ` [bug#48702] [PATCH v4 1/3] licenses: Add Expat No Attribution license Kyle Meyer
2021-09-18 16:28       ` [bug#48702] [PATCH v4 2/3] gnu: Add patatt Kyle Meyer
2021-09-18 16:28       ` [bug#48702] [PATCH v4 3/3] gnu: b4: Update to 0.8.0 Kyle Meyer
2021-12-18  7:06       ` [bug#48702] [PATCH v5 0/3] Add patatt and update b4 Kyle Meyer
2021-12-18  7:06         ` [bug#48702] [PATCH v5 1/3] licenses: Add Expat No Attribution license Kyle Meyer
2021-12-18  7:06         ` [bug#48702] [PATCH v5 2/3] gnu: Add patatt Kyle Meyer
2021-12-18  7:06         ` [bug#48702] [PATCH v5 3/3] gnu: b4: Update to 0.8.0 Kyle Meyer
     [not found]         ` <87ee69pvid.fsf@disroot.org>
2021-12-18 20:20           ` [bug#48702] [PATCH v5 0/3] Add patatt and update b4 Kyle Meyer
2022-05-22 22:28         ` [bug#48702] [PATCH v6 0/4] Add patatt and enable patch attestation for b4 Kyle Meyer
2022-05-22 22:28           ` [bug#48702] [PATCH v6 1/4] licenses: Add Expat No Attribution license Kyle Meyer
2022-05-22 22:28           ` [bug#48702] [PATCH v6 2/4] gnu: Add patatt Kyle Meyer
2022-05-22 22:28           ` [bug#48702] [PATCH v6 3/4] gnu: b4: Drop now unneeded snippet Kyle Meyer
2022-05-22 22:28           ` [bug#48702] [PATCH v6 4/4] gnu: b4: Enable patch attestation Kyle Meyer
2022-05-23  9:25             ` Maxime Devos
2022-05-23 13:59           ` bug#48702: [PATCH v6 0/4] Add patatt and enable patch attestation for b4 Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210918162853.25997-1-kyle@kyleam.com \
    --to=kyle@kyleam.com \
    --cc=48702@debbugs.gnu.org \
    --cc=public@yoctocell.xyz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.