Merge pull request #280234 from jnsgruk/multipass-1.13.0
multipass: 1.12.2 -> 1.13.0
This commit is contained in:
commit
f9112bd2df
2 changed files with 6 additions and 6 deletions
|
@ -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 = [
|
||||
|
|
|
@ -11034,7 +11034,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 { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue