dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #212723 from NickCao/krun

Browse Source 
libkrunfw: 3.8.1 -> 3.9.0, libkrun: 1.4.8 -> 1.5.0
This commit is contained in:
Nick Cao 2023-01-27 08:09:34 +08:00 committed by GitHub
commit b5917942aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/virtualization/krunvm/default.nix
View File

@ -67,5 +67,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/containers/krunvm"; homepage = "https://github.com/containers/krunvm";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ nickcao ]; maintainers = with maintainers; [ nickcao ];
platforms = libkrun.meta.platforms;
}; };
} }

10
pkgs/development/libraries/libkrun/default.nix
View File

@ -15,21 +15,21 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libkrun"; pname = "libkrun";
version = "1.4.8"; version = "1.5.0";
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-3oNsY91hgor1nZV10mcEZyEdhmHlozF8xXaCR4dvLYg="; hash = "sha256-3WYxGpZ3uRbnh/VEDVSNOxp25SE7GQgC5t3ROuKNRE0=";
} 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-eKjBUianpW4T8OeVwRSEyZFfDE10d3qogkPA4FUJ7rc="; hash = "sha256-T1nYzrzxEJaVBnI00CQPKoT2OYJxdW7y6WNkabNsQYI=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
hash = "sha256-9v8UaBBpQDPZwHVurFJ1FaFMe6wywH3upKDjGcPYnuQ="; hash = "sha256-Clb6PNwLuzx42Qr1tgpjG1WHq9NcDr2bbfnyp4UVVLU=";
}; };
nativeBuildInputs = with rustPlatform; [ nativeBuildInputs = with rustPlatform; [
@ -61,5 +61,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/containers/libkrun"; homepage = "https://github.com/containers/libkrun";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ nickcao ]; maintainers = with maintainers; [ nickcao ];
platforms = libkrunfw.meta.platforms;
sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ];
}; };
} }

11
pkgs/development/libraries/libkrunfw/default.nix
View File

@ -13,21 +13,21 @@
assert sevVariant -> stdenv.isx86_64; assert sevVariant -> stdenv.isx86_64;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libkrunfw"; pname = "libkrunfw";
version = "3.8.1"; version = "3.9.0";
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-6jFIfTPjI6Eq0SFdQVxqqoBDW00AsDz/xHN+n6DezME="; hash = "sha256-hpVE7g6V3nquZ3R5fQCcfRWuFDHJ3rgisezwdsDMaGg=";
} 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-i7btjGBgb93tHshIS02Rp492iB4aG0N4UuRwv6Pkukg="; hash = "sha256-moZ2LYLhZDb8Y8jgWbdgK6SbJ8lY8f356d5vKHc/54Q=";
}; };
kernelSrc = fetchurl { kernelSrc = fetchurl {
url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.6.tar.xz"; url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.6.tar.xz";
hash = "sha256-hksFry2Gm6c9YanFlZ5FMaFBqyvXshdINnH2Jfl0f6o="; hash = "sha256-Pk2OVh2lcDogWujXsr7WxcZPxCme68v9IEgeY7V9XuM=";
}; };
preBuild = '' preBuild = ''
@ -54,5 +54,6 @@ stdenv.mkDerivation rec {
license = with licenses; [ lgpl2Only lgpl21Only ]; license = with licenses; [ lgpl2Only lgpl21Only ];
maintainers = with maintainers; [ nickcao ]; maintainers = with maintainers; [ nickcao ];
platforms = [ "x86_64-linux" "aarch64-darwin" ]; platforms = [ "x86_64-linux" "aarch64-darwin" ];
sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ];
}; };
} }