cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

libkrun: 1.5.1 -> 1.7.2

Browse source 
drops darwin support due to upstream no longer providing prebuilt images

Diff: https://github.com/containers/libkrun/compare/v1.5.1...v1.7.2
This commit is contained in:
Nick Cao 2023-12-25 11:10:46 -05:00
parent 80d9a1eae5
commit 0bafb36f0e
No known key found for this signature in database
2 changed files with 19 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
pkgs/development/libraries/libkrun/default.nix
View file

@ -1,62 +1,53 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchurl
, rustPlatform , rustPlatform
, cargo , cargo
, pkg-config , pkg-config
, dtc
, glibc , glibc
, openssl , openssl
, libiconv
, libkrunfw , libkrunfw
, rustc , rustc
, Hypervisor
, sevVariant ? false , sevVariant ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libkrun"; pname = "libkrun";
version = "1.5.1"; version = "1.7.2";
src = if stdenv.isLinux then fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = pname; repo = "libkrun";
rev = "v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-N9AkG+zkjQHNaaCVrEpMfWUN9bQNHjMA2xi5NUulF5A="; hash = "sha256-cP+Pxl/9QIsoGysXTBZJ86q57cIMA7TJenMWtcOI+Y4=";
} else fetchurl {
url = "https://github.com/containers/libkrun/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz";
hash = "sha256-8hPbnZtDbiVdwBrtxt4nZ/QA2OFtui2VsQlaoOmWybo=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit pname version src;
hash = "sha256-nbtp7FP+ObVGfDOEzTt4Z7TZwcNlREczTKIAXGSflZU="; hash = "sha256-qVyHC015QJEt6LZ8br3H0nucYKhYGBMtyB2IBaixTqk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
cargo cargo
rustc rustc
] ++ lib.optional sevVariant pkg-config; ] ++ lib.optionals sevVariant [
pkg-config
];
buildInputs = [ buildInputs = [
(libkrunfw.override { inherit sevVariant; }) (libkrunfw.override { inherit sevVariant; })
] ++ lib.optionals stdenv.isLinux [
glibc glibc
glibc.static glibc.static
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals sevVariant [
libiconv openssl
Hypervisor ];
dtc
] ++ lib.optional sevVariant openssl;
makeFlags = [ "PREFIX=${placeholder "out"}" ] makeFlags = [
++ lib.optional sevVariant "SEV=1"; "PREFIX=${placeholder "out"}"
] ++ lib.optionals sevVariant [
postFixup = lib.optionalString stdenv.isDarwin '' "SEV=1"
install_name_tool -id $out/lib/libkrun.dylib $out/lib/libkrun.${version}.dylib ];
'';
meta = with lib; { meta = with lib; {
description = "A dynamic library providing Virtualization-based process isolation capabilities"; description = "A dynamic library providing Virtualization-based process isolation capabilities";
@ -64,6 +55,5 @@ stdenv.mkDerivation rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ nickcao ]; maintainers = with maintainers; [ nickcao ];
platforms = libkrunfw.meta.platforms; platforms = libkrunfw.meta.platforms;
sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View file

@ -28061,9 +28061,7 @@ with pkgs;
libdatachannel = callPackage ../development/libraries/libdatachannel { }; libdatachannel = callPackage ../development/libraries/libdatachannel { };
libkrun = callPackage ../development/libraries/libkrun { libkrun = callPackage ../development/libraries/libkrun { };
inherit (darwin.apple_sdk.frameworks) Hypervisor;
};
libkrun-sev = libkrun.override { sevVariant = true; }; libkrun-sev = libkrun.override { sevVariant = true; };