From 08039e6bc346088251130061e77146cacd0ca7a3 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 2 Nov 2022 11:31:28 +0800 Subject: [PATCH 1/7] libkrunfw: 3.3.0 -> 3.8.0 --- pkgs/development/libraries/libkrunfw/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index 8769cf6913b..155632e53ee 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -13,26 +13,28 @@ assert sevVariant -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "libkrunfw"; - version = "3.3.0"; + version = "3.8.0"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-ay+E5AgJeA0i3T4JDosDawwtezDGquzAvYEWHGbPidg="; + hash = "sha256-hT6uAQgeLaBptsyS1Vgigbx4GecHh5bRSTUCcfAY0u0="; } else fetchurl { url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-9Wp93PC+PEqUpWHIe6BUnfDMpFvYL8rGGjTU2nWSUVY="; + hash = "sha256-xyKS4oJXpAcdu9IO26rtAkOBoiG6ZlFU4yJRgf9z3Yg="; }; kernelSrc = fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.59.tar.xz"; - hash = "sha256-5t3GQgVzQNsGs7khwrMb/tLGETWejxRMPlz5w6wzvMs="; + url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.2.tar.xz"; + hash = "sha256-oTwmOIyszLaEzZ9REJWWooDIGGt+lRdNMe58VxjpXJ0="; }; preBuild = '' substituteInPlace Makefile \ --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)' ''; From 229040285cd30c5a09e082f6a9a6257b42ba9961 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 2 Nov 2022 11:08:10 +0800 Subject: [PATCH 2/7] libkrun: 1.3.0 -> 1.4.6 --- pkgs/development/libraries/libkrun/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index 779f6790c55..ec707e2cdd9 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.3.0"; + version = "1.4.6"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-qVyEqiqaQ8wfZhL5u+Bsaa1yXlgHUitSj5bo7FJ5Y8c="; + hash = "sha256-hy0qd5JMqaHUxM7rH7HOkIccMbWLnmwh3226yR1HWOM="; } else fetchurl { 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-Fvl3HnBEfN4umBBn0Jgyuky98eJURG0bUClfqcPCNVk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-jxSzhj1iU8qY+sZEVCYTaUqpaA4egjJi9qxrapASQF0="; + hash = "sha256-mnWySP4X1AWsCuobC3uGV81Xp1RckTzQf6EGXD4E608="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bae0a7823c..2b44e649c77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25210,7 +25210,7 @@ with pkgs; 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 { }; From fa61256115a584aa1460d67807045c01452527b2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 2 Nov 2022 13:02:20 +0800 Subject: [PATCH 3/7] krunvm: 0.2.1 -> 0.2.2 --- pkgs/applications/virtualization/krunvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix index 8ee3d478497..7dcd8a08389 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation rec { pname = "krunvm"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rR762L8P+7ebE0u4MVCJoXc5mmqXlDFfSas+lFBMVFQ="; + hash = "sha256-OBrsXGMI+L47iqAT9v6A8S8LTnRiGHixmBTL8sRZoFc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-3WiXm90XiQHpCbhlkigg/ZATQeDdUKTstN7hwcsKm4o="; + hash = "sha256-ZM5MyTuGJ0En4a6Z6EeBkqdzRmT1NVELh7qkApQReS0="; }; nativeBuildInputs = with rustPlatform; [ From cee9caa1ccdbfb774dc9cd5a631d7c48f826e457 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 2 Nov 2022 18:53:19 +0800 Subject: [PATCH 4/7] libkrunfw: remove aarch64-linux from platforms --- pkgs/development/libraries/libkrunfw/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index 155632e53ee..83041a4b1cc 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/libkrunfw"; license = with licenses; [ lgpl2Only lgpl21Only ]; maintainers = with maintainers; [ nickcao ]; - platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-darwin" ]; }; } From 8f43b9c3eb53170ad9f803692e97d15a80479f09 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 30 Nov 2022 20:17:47 +0800 Subject: [PATCH 5/7] libkrunfw: 3.8.0 -> 3.8.1 --- pkgs/development/libraries/libkrunfw/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index 83041a4b1cc..f602299e239 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.0"; + version = "3.8.1"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-hT6uAQgeLaBptsyS1Vgigbx4GecHh5bRSTUCcfAY0u0="; + hash = "sha256-6jFIfTPjI6Eq0SFdQVxqqoBDW00AsDz/xHN+n6DezME="; } else fetchurl { url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-xyKS4oJXpAcdu9IO26rtAkOBoiG6ZlFU4yJRgf9z3Yg="; + hash = "sha256-i7btjGBgb93tHshIS02Rp492iB4aG0N4UuRwv6Pkukg="; }; kernelSrc = fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.2.tar.xz"; - hash = "sha256-oTwmOIyszLaEzZ9REJWWooDIGGt+lRdNMe58VxjpXJ0="; + url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.6.tar.xz"; + hash = "sha256-hksFry2Gm6c9YanFlZ5FMaFBqyvXshdINnH2Jfl0f6o="; }; preBuild = '' From 31065b01c6b3c23ad69de4d3b8af3694a57f9580 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 30 Nov 2022 20:23:35 +0800 Subject: [PATCH 6/7] libkrun: 1.4.6 -> 1.4.8 --- pkgs/development/libraries/libkrun/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index ec707e2cdd9..2f1b66116c7 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.6"; + version = "1.4.8"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-hy0qd5JMqaHUxM7rH7HOkIccMbWLnmwh3226yR1HWOM="; + hash = "sha256-3oNsY91hgor1nZV10mcEZyEdhmHlozF8xXaCR4dvLYg="; } else fetchurl { url = "https://github.com/containers/libkrun/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-Fvl3HnBEfN4umBBn0Jgyuky98eJURG0bUClfqcPCNVk="; + hash = "sha256-eKjBUianpW4T8OeVwRSEyZFfDE10d3qogkPA4FUJ7rc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-mnWySP4X1AWsCuobC3uGV81Xp1RckTzQf6EGXD4E608="; + hash = "sha256-9v8UaBBpQDPZwHVurFJ1FaFMe6wywH3upKDjGcPYnuQ="; }; nativeBuildInputs = with rustPlatform; [ From dfc876b50d95b05579a125fe3a272f5911976ece Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 30 Nov 2022 20:28:02 +0800 Subject: [PATCH 7/7] krunvm: 0.2.2 -> 0.2.3 --- pkgs/applications/virtualization/krunvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix index 7dcd8a08389..d96277604b5 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation rec { pname = "krunvm"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-OBrsXGMI+L47iqAT9v6A8S8LTnRiGHixmBTL8sRZoFc="; + hash = "sha256-IXofYsOmbrjq8Zq9+a6pvBYsvZFcKzN5IvCuHaxwazI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-ZM5MyTuGJ0En4a6Z6EeBkqdzRmT1NVELh7qkApQReS0="; + hash = "sha256-Y0FNi/+HuN5SqexHTKjcW6lEaeis7xZDYc2/FOAANIA="; }; nativeBuildInputs = with rustPlatform; [