diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-14 18:01:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-14 18:01:11 +0000 |
| commit | 6cc772a6fa213f2624f490735f4cf49426bcc0e0 (patch) | |
| tree | 398d8785581708be3eb823fcffdc18b0f8726e65 /pkgs/tools/virtualization/multipass/default.nix | |
| parent | 0523b2e6c2ea7730352fa32e8a921ec331569571 (diff) | |
| parent | cd014bdb858891bc7a3f0c1267ef8ad4fd11f19c (diff) | |
| download | nixlib-6cc772a6fa213f2624f490735f4cf49426bcc0e0.tar nixlib-6cc772a6fa213f2624f490735f4cf49426bcc0e0.tar.gz nixlib-6cc772a6fa213f2624f490735f4cf49426bcc0e0.tar.bz2 nixlib-6cc772a6fa213f2624f490735f4cf49426bcc0e0.tar.lz nixlib-6cc772a6fa213f2624f490735f4cf49426bcc0e0.tar.xz nixlib-6cc772a6fa213f2624f490735f4cf49426bcc0e0.tar.zst nixlib-6cc772a6fa213f2624f490735f4cf49426bcc0e0.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/virtualization/multipass/default.nix')
| -rw-r--r-- | pkgs/tools/virtualization/multipass/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/virtualization/multipass/default.nix b/pkgs/tools/virtualization/multipass/default.nix index bf03b8636799..f69ee671a404 100644 --- a/pkgs/tools/virtualization/multipass/default.nix +++ b/pkgs/tools/virtualization/multipass/default.nix @@ -25,7 +25,7 @@ let pname = "multipass"; - version = "1.12.1"; + version = "1.12.2"; # 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 @@ -33,8 +33,8 @@ let grpc_src = fetchFromGitHub { owner = "CanonicalLtd"; repo = "grpc"; - rev = "ba8e7f72a57b9e0b25783a4d3cea58c79379f194"; - hash = "sha256-DS1UNLCUdbipn5w4p2aVa8LgHHhdJiAfzfEdIXNO69o="; + rev = "e3acf245"; + hash = "sha256-tDc2iGxIV68Yi4RL8ES4yglJNlu8yH6FlpVvZoWjoXk="; fetchSubmodules = true; }; in @@ -46,13 +46,14 @@ stdenv.mkDerivation owner = "canonical"; repo = "multipass"; rev = "refs/tags/v${version}"; - hash = "sha256-8wRho/ECWxiE6rNqjBzaqFaIdhXzOzFuCcQ4zzfSmb4="; + hash = "sha256-OWZiVw3ztx1g1slq/5a7/JcLdDNB5RqYT5U3w1UXUpg="; fetchSubmodules = true; }; patches = [ ./lxd_socket_path.patch ./cmake_no_fetch.patch + ./cmake_warning.patch ]; postPatch = '' |