diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2022-04-30 04:20:00 +0000 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2022-04-30 04:20:00 +0000 |
| commit | 4365e6363d8b6f24278b8300a3f2f895e0630a59 (patch) | |
| tree | c09909d262ecfd59d80eadeb40f76415fb1f278c /pkgs/tools/admin/lxd | |
| parent | fc2b144cf30611c172256efea4c1749d5004a874 (diff) | |
lxd: 5.0.0 -> 5.1
https://github.com/lxc/lxd/releases/tag/lxd-5.1
Diffstat (limited to 'pkgs/tools/admin/lxd')
| -rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 3fcb68a5b66ff..48cb73be8310e 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -11,13 +11,13 @@ buildGo118Package rec { pname = "lxd"; - version = "5.0.0"; + version = "5.1"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; - sha256 = "sha256-qZt+37UsgZWy3kmIhE0y1zvmQm9s/yhAglBReyOP3vk="; + sha256 = "sha256-MZ9Ok1BuIUTtqigLAYX7N8Q3TPfXRopeXIwbZ4GJJQo="; }; postPatch = '' @@ -25,6 +25,8 @@ buildGo118Package rec { --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" ''; + excludedPackages = [ "test" "lxd/db/generate" ]; + preBuild = '' # required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939 export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" @@ -33,9 +35,6 @@ buildGo118Package rec { ''; postInstall = '' - # test binaries, code generation - rm $out/bin/{deps,macaroon-identity,generate} - wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath ( [ iptables ] ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu attr ] |