Unverified Commit bcc70105 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #266214 from dawidd6/multipass-1.12 

multipass: 1.12.1 -> 1.12.2
parents 6e199d8e a0698f01

pkgs/tools/virtualization/multipass/cmake_no_fetch.patch

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/tools/virtualization/multipass/cmake_warning.patch

0 → 100644
+14 −0
Original line number Diff line number Diff line 
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})

pkgs/tools/virtualization/multipass/default.nix

+5 −4
Original line number Diff line number Diff line
@@ -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 = ''