BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #144940 from marsam/update-lxd

Browse source 
lxd: 4.19 -> 4.20
This commit is contained in:
Mario Rodas 2021-11-07 05:32:55 -05:00 committed by GitHub
commit 8435e4c9f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,28 +11,15 @@
buildGoPackage rec { buildGoPackage rec {
pname = "lxd"; pname = "lxd";
version = "4.19"; version = "4.20";
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 = "0mxbzg8xra0qpd3g3z1b230f0519h56x4jnn09lbbqa92p5zck3f"; sha256 = "1mcf4i4z9y4l895v50amx8nix6wnaxv9h44012vj8w6wwbr4wl1m";
}; };
patches = [
# lxd/checkfeature: check whether the kernel supports core scheduling
(fetchpatch {
url = "https://github.com/lxc/lxd/commit/ba6be1043714458b29c4b37687d4f624ee421943.patch";
sha256 = "0716129n70c6i695fyi1j8q6cls7g62vkdpcrlfrr9i324y3w1dx";
})
# feat: add support for nixOS path
(fetchpatch {
url = "https://github.com/lxc/lxd/commit/eeace06b2e3151786e94811ada8c658cce479f6d.patch";
sha256 = "sha256-knXlvcSvMPDeR0KqHFgh6YQZc+CSJ8yEqGE/vQMciEk=";
})
];
postPatch = '' postPatch = ''
substituteInPlace shared/usbid/load.go \ substituteInPlace shared/usbid/load.go \
--replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids"