miracle-wm: 0.8.2 -> 0.8.3 (#493757)

pkgs/by-name/mi/miracle-wm/package.nix

@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   gitUpdater,
   nixosTests,
   boost,
@@ -32,24 +31,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "miracle-wm";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "miracle-wm-org";
     repo = "miracle-wm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RzqF3UDC4MY85ex9TOD2L0Zd7T6mgiZ+ImJuJG+xtjo=";
+    hash = "sha256-N8FDoQDEfv0xGjtnKx+jNfRwxvJdb4ETvQnZuBvlccQ=";
   };
 
-  patches = [
-    # Fix compat with newer Mir
-    # Remove when version > 0.8.2
-    (fetchpatch {
-      url = "https://github.com/miracle-wm-org/miracle-wm/commit/3f3389bf49ad780d258d34109f87e73ef7c02344.patch";
-      hash = "sha256-dxrYfn/MhpCkgsmunMAl5TrPxY8FO0dqQf4LYcuiFGk=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace-fail 'DESTINATION /usr/lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \
@@ -57,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   ''
   # Fix compat with newer Mir
   # https://github.com/miracle-wm-org/miracle-wm/commit/aaae6e64261d8a00c2a1df47e2eab99400382d69
-  # Remove when version > 0.8.2
+  # Remove when version > 0.8.3
   + ''
     substituteInPlace CMakeLists.txt \
       --replace-fail 'pkg_check_modules(MIRRENDERER REQUIRED mirrenderer' 'pkg_check_modules(MIRRENDERER mirrenderer'

pkgs/servers/mir/default.nix

@@ -8,6 +8,15 @@ in
     version = "2.25.2";
     hash = "sha256-+nahWuAcGWgxBM6/a2HWwDw5DkQpUt5i/CEGzTLwNQw=";
     cargoHash = "sha256-fVD+RGU/2UGVihIktKg2+eDWmlWomDOAcrY6k2XwF1c=";
+    patches = [
+      # Fix leftover boost_system references when linking miracle-wm (library no longer exists)
+      # https://github.com/canonical/mir/pull/4721
+      (fetchpatch {
+        name = "mir-tests-mirtest.pc.in-Drop-remaining-references-to-boost_system.patch";
+        url = "https://github.com/canonical/mir/commit/14d396ecef4611e9182d78890a2d908439478799.patch";
+        hash = "sha256-IpX/7lkuYwoITzOz/gF5q7TAFUg4YH0IY2fWkorIEiM=";
+      })
+    ];
   };
 
   mir_2_15 = common {