nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #280234 from jnsgruk/multipass-1.13.0

Browse Source 
multipass: 1.12.2 -> 1.13.0
This commit is contained in:
Nick Cao 2024-01-12 16:55:11 -05:00 committed by GitHub
commit f9112bd2df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/virtualization/multipass/default.nix
View File

@ -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 = [

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };