b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #199104 from NickCao/krun

Browse source 
krun updates
This commit is contained in:
Mario Rodas 2022-11-30 07:57:56 -05:00 committed by GitHub
parent 3f36f52efd dfc876b50d
commit 36484fe72d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/virtualization/krunvm/default.nix
View file

@ -13,18 +13,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "krunvm"; pname = "krunvm";
version = "0.2.1"; version = "0.2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-rR762L8P+7ebE0u4MVCJoXc5mmqXlDFfSas+lFBMVFQ="; hash = "sha256-IXofYsOmbrjq8Zq9+a6pvBYsvZFcKzN5IvCuHaxwazI=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
hash = "sha256-3WiXm90XiQHpCbhlkigg/ZATQeDdUKTstN7hwcsKm4o="; hash = "sha256-Y0FNi/+HuN5SqexHTKjcW6lEaeis7xZDYc2/FOAANIA=";
}; };
nativeBuildInputs = with rustPlatform; [ nativeBuildInputs = with rustPlatform; [

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

@ -15,21 +15,21 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libkrun"; pname = "libkrun";
version = "1.3.0"; version = "1.4.8";
src = if stdenv.isLinux then fetchFromGitHub { src = if stdenv.isLinux then fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-qVyEqiqaQ8wfZhL5u+Bsaa1yXlgHUitSj5bo7FJ5Y8c="; hash = "sha256-3oNsY91hgor1nZV10mcEZyEdhmHlozF8xXaCR4dvLYg=";
} else fetchurl { } else fetchurl {
url = "https://github.com/containers/libkrun/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; url = "https://github.com/containers/libkrun/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz";
hash = "sha256-RBqeGUhB6Sdt+JujyQBW/76mZwnT0LNs9AMYr8+OCVU="; hash = "sha256-eKjBUianpW4T8OeVwRSEyZFfDE10d3qogkPA4FUJ7rc=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
hash = "sha256-jxSzhj1iU8qY+sZEVCYTaUqpaA4egjJi9qxrapASQF0="; hash = "sha256-9v8UaBBpQDPZwHVurFJ1FaFMe6wywH3upKDjGcPYnuQ=";
}; };
nativeBuildInputs = with rustPlatform; [ nativeBuildInputs = with rustPlatform; [

14
pkgs/development/libraries/libkrunfw/default.nix
View file

@ -13,26 +13,28 @@
assert sevVariant -> stdenv.isx86_64; assert sevVariant -> stdenv.isx86_64;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libkrunfw"; pname = "libkrunfw";
version = "3.3.0"; version = "3.8.1";
src = if stdenv.isLinux then fetchFromGitHub { src = if stdenv.isLinux then fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-ay+E5AgJeA0i3T4JDosDawwtezDGquzAvYEWHGbPidg="; hash = "sha256-6jFIfTPjI6Eq0SFdQVxqqoBDW00AsDz/xHN+n6DezME=";
} else fetchurl { } else fetchurl {
url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz";
hash = "sha256-9Wp93PC+PEqUpWHIe6BUnfDMpFvYL8rGGjTU2nWSUVY="; hash = "sha256-i7btjGBgb93tHshIS02Rp492iB4aG0N4UuRwv6Pkukg=";
}; };
kernelSrc = fetchurl { kernelSrc = fetchurl {
url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.59.tar.xz"; url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.6.tar.xz";
hash = "sha256-5t3GQgVzQNsGs7khwrMb/tLGETWejxRMPlz5w6wzvMs="; hash = "sha256-hksFry2Gm6c9YanFlZ5FMaFBqyvXshdINnH2Jfl0f6o=";
}; };
preBuild = '' preBuild = ''
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' \ --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' \
--replace 'tar xf $(KERNEL_TARBALL)' \
'tar xf $(KERNEL_TARBALL); sed -i "s|/usr/bin/env bash|$(SHELL)|" $(KERNEL_SOURCES)/scripts/check-local-export' \
--replace 'gcc' '$(CC)' --replace 'gcc' '$(CC)'
''; '';
@ -51,6 +53,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/containers/libkrunfw"; homepage = "https://github.com/containers/libkrunfw";
license = with licenses; [ lgpl2Only lgpl21Only ]; license = with licenses; [ lgpl2Only lgpl21Only ];
maintainers = with maintainers; [ nickcao ]; maintainers = with maintainers; [ nickcao ];
platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; platforms = [ "x86_64-linux" "aarch64-darwin" ];
}; };
} }

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

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