dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lxd: 4.17 -> 4.18

Browse Source
This commit is contained in:
Mario Rodas 2021-09-04 18:29:55 -05:00
parent e826b693a1
commit 281b181afb
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/admin/lxd/default.nix
View File

@ -1,5 +1,5 @@
{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl { 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 , squashfsTools, iproute2, iptables, ebtables, iptables-nftables-compat, libcap
, dqlite, raft-canonical, sqlite-replication, udev , dqlite, raft-canonical, sqlite-replication, udev
, writeShellScriptBin, apparmor-profiles, apparmor-parser , writeShellScriptBin, apparmor-profiles, apparmor-parser
@ -19,13 +19,13 @@ let
in in
buildGoPackage rec { buildGoPackage rec {
pname = "lxd"; pname = "lxd";
version = "4.17"; version = "4.18";
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 = "1kzmgyg5kw3zw9qa6jabld6rmb53b6yy69h7y9znsdlf74jllljl"; sha256 = "19gkllahfd2fgz6vng5lrqx3bdrzaf9s874gzznvzvj9sgj0j3mn";
}; };
postPatch = '' postPatch = ''
@ -34,12 +34,6 @@ buildGoPackage rec {
''; '';
preBuild = '' 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 # 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)"
@ -52,7 +46,7 @@ buildGoPackage rec {
wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath ( wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath (
networkPkgs 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" '' ++ [ (writeShellScriptBin "apparmor_parser" ''
exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@"
'') ] '') ]