Merge branch 'master' into core-updates-frozen

This commit is contained in:
Ludovic Courtès 2021-09-07 11:04:44 +02:00
commit d9dfbf886d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
258 changed files with 218381 additions and 180777 deletions

View file

@ -246,7 +246,7 @@ GiB).")
(define-public meld
(package
(name "meld")
(version "3.20.3")
(version "3.20.4")
(source
(origin
(method url-fetch)
@ -254,7 +254,7 @@ GiB).")
(version-major+minor version)
"/meld-" version ".tar.xz"))
(sha256
(base32 "06h52vaghvj5n507mj0hhk9yrca16pyl4l16c00b3bmkplljpqzh"))))
(base32 "04vx2mdbcdin0g3w8x910czfch5vyrl8drv1f2l8gxh6qvp113pl"))))
(build-system python-build-system)
(native-inputs
`(("intltool" ,intltool)