[Backport release-24.05] lxc/incus LTS upgrades: 6.0.1 -> 6.0.2 (#344337)

This commit is contained in:
Adam C. Stephens 2024-09-25 13:19:57 -04:00 committed by GitHub
commit 37df9bcf93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 7 deletions

View File

@ -108,6 +108,7 @@ let
environment = lib.mkMerge [ environment = lib.mkMerge [
{ {
INCUS_EDK2_PATH = ovmf;
INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config";
INCUS_OVMF_PATH = ovmf; INCUS_OVMF_PATH = ovmf;
INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids"; INCUS_USBIDS_PATH = "${pkgs.hwdata}/share/hwdata/usb.ids";

View File

@ -1,7 +1,7 @@
import ./generic.nix { import ./generic.nix {
hash = "sha256-8GgzMiXn/78HkMuJ49cQA9BEQVAzPbG7jOxTScByR6Q="; hash = "sha256-roPBHqy5toYF0X9mATl6QYb5GGlgPoGZYOC9vKpca88=";
version = "6.0.1"; version = "6.0.2";
vendorHash = "sha256-dFg3LSG/ao73ODWcPDq5s9xUjuHabCMOB2AtngNCrlA="; vendorHash = "sha256-TP1NaUpsHF54mWQDcHS4uabfRJWu3k51ANNPdA4k1Go=";
patches = [ ]; patches = [ ];
lts = true; lts = true;
updateScriptArgs = "--lts=true --regex '6.0.*'"; updateScriptArgs = "--lts=true --regex '6.0.*'";

View File

@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "lxc"; pname = "lxc";
version = "6.0.1"; version = "6.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxc"; owner = "lxc";
repo = "lxc"; repo = "lxc";
rev = "refs/tags/v${finalAttrs.version}"; rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-fJMNdMXlV1z9q1pMDh046tNmLDuK6zh6uPahTWzWMvc="; hash = "sha256-qc60oSs2KahQJpSmhrctXpV2Zumv7EvlnGFaOCSCX/E=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lxcfs"; pname = "lxcfs";
version = "6.0.1"; version = "6.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxc"; owner = "lxc";
repo = "lxcfs"; repo = "lxcfs";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-kJ9QaNI8v03E0//UyU6fsav1YGOlKGMxsbE8Pr1Dtic="; hash = "sha256-5r1X/yUXTMC/2dNhpI+BVYeClIydefg2lurCGt7iA8Y=";
}; };
patches = [ patches = [