diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-04-08 15:47:00 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-04-08 15:47:00 -0400 |
| commit | 533a893cc6b03f100566760d6e0c8e0500ed7082 (patch) | |
| tree | 0ecbf89895a400c43d16bb1f6539f1a88aeaa4cf /gnu/packages/patchutils.scm | |
| parent | 6a2546f92d07df04e5d700924edd027ed1e2ef11 (diff) | |
| parent | c762df54786fd6f005f3b5307323f1d2df3cbf0b (diff) | |
Merge branch 'master' into staging
Conflicts:
.guix-authorizations
gnu/ci.scm
gnu/packages/base.scm
gnu/packages/databases.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/imagemagick.scm
gnu/packages/password-utils.scm
gnu/packages/python-xyz.scm
gnu/packages/web-browsers.scm
Diffstat (limited to 'gnu/packages/patchutils.scm')
| -rw-r--r-- | gnu/packages/patchutils.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 1354c860a5..f190fec1a2 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2018 Leo Famulari <leo@famulari.name> -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Christopher Baines <mail@cbaines.net> ;;; ;;; This file is part of GNU Guix. @@ -246,7 +246,7 @@ GiB).") (define-public meld (package (name "meld") - (version "3.20.2") + (version "3.20.3") (source (origin (method url-fetch) @@ -254,7 +254,7 @@ GiB).") (version-major+minor version) "/meld-" version ".tar.xz")) (sha256 - (base32 "0a0x156zr3w2yg0rnhwy39giy3xnfm6sqcfa4xcw4i6ahvwqa2dc")))) + (base32 "06h52vaghvj5n507mj0hhk9yrca16pyl4l16c00b3bmkplljpqzh")))) (build-system python-build-system) (native-inputs `(("intltool" ,intltool) @@ -321,7 +321,7 @@ you to figure out what is going on in that merge you keep avoiding.") (define-public patchwork (package (name "patchwork") - (version "3.0.0") + (version "3.0.1") (source (origin (method git-fetch) (uri (git-reference @@ -330,7 +330,7 @@ you to figure out what is going on in that merge you keep avoiding.") (file-name (git-file-name name version)) (sha256 (base32 - "005irr5xsjpp3wrvvqs2xyr14ig9vp3h4v0qixhj1b8v69cfrgpi")))) + "049ih1fbbbmj11v5m9ilahifl8x7gi6wyba58552y9n9djzs8csc")))) (build-system python-build-system) (arguments `(;; TODO: Tests require a running database |