b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #144442 from mkg20001/lxd-path

Browse source
This commit is contained in:
Maciej Krüger 2021-11-03 15:07:32 +01:00 committed by GitHub
parent b4e153c4ce 3eaa28d3c4
commit cc10e135d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/tests/lxd.nix
View file

@ -133,9 +133,5 @@ in {
)
machine.succeed("lxc delete -f test")
with subtest("Unless explicitly changed, lxd leans on iptables"):
machine.succeed("lsmod | grep ip_tables")
machine.fail("lsmod | grep nf_tables")
'';
})

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

@ -26,6 +26,11 @@ buildGoPackage rec {
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 = ''