1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-16 03:50:45 +02:00

Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2020-04-13 20:26:21 +02:00
commit fc58cb5bd2
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
63 changed files with 762 additions and 461 deletions

View file

@ -5,14 +5,14 @@
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com>
;;; Copyright © 2016, 2019 Eraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2019, 2020 Eraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
;;; Copyright © 2016 Amirouche <amirouche@hypermove.net>
;;; Copyright © 2016, 2019 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017 David Thompson <davet@gnu.org>
;;; Copyright © 2017, 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -1140,7 +1140,7 @@ microblogging service.")
(define-public guile-parted
(package
(name "guile-parted")
(version "0.0.2")
(version "0.0.3")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1149,20 +1149,8 @@ microblogging service.")
(file-name (git-file-name name version))
(sha256
(base32
"01qmv6xnbbq3wih0dl9bscvca2d7zx7bjiqf35y6dkaqsp8nvdxf"))
(modules '((guix build utils)))
(snippet
'(begin
;; Allow builds with Guile 3.0.
(substitute* "configure.ac"
(("^GUILE_PKG.*")
"GUILE_PKG([3.0 2.2 2.0])\n"))
;; Remove "guile.m4" since it contains an obsolete version
;; of 'GUILE_PKG' that doesn't work with development
;; versions such as 2.9.
(delete-file "m4/guile.m4")
#t))))
"0kwi777fhfb4rq6fik9bwqzr63k82qjl94dm5lyyyal4rh724xrc"))
(modules '((guix build utils)))))
(build-system gnu-build-system)
(arguments
'(#:make-flags
@ -2186,14 +2174,14 @@ is no support for parsing block and inline level HTML.")
(define-public mcron
(package
(name "mcron")
(version "1.1.3")
(version "1.1.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/mcron/mcron-"
version ".tar.gz"))
(sha256
(base32
"00kv7fgllzjpis0g1m9csycp4f6l11774m09dqy255cvmim2g743"))))
"1521w3h33bhdlg6qc66sq4dwv3qsx8r8x6srq4ca6kaahy6dszw8"))))
(build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases