colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #300151 from adamcstephens/lxcfs/6

Browse Source 
lxcfs: 5.0.4 -> 6.0.0
This commit is contained in:
Adam C. Stephens 2024-03-31 23:26:37 -04:00 committed by GitHub
commit 559cda20de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/os-specific/linux/lxcfs/no-spec.patch → pkgs/by-name/lx/lxcfs/no-spec.patch
View File

18
pkgs/os-specific/linux/lxcfs/default.nix → pkgs/by-name/lx/lxcfs/package.nix
View File

@ -7,6 +7,7 @@
makeWrapper, makeWrapper,
meson, meson,
ninja, ninja,
nix-update-script,
nixosTests, nixosTests,
pkg-config, pkg-config,
python3, python3,
@ -15,13 +16,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lxcfs"; pname = "lxcfs";
version = "5.0.4"; version = "6.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxc"; owner = "lxc";
repo = "lxcfs"; repo = "lxcfs";
rev = "lxcfs-${version}"; rev = "v${version}";
sha256 = "sha256-vusxbFV7cnQVBOOo7E+fSyaE63f5QiE2xZhYavc8jJU="; sha256 = "sha256-Mx2ZTul3hUEL9SloYSOh+MGoc2QmZg88MTsfIOvaIZU=";
}; };
patches = [ patches = [
@ -35,7 +36,6 @@ stdenv.mkDerivation rec {
./pidfd.patch ./pidfd.patch
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
help2man help2man
@ -60,9 +60,13 @@ stdenv.mkDerivation rec {
patchelf --set-rpath "$(patchelf --print-rpath "$out/bin/lxcfs"):$out/lib" "$out/bin/lxcfs" patchelf --set-rpath "$(patchelf --print-rpath "$out/bin/lxcfs"):$out/lib" "$out/bin/lxcfs"
''; '';
passthru.tests = { passthru = {
incus-container-old-init = nixosTests.incus.container-old-init; tests = {
incus-container-new-init = nixosTests.incus.container-new-init; incus-container-legacy-init = nixosTests.incus.container-legacy-init;
incus-container-systemd-init = nixosTests.incus.container-systemd-init;
};
updateScript = nix-update-script { };
}; };
meta = { meta = {

0
pkgs/os-specific/linux/lxcfs/pidfd.patch → pkgs/by-name/lx/lxcfs/pidfd.patch
View File

0
pkgs/os-specific/linux/lxcfs/skip-init.patch → pkgs/by-name/lx/lxcfs/skip-init.patch
View File

4
pkgs/os-specific/linux/lxc/default.nix
View File

@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
tests = { tests = {
incus-old-init = nixosTests.incus.container-old-init; incus-legacy-init = nixosTests.incus.container-legacy-init;
incus-new-init = nixosTests.incus.container-new-init; incus-systemd-init = nixosTests.incus.container-systemd-init;
}; };
updateScript = nix-update-script { updateScript = nix-update-script {
extraArgs = [ extraArgs = [

4
pkgs/tools/virtualization/distrobuilder/default.nix
View File

@ -52,8 +52,8 @@ buildGoModule rec {
passthru = { passthru = {
tests = { tests = {
incus-old-init = nixosTests.incus.container-old-init; incus-legacy-init = nixosTests.incus.container-legacy-init;
incus-new-init = nixosTests.incus.container-new-init; incus-systemd-init = nixosTests.incus.container-systemd-init;
}; };
generator = callPackage ./generator.nix { inherit src version; }; generator = callPackage ./generator.nix { inherit src version; };

1
pkgs/top-level/all-packages.nix
View File

@ -10579,7 +10579,6 @@ with pkgs;
lwc = callPackage ../tools/misc/lwc { }; lwc = callPackage ../tools/misc/lwc { };
lxc = callPackage ../os-specific/linux/lxc { }; lxc = callPackage ../os-specific/linux/lxc { };
lxcfs = callPackage ../os-specific/linux/lxcfs { };
lxd = callPackage ../tools/admin/lxd/wrapper.nix { }; lxd = callPackage ../tools/admin/lxd/wrapper.nix { };
lxd-unwrapped = callPackage ../tools/admin/lxd { lxd-unwrapped = callPackage ../tools/admin/lxd {