Skip to content

Commit c55bcd5

Browse files
incus-lts,lxc,lxcfs: 6.0.3 -> 6.0.4 (#396030)
2 parents d5a22d6 + fce5edc commit c55bcd5

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import ./generic.nix {
2-
hash = "sha256-+W4imWem5iQ6nPVcoObc4COFxQVED0ppVd/YC+Nqtgw=";
3-
version = "6.0.3";
4-
vendorHash = "sha256-ZUtWzbAjHij95khYx8lWYEpA8ITlMtKpObG5Vl7aE90=";
2+
hash = "sha256-zwefzCmj4K1GJRbherOS28swLoGbHnUxbF9bmLOh738=";
3+
version = "6.0.4";
4+
vendorHash = "sha256-4of741V2ztxkyI2r5UVEL5ON/9kaDTygosLxyTw6ShQ=";
55
patches = [
66
# qemu 9.1 compat, remove when added to LTS
77
./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222

2323
stdenv.mkDerivation (finalAttrs: {
2424
pname = "lxc";
25-
version = "6.0.3";
25+
version = "6.0.4";
2626

2727
src = fetchFromGitHub {
2828
owner = "lxc";
2929
repo = "lxc";
3030
tag = "v${finalAttrs.version}";
31-
hash = "sha256-h41lcHGjJmIH28XRpM0gdFsOQOCLSWevSLfvQ7gIf7Q=";
31+
hash = "sha256-zmL568PprrpIWTVCkScXHEzTZ+NduSH4r8ETnz4NY64=";
3232
};
3333

3434
nativeBuildInputs = [

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
stdenv.mkDerivation rec {
1919
pname = "lxcfs";
20-
version = "6.0.3";
20+
version = "6.0.4";
2121

2222
src = fetchFromGitHub {
2323
owner = "lxc";
2424
repo = "lxcfs";
25-
rev = "v${version}";
26-
hash = "sha256-+Xlx1E6ggB/Vx3yOJGgh4UfEvaVyT7uOttaxelDA7Iw=";
25+
tag = "v${version}";
26+
hash = "sha256-jmadClC/3nHfNL+F/gC5NM6u03OE9flEVtPU28nylw4=";
2727
};
2828

2929
patches = [
@@ -59,6 +59,13 @@ stdenv.mkDerivation rec {
5959
util-linux
6060
]
6161
}
62+
63+
# requires access to sleep
64+
wrapProgram "$out/share/lxcfs/lxc.reboot.hook" --prefix PATH : ${
65+
lib.makeBinPath [
66+
coreutils
67+
]
68+
}
6269
'';
6370

6471
postFixup = ''

0 commit comments

Comments
 (0)