diff options
| author | Christopher Baines <mail@cbaines.net> | 2021-03-05 22:56:40 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2021-03-06 00:18:30 +0000 |
| commit | a8448da0f4a090818104e64dd79f90b0e50d5e77 (patch) | |
| tree | 494c58b4724f12cd9de0db9b0a7096de2b922c0f /gnu/packages/patchutils.scm | |
| parent | 4f4b749e75b38b8c08b4f67ef51c2c8740999e28 (diff) | |
| parent | a714af38d5d1046081524d859cde4cd8fd12a923 (diff) | |
Merge branch 'master' into core-updates
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 444f4586576..1a64ef3a94d 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org> | 2 | ;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org> |
| 3 | ;;; Copyright © 2015, 2018 Leo Famulari <leo@famulari.name> | 3 | ;;; Copyright © 2015, 2018 Leo Famulari <leo@famulari.name> |
| 4 | ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> | 4 | ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> |
| 5 | ;;; Copyright © 2019 Christopher Baines <mail@cbaines.net> | 5 | ;;; Copyright © 2019 Christopher Baines <mail@cbaines.net> |
| 6 | ;;; | 6 | ;;; |
| 7 | ;;; This file is part of GNU Guix. | 7 | ;;; This file is part of GNU Guix. |
| @@ -246,7 +246,7 @@ GiB).") | |||
| 246 | (define-public meld | 246 | (define-public meld |
| 247 | (package | 247 | (package |
| 248 | (name "meld") | 248 | (name "meld") |
| 249 | (version "3.20.2") | 249 | (version "3.20.3") |
| 250 | (source | 250 | (source |
| 251 | (origin | 251 | (origin |
| 252 | (method url-fetch) | 252 | (method url-fetch) |
| @@ -254,7 +254,7 @@ GiB).") | |||
| 254 | (version-major+minor version) | 254 | (version-major+minor version) |
| 255 | "/meld-" version ".tar.xz")) | 255 | "/meld-" version ".tar.xz")) |
| 256 | (sha256 | 256 | (sha256 |
| 257 | (base32 "0a0x156zr3w2yg0rnhwy39giy3xnfm6sqcfa4xcw4i6ahvwqa2dc")))) | 257 | (base32 "06h52vaghvj5n507mj0hhk9yrca16pyl4l16c00b3bmkplljpqzh")))) |
| 258 | (build-system python-build-system) | 258 | (build-system python-build-system) |
| 259 | (native-inputs | 259 | (native-inputs |
| 260 | `(("intltool" ,intltool) | 260 | `(("intltool" ,intltool) |
| @@ -321,7 +321,7 @@ you to figure out what is going on in that merge you keep avoiding.") | |||
| 321 | (define-public patchwork | 321 | (define-public patchwork |
| 322 | (package | 322 | (package |
| 323 | (name "patchwork") | 323 | (name "patchwork") |
| 324 | (version "3.0.0") | 324 | (version "3.0.1") |
| 325 | (source (origin | 325 | (source (origin |
| 326 | (method git-fetch) | 326 | (method git-fetch) |
| 327 | (uri (git-reference | 327 | (uri (git-reference |
| @@ -330,7 +330,7 @@ you to figure out what is going on in that merge you keep avoiding.") | |||
| 330 | (file-name (git-file-name name version)) | 330 | (file-name (git-file-name name version)) |
| 331 | (sha256 | 331 | (sha256 |
| 332 | (base32 | 332 | (base32 |
| 333 | "005irr5xsjpp3wrvvqs2xyr14ig9vp3h4v0qixhj1b8v69cfrgpi")))) | 333 | "049ih1fbbbmj11v5m9ilahifl8x7gi6wyba58552y9n9djzs8csc")))) |
| 334 | (build-system python-build-system) | 334 | (build-system python-build-system) |
| 335 | (arguments | 335 | (arguments |
| 336 | `(;; TODO: Tests require a running database | 336 | `(;; TODO: Tests require a running database |
