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

mir: 2.17.2 -> 2.18.2 (#342624)

parents b12b45ea 27f1f466

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

+2 −2
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "miracle-wm";

  version = "0.3.5";

  version = "0.3.6";



  src = fetchFromGitHub {

    owner = "mattkae";

    repo = "miracle-wm";

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

    hash = "sha256-2OoMkD4ChNXzqqzdOvzYRL0UYU7Uecm5yTXCvG45jCI=";

    hash = "sha256-fK/g6DhcxJMvxujZDZXs1yXRu2FGZQKmhxw7/czAQiY=";

  };



  patches = [

pkgs/servers/mir/common.nix

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

  lib,

  fetchFromGitHub,

  nixosTests,

  testers,

  cmake,

  pkg-config,
@@ -12,6 +13,7 @@ 
  glib,

  glm,

  glog,

  libapparmor,

  libdrm,

  libepoxy,

  libevdev,
@@ -58,7 +60,8 @@ stdenv.mkDerivation (finalAttrs: { 


  inherit patches;



  postPatch = ''

  postPatch =

    ''

      # Fix scripts that get run in tests

      patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in
@@ -74,6 +77,8 @@ stdenv.mkDerivation (finalAttrs: { 
      # Fix Xwayland default

      substituteInPlace src/miral/x11_support.cpp \

        --replace-fail '/usr/bin/Xwayland' '${lib.getExe xwayland}'

    ''

    + lib.optionalString (lib.strings.versionOlder version "2.18.0") ''



      # Fix paths for generating drm-formats

      substituteInPlace src/platform/graphics/CMakeLists.txt \
@@ -127,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { 
    xorg.libXcursor

    xorg.xorgproto

    xwayland

  ];

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



  nativeCheckInputs = [

    dbus
@@ -181,7 +186,9 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  passthru = {

    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

    tests = {

      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

    } // lib.optionalAttrs (!pinned) { inherit (nixosTests) miriway miracle-wm; };

    providedSessions = lib.optionals (lib.strings.versionOlder version "2.16.0") [

      # More of an example than a fully functioning shell, some notes for the adventurous:

      # - ~/.config/miral-shell.config is one possible user config location,
@@ -192,9 +199,7 @@ stdenv.mkDerivation (finalAttrs: { 
      #   does not know about preferred terminal

      "mir-shell"

    ];

  } // lib.optionalAttrs (!pinned) {

    updateScript = ./update.sh;

  };

  } // lib.optionalAttrs (!pinned) { updateScript = ./update.sh; };



  meta = {

    description = "Display server and Wayland compositor developed by Canonical";
@@ -206,7 +211,8 @@ stdenv.mkDerivation (finalAttrs: { 
      OPNA2608

    ];

    platforms = lib.platforms.linux;

    pkgConfigModules = [

    pkgConfigModules =

      [

        "miral"

        "mircommon"

        "mircore"
@@ -217,9 +223,9 @@ stdenv.mkDerivation (finalAttrs: { 
        "mirserver"

        "mirtest"

        "mirwayland"

    ] ++ lib.optionals (lib.strings.versionOlder version "2.17.0") [

      "mircookie"

    ] ++ lib.optionals (lib.strings.versionAtLeast version "2.17.0") [

      ]

      ++ lib.optionals (lib.strings.versionOlder version "2.17.0") [ "mircookie" ]

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

        "mircommon-internal"

        "mirserver-internal"

      ];

pkgs/servers/mir/default.nix

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

{

  mir = common {

    version = "2.17.2";

    hash = "sha256-OwOGt3X7+UchksyPf/sodit2PHpSlpP2S3gkCPcdzfE=";

    version = "2.18.2";

    hash = "sha256-Yko5ws8dUazPziXzM77Zg4p1taC0mbjAcpOKJR0dJ5M=";

  };



  mir_2_15 = common {