mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 17:03:01 +00:00
lxcfs: 5.0.4 -> 6.0.0
This commit is contained in:
parent
248dc21a54
commit
811965cd34
@ -7,6 +7,7 @@
|
||||
makeWrapper,
|
||||
meson,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
pkg-config,
|
||||
python3,
|
||||
@ -15,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxcfs";
|
||||
version = "5.0.4";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxc";
|
||||
repo = "lxcfs";
|
||||
rev = "lxcfs-${version}";
|
||||
sha256 = "sha256-vusxbFV7cnQVBOOo7E+fSyaE63f5QiE2xZhYavc8jJU=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Mx2ZTul3hUEL9SloYSOh+MGoc2QmZg88MTsfIOvaIZU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -35,7 +36,6 @@ stdenv.mkDerivation rec {
|
||||
./pidfd.patch
|
||||
];
|
||||
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
help2man
|
||||
@ -60,14 +60,13 @@ stdenv.mkDerivation rec {
|
||||
patchelf --set-rpath "$(patchelf --print-rpath "$out/bin/lxcfs"):$out/lib" "$out/bin/lxcfs"
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
incus-container-old-init = nixosTests.incus.container-old-init;
|
||||
incus-container-new-init = nixosTests.incus.container-new-init;
|
||||
passthru = {
|
||||
tests = {
|
||||
incus-container-legacy-init = nixosTests.incus.container-legacy-init;
|
||||
incus-container-systemd-init = nixosTests.incus.container-systemd-init;
|
||||
};
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
@ -10587,7 +10587,6 @@ with pkgs;
|
||||
lwc = callPackage ../tools/misc/lwc { };
|
||||
|
||||
lxc = callPackage ../os-specific/linux/lxc { };
|
||||
lxcfs = callPackage ../os-specific/linux/lxcfs { };
|
||||
|
||||
lxd = callPackage ../tools/admin/lxd/wrapper.nix { };
|
||||
lxd-unwrapped = callPackage ../tools/admin/lxd {
|
||||
|
Loading…
Reference in New Issue
Block a user