ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 14:40:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: lxd: Remove input labels.

Browse source 
* gnu/packages/virtualization.scm (lxd)[arguments]: In 'install' phase,
refer to "bash-minimal" instead of "bash".
[inputs]: Remove labels.
This commit is contained in:
Ludovic Courtès 2022-06-19 23:06:51 +02:00
parent dbe221a89a
commit 73761d8049
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
gnu/packages/virtualization.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013-2017, 2020-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2017, 2018. 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
@ -1213,13 +1213,15 @@ (define-public lxd
(wrap-program (string-append bin-dir "lxd")
`("PATH" ":" prefix
,(fold (lambda (input paths)
;; TODO: Use 'search-input-directory' rather
;; than look up inputs by name.
(let* ((in (assoc-ref inputs input))
(bin (string-append in "/bin"))
(sbin (string-append in "/sbin")))
(append (filter file-exists?
(list bin sbin)) paths)))
'()
'("bash" "acl" "rsync" "tar" "xz" "btrfs-progs"
'("bash-minimal" "acl" "rsync" "tar" "xz" "btrfs-progs"
"gzip" "dnsmasq" "squashfs-tools" "iproute2"
"criu" "iptables" "attr"))))
;; Remove unwanted binaries.
@ -1240,25 +1242,25 @@ (define-public lxd
;; ("go-golang-org-x-lint" ,go-golang-org-x-lint)
pkg-config))
(inputs
`(("acl" ,acl)
("eudev" ,eudev)
("libdqlite" ,libdqlite)
("libraft" ,libraft)
("libcap" ,libcap)
("lxc" ,lxc)
;; Run-time dependencies.
("attr" ,attr)
("bash" ,bash-minimal)
("rsync" ,rsync)
("tar" ,tar)
("xz" ,xz)
("btrfs-progs" ,btrfs-progs)
("gzip" ,gzip)
("dnsmasq" ,dnsmasq)
("squashfs-tools" ,squashfs-tools)
("iproute2" ,iproute)
("criu" ,criu)
("iptables" ,iptables)))
(list acl
eudev
libdqlite
libraft
libcap
lxc
;; Run-time dependencies.
attr
bash-minimal
rsync
tar
xz
btrfs-progs
gzip
dnsmasq
squashfs-tools
iproute
criu
iptables))
(synopsis "Daemon based on liblxc offering a REST API to manage containers")
(home-page "https://linuxcontainers.org/lxd/")
(description "LXD is a next generation system container manager. It