summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOPNA2608 <christoph.neidahl@gmail.com>2023-07-28 12:11:54 +0200
committerOPNA2608 <christoph.neidahl@gmail.com>2023-07-28 12:11:54 +0200
commitae7fb1102f8668467bfc18320ad04a1137beae4f (patch)
treedc75749e3c5e406a7f77beb32577d3a3f5699b95
parentwlcs: 1.5.0 -> 1.6.0 (diff)
downloadnixpkgs-ae7fb1102f8668467bfc18320ad04a1137beae4f.tar.gz
mir: 2.13.0 -> 2.14.1
-rw-r--r--pkgs/servers/mir/default.nix15
1 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix
index 013c3190e3b8..6221c467689f 100644
--- a/pkgs/servers/mir/default.nix
+++ b/pkgs/servers/mir/default.nix
@@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
-, fetchpatch
, gitUpdater
, testers
, cmake
@@ -41,25 +40,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mir";
- version = "2.13.0";
+ version = "2.14.1";
src = fetchFromGitHub {
owner = "MirServer";
repo = "mir";
rev = "v${finalAttrs.version}";
- hash = "sha256-Ip8p4mjcgmZQJTU4MNvWkTTtSJc+cCL3x1mMDFlZrVY=";
+ hash = "sha256-IEGeZVNxwzHn5GASCyjNuQsnCzzfQBHdC33MWVMeZws=";
};
- patches = [
- # Fixes Mir being able to drop first input device on launch
- # Drop when https://github.com/MirServer/mir/issues/2837 fixed in a release
- (fetchpatch {
- name = "0001-mir-Simplify_probing_of_evdev_input_platform.patch";
- url = "https://github.com/MirServer/mir/commit/7787cfa721934bb43d3255218e7c92e700923fcb.patch";
- hash = "sha256-9C9qcmngd+K8EAcyOYUJFTdFDu1Nt1MM7Y9TRNOXFB4=";
- })
- ];
-
postPatch = ''
# Fix scripts that get run in tests
patchShebangs tools/detect_fd_leaks.bash tests/acceptance-tests/wayland-generator/test_wayland_generator.sh.in