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

Merge pull request #326620 from bbigras/incus 

incus: 6.2.0 -> 6.3.0
parents 1ae6b1bb 856651fd

nixos/modules/virtualisation/incus.nix

+3 −1
Original line number Diff line number Diff line
@@ -44,12 +44,14 @@ let 
        qemu-utils

        qemu_kvm

        rsync

        skopeo

        squashfs-tools-ng

        squashfsTools

        sshfs

        swtpm

        systemd

        thin-provisioning-tools

        umoci

        util-linux

        virtiofsd

        xdelta
@@ -109,7 +111,7 @@ let 
  environment = lib.mkMerge [

    {

      INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config";

      INCUS_OVMF_PATH = ovmf;

      INCUS_EDK2_PATH = ovmf;

      INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids";

      PATH = lib.mkForce serverBinPath;

    }

pkgs/by-name/in/incus/package.nix

+3 −3
Original line number Diff line number Diff line 
import ./generic.nix {

  hash = "sha256-33qUmET1BYAv6e8ZaFNSa7jrn8WGf3BqY8Nud/ZywSY=";

  version = "6.2.0";

  vendorHash = "sha256-dFg3LSG/ao73ODWcPDq5s9xUjuHabCMOB2AtngNCrlA=";

  hash = "sha256-qRx2l677OAo8or/form1fTgL3vjM/kz3RA/8umkAP80=";

  version = "6.3.0";

  vendorHash = "sha256-VlJyq+PzToBicKCF3EMqzDsnIWuPhbk4JS4ASyhfiss=";

  patches = [ ];

}

pkgs/by-name/lx/lxcfs/package.nix

+3 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
  pkg-config,

  python3,

  util-linux,

  coreutils,

}:



stdenv.mkDerivation rec {
@@ -51,8 +52,8 @@ stdenv.mkDerivation rec { 
  '';



  postInstall = ''

    # `mount` hook requires access to the `mount` command from `util-linux`:

    wrapProgram "$out/share/lxcfs/lxc.mount.hook" --prefix PATH : "${util-linux}/bin"

    # `mount` hook requires access to the `mount` command from `util-linux` and `readlink` from `coreutils`:

    wrapProgram "$out/share/lxcfs/lxc.mount.hook" --prefix PATH : ${lib.makeBinPath [ coreutils util-linux ]}

  '';



  postFixup = ''