diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-09-04 18:29:55 -0500 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2021-09-04 18:29:55 -0500 |
| commit | 281b181afb579cd99def2396c0c6314757de24a5 (patch) | |
| tree | 5fd3219c2470ae5ddaf1b29cae85c644a4ff046c /pkgs/tools/admin/lxd | |
| parent | e826b693a19cf039dc7b8e0bb2349c5f8a40a8e1 (diff) | |
lxd: 4.17 -> 4.18
Diffstat (limited to 'pkgs/tools/admin/lxd')
| -rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 722e3b947738d..523f8165802e3 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,5 +1,5 @@ { lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl -, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq +, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, attr , squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap , dqlite, raft-canonical, sqlite-replication, udev , writeShellScriptBin, apparmor-profiles, apparmor-parser @@ -19,13 +19,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.17"; + version = "4.18"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; - sha256 = "1kzmgyg5kw3zw9qa6jabld6rmb53b6yy69h7y9znsdlf74jllljl"; + sha256 = "19gkllahfd2fgz6vng5lrqx3bdrzaf9s874gzznvzvj9sgj0j3mn"; }; postPatch = '' @@ -34,12 +34,6 @@ buildGoPackage rec { ''; preBuild = '' - # unpack vendor - pushd go/src/github.com/lxc/lxd - rm _dist/src/github.com/lxc/lxd - cp -r _dist/src/* ../../.. - popd - # required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939 export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" @@ -52,7 +46,7 @@ buildGoPackage rec { wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath ( networkPkgs - ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu ] + ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu attr ] ++ [ (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" '') ] |