diff options
author | Nick Cao <nickcao@nichi.co> | 2023-11-14 12:07:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-14 12:07:36 -0500 |
commit | bcc70105efa411cfc125949b57ff60c4ff05c589 (patch) | |
tree | c2768a6c899ddb306862bdd553e79255cf8b9004 /pkgs/tools/virtualization | |
parent | 6e199d8e01731ef3385c52e5295d05fa6122f869 (diff) | |
parent | a0698f018ad3c8780209eee61860b83303518f3b (diff) | |
download | nixlib-bcc70105efa411cfc125949b57ff60c4ff05c589.tar nixlib-bcc70105efa411cfc125949b57ff60c4ff05c589.tar.gz nixlib-bcc70105efa411cfc125949b57ff60c4ff05c589.tar.bz2 nixlib-bcc70105efa411cfc125949b57ff60c4ff05c589.tar.lz nixlib-bcc70105efa411cfc125949b57ff60c4ff05c589.tar.xz nixlib-bcc70105efa411cfc125949b57ff60c4ff05c589.tar.zst nixlib-bcc70105efa411cfc125949b57ff60c4ff05c589.zip |
Merge pull request #266214 from dawidd6/multipass-1.12
multipass: 1.12.1 -> 1.12.2
Diffstat (limited to 'pkgs/tools/virtualization')
-rw-r--r-- | pkgs/tools/virtualization/multipass/cmake_no_fetch.patch | 2 | ||||
-rw-r--r-- | pkgs/tools/virtualization/multipass/cmake_warning.patch | 14 | ||||
-rw-r--r-- | pkgs/tools/virtualization/multipass/default.nix | 9 |
3 files changed, 20 insertions, 5 deletions
diff --git a/pkgs/tools/virtualization/multipass/cmake_no_fetch.patch b/pkgs/tools/virtualization/multipass/cmake_no_fetch.patch index fc1c472ef3a6..bde1792d4002 100644 --- a/pkgs/tools/virtualization/multipass/cmake_no_fetch.patch +++ b/pkgs/tools/virtualization/multipass/cmake_no_fetch.patch @@ -7,7 +7,7 @@ index 188ebfc6..4a34a922 100644 FetchContent_Declare(gRPC - GIT_REPOSITORY https://github.com/CanonicalLtd/grpc.git -- GIT_TAG ba8e7f72 +- GIT_TAG e3acf245 - GIT_SHALLOW TRUE - GIT_SUBMODULES "third_party/abseil-cpp third_party/cares/cares third_party/protobuf third_party/re2 third_party/zlib" - GIT_SUBMODULES_RECURSE false diff --git a/pkgs/tools/virtualization/multipass/cmake_warning.patch b/pkgs/tools/virtualization/multipass/cmake_warning.patch new file mode 100644 index 000000000000..846cba0690fb --- /dev/null +++ b/pkgs/tools/virtualization/multipass/cmake_warning.patch @@ -0,0 +1,14 @@ +diff --git a/src/cert/CMakeLists.txt b/src/cert/CMakeLists.txt +index d44a0b09..de440f24 100644 +--- a/src/cert/CMakeLists.txt ++++ b/src/cert/CMakeLists.txt +@@ -22,7 +22,7 @@ add_library(cert STATIC + target_include_directories(cert PRIVATE + ${OPENSSL_INCLUDE_DIR}) + +-foreach(flag -Wno-nested-anon-types -Wno-gnu -Wno-pedantic -Wno-ignored-qualifiers) ++foreach(flag -Wno-nested-anon-types -Wno-gnu -Wno-pedantic -Wno-ignored-qualifiers -Wno-ignored-attributes) + check_cxx_compiler_flag(${flag} SUPPORTED) + if(SUPPORTED) + target_compile_options(cert PRIVATE ${flag}) + 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 = '' |