libkrunfw: 4.9.0 -> 4.10.0

Diff: https://github.com/containers/libkrunfw/compare/v4.9.0...v4.10.0

Nick Cao 766cbeb0 de2fd966

+21 -12
+1 -1
pkgs/by-name/li/libkrun/package.nix
··· 60 60 ++ lib.optional (sevVariant || withGpu) pkg-config; 61 61 62 62 buildInputs = [ 63 - (libkrunfw.override { inherit sevVariant; }) 63 + (libkrunfw.override { variant = if sevVariant then "sev" else null; }) 64 64 glibc 65 65 glibc.static 66 66 ]
+20 -11
pkgs/by-name/li/libkrunfw/package.nix
··· 10 10 perl, 11 11 elfutils, 12 12 python3, 13 - sevVariant ? false, 13 + variant ? null, 14 14 }: 15 + 16 + assert lib.elem variant [ 17 + null 18 + "sev" 19 + "tdx" 20 + ]; 15 21 16 22 stdenv.mkDerivation (finalAttrs: { 17 - pname = "libkrunfw"; 18 - version = "4.9.0"; 23 + pname = "libkrunfw" + lib.optionalString (variant != null) "-${variant}"; 24 + version = "4.10.0"; 19 25 20 26 src = fetchFromGitHub { 21 27 owner = "containers"; 22 28 repo = "libkrunfw"; 23 29 tag = "v${finalAttrs.version}"; 24 - hash = "sha256-wmvjex68Mh7qehA33WNBYHhV9Q/XWLixokuGWnqJ3n0="; 30 + hash = "sha256-mq2gw0+xL6qUZE/fk0vLT3PEpzPV8p+iwRFJHXVOMnk="; 25 31 }; 26 32 27 33 kernelSrc = fetchurl { 28 - url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.20.tar.xz"; 29 - hash = "sha256-Iw6JsHsKuC508H7MG+4xBdyoHQ70qX+QCSnEBySbasc="; 34 + url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.34.tar.xz"; 35 + hash = "sha256-p/P+OB9n7KQXLptj77YaFL1/nhJ44DYD0P9ak/Jwwk0="; 30 36 }; 31 37 32 38 postPatch = '' ··· 51 57 makeFlags = [ 52 58 "PREFIX=${placeholder "out"}" 53 59 ] 54 - ++ lib.optionals sevVariant [ 60 + ++ lib.optionals (variant == "sev") [ 55 61 "SEV=1" 62 + ] 63 + ++ lib.optionals (variant == "tdx") [ 64 + "TDX=1" 56 65 ]; 57 66 58 67 # Fixes https://github.com/containers/libkrunfw/issues/55 ··· 60 69 61 70 enableParallelBuilding = true; 62 71 63 - meta = with lib; { 72 + meta = { 64 73 description = "Dynamic library bundling the guest payload consumed by libkrun"; 65 74 homepage = "https://github.com/containers/libkrunfw"; 66 - license = with licenses; [ 75 + license = with lib.licenses; [ 67 76 lgpl2Only 68 77 lgpl21Only 69 78 ]; 70 - maintainers = with maintainers; [ 79 + maintainers = with lib.maintainers; [ 71 80 nickcao 72 81 RossComputerGuy 73 82 nrabulinski 74 83 ]; 75 - platforms = [ "x86_64-linux" ] ++ lib.optionals (!sevVariant) [ "aarch64-linux" ]; 84 + platforms = [ "x86_64-linux" ] ++ lib.optionals (variant == null) [ "aarch64-linux" ]; 76 85 }; 77 86 })