Merge branch 'master' into core-updates

Conflicts:
	gnu/local.mk
	gnu/packages/algebra.scm
	gnu/packages/bioinformatics.scm
	gnu/packages/curl.scm
	gnu/packages/docbook.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/maths.scm
	gnu/packages/plotutils.scm
	gnu/packages/python-web.scm
	gnu/packages/python-xyz.scm
	gnu/packages/radio.scm
	gnu/packages/readline.scm
	gnu/packages/tls.scm
	gnu/packages/xml.scm
	gnu/packages/xorg.scm
This commit is contained in:
Marius Bakke 2021-06-06 21:16:32 +02:00
commit 8d59c262ad
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
176 changed files with 16041 additions and 6439 deletions

View file

@ -19,6 +19,7 @@
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2021 Dion Mendel <guix@dm9.info>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1028,6 +1029,35 @@ Through a powerful API and simple tools, it lets Linux users easily create and
manage system or application containers.")
(license license:lgpl2.1+)))
(define-public lxcfs
(package
(name "lxcfs")
(version "4.0.8")
(home-page "https://github.com/lxc/lxcfs")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page)
(commit (string-append "lxcfs-" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1f74wy88si2ia035pcvciq5821kc8jcb75w1f8vhbp0cd29rqdpi"))))
(arguments
'(#:configure-flags '("--localstatedir=/var")))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(inputs
`(("fuse" ,fuse)))
(build-system gnu-build-system)
(synopsis "FUSE based filesystem for LXC")
(description "LXCFS is a small FUSE filesystem written with the intention
of making Linux containers feel more like a virtual machine.
It started as a side-project of LXC but is useable by any runtime.")
(license license:lgpl2.1+)))
(define-public libvirt
(package
(name "libvirt")