From 44bf326ecd7339ef5262c6c0ef83255f05baab8f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 21 Jan 2023 14:13:33 +0800 Subject: [PATCH 1/3] libkrunfw: 3.8.1 -> 3.9.0 Diff: https://github.com/containers/libkrunfw/compare/v3.8.1...v3.9.0 --- pkgs/development/libraries/libkrunfw/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index f602299e239d..13090776405a 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -13,21 +13,21 @@ assert sevVariant -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "libkrunfw"; - version = "3.8.1"; + version = "3.9.0"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-6jFIfTPjI6Eq0SFdQVxqqoBDW00AsDz/xHN+n6DezME="; + hash = "sha256-hpVE7g6V3nquZ3R5fQCcfRWuFDHJ3rgisezwdsDMaGg="; } else fetchurl { 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 { - url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.6.tar.xz"; - hash = "sha256-hksFry2Gm6c9YanFlZ5FMaFBqyvXshdINnH2Jfl0f6o="; + url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.6.tar.xz"; + hash = "sha256-Pk2OVh2lcDogWujXsr7WxcZPxCme68v9IEgeY7V9XuM="; }; preBuild = '' @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl2Only lgpl21Only ]; maintainers = with maintainers; [ nickcao ]; platforms = [ "x86_64-linux" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ]; }; } From 3ca61b8b714b9532c5af0a8e167aad3a4773b6e1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 21 Jan 2023 14:18:26 +0800 Subject: [PATCH 2/3] libkrun: 1.4.8 -> 1.5.0 Diff: https://github.com/containers/libkrun/compare/v1.4.8...v1.5.0 --- pkgs/development/libraries/libkrun/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index 2f1b66116c7d..c931489057e7 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -15,21 +15,21 @@ stdenv.mkDerivation rec { pname = "libkrun"; - version = "1.4.8"; + version = "1.5.0"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-3oNsY91hgor1nZV10mcEZyEdhmHlozF8xXaCR4dvLYg="; + hash = "sha256-3WYxGpZ3uRbnh/VEDVSNOxp25SE7GQgC5t3ROuKNRE0="; } else fetchurl { 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 { inherit src; - hash = "sha256-9v8UaBBpQDPZwHVurFJ1FaFMe6wywH3upKDjGcPYnuQ="; + hash = "sha256-Clb6PNwLuzx42Qr1tgpjG1WHq9NcDr2bbfnyp4UVVLU="; }; nativeBuildInputs = with rustPlatform; [ @@ -61,5 +61,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/libkrun"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; + platforms = libkrunfw.meta.platforms; + sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ]; }; } From cbbfbcd0951b19ed8f7ffb02166aa832c901f263 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 26 Jan 2023 15:03:36 +0800 Subject: [PATCH 3/3] krunvm: set meta.platforms --- pkgs/applications/virtualization/krunvm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix index d96277604b5f..bbf20c6039f5 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/krunvm"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; + platforms = libkrun.meta.platforms; }; }