cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #170996 from marsam/update-lxd

Browse source 
lxd: 5.0.0 -> 5.1
This commit is contained in:
Mario Rodas 2022-04-30 08:33:37 -05:00 committed by GitHub
commit 9cb6d34b28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/tools/admin/lxd/default.nix
View file

@ -11,13 +11,13 @@
buildGo118Package rec { buildGo118Package rec {
pname = "lxd"; pname = "lxd";
version = "5.0.0"; version = "5.1";
goPackagePath = "github.com/lxc/lxd"; goPackagePath = "github.com/lxc/lxd";
src = fetchurl { src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz";
sha256 = "sha256-qZt+37UsgZWy3kmIhE0y1zvmQm9s/yhAglBReyOP3vk="; sha256 = "sha256-MZ9Ok1BuIUTtqigLAYX7N8Q3TPfXRopeXIwbZ4GJJQo=";
}; };
postPatch = '' postPatch = ''
@ -25,6 +25,8 @@ buildGo118Package rec {
--replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids"
''; '';
excludedPackages = [ "test" "lxd/db/generate" ];
preBuild = '' preBuild = ''
# required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939 # required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939
export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
@ -33,9 +35,6 @@ buildGo118Package rec {
''; '';
postInstall = '' postInstall = ''
# test binaries, code generation
rm $out/bin/{deps,macaroon-identity,generate}
wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath ( wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath (
[ iptables ] [ iptables ]
++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu attr ] ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute2 bash criu attr ]