Unverified Commit a2400cdb authored by Cosima Neidahl's avatar Cosima Neidahl Committed by GitHub
Browse files

mir: 2.20.2 -> 2.21.1 (#423439)

parents 8dfb30a6 29f0d84b

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

+6 −6
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  stdenv,

  lib,

  fetchFromGitHub,

  gitUpdater,

  unstableGitUpdater,

  nixosTests,

  boost,

  cmake,
@@ -30,13 +30,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "miracle-wm";

  version = "0.5.2";

  version = "0.5.2-unstable-2025-07-06";



  src = fetchFromGitHub {

    owner = "miracle-wm-org";

    repo = "miracle-wm";

    tag = "v${finalAttrs.version}";

    hash = "sha256-nmDFmj3DawgjRB0+vlcvPX+kj6lzAu14HySFc2NsJss=";

    rev = "859c1e4c97db78872ee799ceb0316c612841ee37";

    hash = "sha256-1AZLxD/VyBt60ZHXVN/OpKNigN9NdEBJ9svOOVI0JCI=";

  };



  postPatch =
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { 
  checkPhase = ''

    runHook preCheck



    ./bin/miracle-wm-tests

    ./tests/miracle-wm-tests



    runHook postCheck

  '';
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { 
  '';



  passthru = {

    updateScript = gitUpdater { rev-prefix = "v"; };

    updateScript = unstableGitUpdater { tagPrefix = "v"; };

    providedSessions = [ "miracle-wm" ];

    tests.vm = nixosTests.miracle-wm;

  };

pkgs/servers/mir/common.nix

+34 −26
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
  lttng-ust,

  libgbm,

  nettle,

  pixman,

  udev,

  wayland,

  wayland-scanner,
@@ -105,7 +106,8 @@ stdenv.mkDerivation (finalAttrs: { 
    wayland-scanner

  ];



  buildInputs = [

  buildInputs =

    [

      boost

      egl-wayland

      freetype
@@ -130,7 +132,13 @@ stdenv.mkDerivation (finalAttrs: { 
      xorg.libXcursor

      xorg.xorgproto

      xwayland

  ] ++ lib.optionals (lib.strings.versionAtLeast version "2.18.0") [ libapparmor ];

    ]

    ++ lib.optionals (lib.strings.versionAtLeast version "2.18.0") [

      libapparmor

    ]

    ++ lib.optionals (lib.strings.versionAtLeast version "2.21.0") [

      pixman

    ];



  nativeCheckInputs = [

    dbus

pkgs/servers/mir/default.nix

+9 −2
Original line number Diff line number Diff line
@@ -5,8 +5,15 @@ let 
in

{

  mir = common {

    version = "2.20.2";

    hash = "sha256-kxXPRIvgvpWqos8l/fJyHvfJBNi0jOZfV5inY3SBavM=";

    version = "2.21.1";

    hash = "sha256-FDZ40LiuvMuyWQQGjgOHTm+J3i7yczKMzL3dZ1jsz/E=";

    patches = [

      (fetchpatch {

        name = "0001-Fix-gtest-nodiscard-error.patch";

        url = "https://github.com/canonical/mir/commit/60dab2b197deb159087e44865e7314ad2865b79d.patch";

        hash = "sha256-fB49E+Wjm2zJnie9Ws+tP0d6lxcG3V/C/UDfy/4iuFU=";

      })

    ];

  };



  mir_2_15 = common {