From 577cf0f895fbb5c27c7b626fbdb10b9b8faf7e1a Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Jan 2024 09:59:45 +0000 Subject: [PATCH] multipass: 1.12.2 -> 1.13.0 --- pkgs/tools/virtualization/multipass/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/virtualization/multipass/default.nix b/pkgs/tools/virtualization/multipass/default.nix index 4ed0c087d739..4d1bf855ad6f 100644 --- a/pkgs/tools/virtualization/multipass/default.nix +++ b/pkgs/tools/virtualization/multipass/default.nix @@ -16,16 +16,16 @@ , qemu , qemu-utils , qtbase -, qtx11extras +, qtwayland +, wrapQtAppsHook , slang , stdenv -, wrapQtAppsHook , xterm }: let pname = "multipass"; - version = "1.12.2"; + version = "1.13.0"; # This is done here because a CMakeLists.txt from one of it's submodules tries # to modify a file, so we grab the source for the submodule here, copy it into @@ -46,7 +46,7 @@ stdenv.mkDerivation owner = "canonical"; repo = "multipass"; rev = "refs/tags/v${version}"; - hash = "sha256-1k0jbYMwfYuHmM/Cm76sbo3+mN6WypALMQBwlZ+9d+c="; + hash = "sha256-DMyIvhlkMuUyOlUw8b4312NUtpK0n8rI8nhoV6Dscyo="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' @@ -104,7 +104,7 @@ stdenv.mkDerivation libxml2 openssl qtbase - qtx11extras + qtwayland ]; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20a9726b6882..e60573784f17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11021,7 +11021,7 @@ with pkgs; muffet = callPackage ../tools/networking/muffet { }; - multipass = libsForQt5.callPackage ../tools/virtualization/multipass { }; + multipass = qt6Packages.callPackage ../tools/virtualization/multipass { }; multitime = callPackage ../tools/misc/multitime { };