Unverified Commit 559cda20 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #300151 from adamcstephens/lxcfs/6 

lxcfs: 5.0.4 -> 6.0.0
parents 292a4d8f 811965cd

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

+11 −7
Original line number Diff line number Diff line
@@ -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,9 +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 = {

pkgs/os-specific/linux/lxc/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ stdenv.mkDerivation rec { 


  passthru = {

    tests = {

      incus-old-init = nixosTests.incus.container-old-init;

      incus-new-init = nixosTests.incus.container-new-init;

      incus-legacy-init = nixosTests.incus.container-legacy-init;

      incus-systemd-init = nixosTests.incus.container-systemd-init;

    };

    updateScript = nix-update-script {

      extraArgs = [