nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-17 18:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #326620 from bbigras/incus

Browse Source 
incus: 6.2.0 -> 6.3.0
This commit is contained in:
Adam C. Stephens 2024-07-15 14:47:18 -04:00 committed by GitHub
commit a167a16697
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/virtualisation/incus.nix
View File

@ -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;
}

6
pkgs/by-name/in/incus/package.nix
View File

@ -1,6 +1,6 @@
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 = [ ];
}

5
pkgs/by-name/lx/lxcfs/package.nix
View File

@ -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 = ''