incus-lts,lxc,lxcfs: 6.0.4 -> 6.0.5 (#434066)
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import ./generic.nix {
|
||||
hash = "sha256-zwefzCmj4K1GJRbherOS28swLoGbHnUxbF9bmLOh738=";
|
||||
version = "6.0.4";
|
||||
vendorHash = "sha256-4of741V2ztxkyI2r5UVEL5ON/9kaDTygosLxyTw6ShQ=";
|
||||
hash = "sha256-B29HLuw48j7/Er7p/sHen7ohbbACsAjzPr9Nn8eZNR0=";
|
||||
version = "6.0.5";
|
||||
vendorHash = "sha256-KOJqPvp+w7G505ZMJ1weRD2SATmfq1aeyCqmbJ6WMAY=";
|
||||
patches = [
|
||||
# qemu 9.1 compat, remove when added to LTS
|
||||
./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch
|
||||
|
||||
@@ -17,19 +17,18 @@
|
||||
pkg-config,
|
||||
systemd,
|
||||
|
||||
fetchpatch,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lxc";
|
||||
version = "6.0.4";
|
||||
version = "6.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxc";
|
||||
repo = "lxc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zmL568PprrpIWTVCkScXHEzTZ+NduSH4r8ETnz4NY64=";
|
||||
hash = "sha256-bnvKSs7w1cq3vP2BzX4kfDrGUIFhU4Fnu5pM81jPVQ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -58,13 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Fix hardcoded path of lxc-user-nic
|
||||
# This is needed to use unprivileged containers
|
||||
./user-nic.diff
|
||||
|
||||
# Fixes https://github.com/zabbly/incus/issues/81
|
||||
(fetchpatch {
|
||||
name = "4536.patch";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/lxc/lxc/pull/4536.patch";
|
||||
hash = "sha256-yEqK9deO2MhfPROPfBw44Z752Mc5bR8DBKl1KrGC+5c=";
|
||||
})
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lxcfs";
|
||||
version = "6.0.4";
|
||||
version = "6.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxc";
|
||||
repo = "lxcfs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jmadClC/3nHfNL+F/gC5NM6u03OE9flEVtPU28nylw4=";
|
||||
hash = "sha256-mRTM06QyWcB4XOi0w2qvyDABGuu1SPJX0gjlBktDOac=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
Reference in New Issue
Block a user