Unverified Commit 318977b8 authored by Tristan Ross's avatar Tristan Ross Committed by GitHub
Browse files

libkrunfw: 5.1.0 -> 5.3.0, libkrun: 1.17.0 -> 1.17.4 (#505042)

parents 1987e895 f7402854
Loading
Loading
Loading
Loading
+7 −5
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@
  pkg-config,
  glibc,
  openssl,
  libcap_ng,
  libepoxy,
  libdrm,
  pipewire,
@@ -33,13 +34,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
  pname = "libkrun" + lib.optionalString (variant != null) "-${variant}";
  version = "1.17.0";
  version = "1.17.4";

  src = fetchFromGitHub {
    owner = "containers";
    repo = "libkrun";
    tag = "v${finalAttrs.version}";
    hash = "sha256-6HBSL5Zu29sDoEbZeQ6AsNIXUcqXVVGMk0AR2X6v1yU=";
    hash = "sha256-Th4vCg3xHb6lbo26IDZES7tLOUAJTebQK2+h3xSYX7U=";
  };

  outputs = [
@@ -49,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) src;
    hash = "sha256-UIzbtBJH6aivoIxko1Wxdod/jUN44pERX9Hd+v7TC3Q=";
    hash = "sha256-0xpAyNe1jF1OMtc7FXMsejqIv0xKc1ktEvm3rj/mVFU=";
  };

  # Make sure libkrunfw can be found by dlopen()
@@ -65,11 +66,12 @@ stdenv.mkDerivation (finalAttrs: {
    rustPlatform.cargoSetupHook
    rustPlatform.bindgenHook
    cargo
    pkg-config
    rustc
  ]
  ++ lib.optional (variant == "sev" || variant == "tdx" || withGpu) pkg-config;
  ];

  buildInputs = [
    libcap_ng
    libkrunfw'
    glibc
    glibc.static
+4 −4
Original line number Diff line number Diff line
@@ -21,18 +21,18 @@ assert lib.elem variant [

stdenv.mkDerivation (finalAttrs: {
  pname = "libkrunfw" + lib.optionalString (variant != null) "-${variant}";
  version = "5.1.0";
  version = "5.3.0";

  src = fetchFromGitHub {
    owner = "containers";
    repo = "libkrunfw";
    tag = "v${finalAttrs.version}";
    hash = "sha256-x9HQP+EqCteoCq2Sl/TQcfdzQC5iuE4gaSKe7tN5dAA=";
    hash = "sha256-fhG/bP1HzmhyU2N+wnr1074WEGsD9RdTUUBhYUFpWlA=";
  };

  kernelSrc = fetchurl {
    url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.62.tar.xz";
    hash = "sha256-E+LGhayPq13Zkt0QVzJVTa5RSu81DCqMdBjnt062LBM=";
    url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.76.tar.xz";
    hash = "sha256-u7Q+g0xG5r1JpcKPIuZ5qTdENATh9lMgTUskkp862JY=";
  };

  postPatch = ''