From d8840638d26b699b42aa13f28cf2ec550f345feb Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Dec 2024 23:14:38 +0100 Subject: [PATCH 1/3] mir: 2.18.3 -> 2.19.2 --- pkgs/servers/mir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 12e3019d52253..8fcc689ddd66b 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -5,8 +5,8 @@ let in { mir = common { - version = "2.18.3"; - hash = "sha256-2PwLTWQeaVR80slZ6/BPr23gVahiDWXulFtdjc9ZUCs="; + version = "2.19.2"; + hash = "sha256-E6+FjYJUIgejpat1Kyl0B1JL+mnQd4rXjSQAPTX31qc="; }; mir_2_15 = common { From db2b768ef87dc4bac78b49b552b7982e49b17a45 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Dec 2024 23:15:08 +0100 Subject: [PATCH 2/3] miracle-wm: Fix compat with mir 2.19 --- pkgs/by-name/mi/miracle-wm/package.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index 5b2e897ae7e38..bbe9444f04895 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -30,18 +30,25 @@ stdenv.mkDerivation (finalAttrs: { version = "0.3.7"; src = fetchFromGitHub { - owner = "mattkae"; + owner = "miracle-wm-org"; repo = "miracle-wm"; rev = "v${finalAttrs.version}"; hash = "sha256-31S7Mfz3LIOAmDUl6jbr3kSP2BdLaM0M4xMZ8FHhLH0="; }; patches = [ - # Remove when https://github.com/mattkae/miracle-wm/pull/211 merged & in release + # Remove when version > 0.3.7 (fetchpatch { - name = "0001-miracle-wm-Dont-ignore-PKG_CONFIG_PATH.patch"; - url = "https://github.com/mattkae/miracle-wm/commit/a9fe6ed1e7dc605f72e18cdc2d19afb3c187be3a.patch"; - hash = "sha256-zzOwqUjyZGYIy/3BvOiedfCubrqaeglvsAzTXyq3wYU="; + name = "0001-miracle-wm-Dont-override-PKG_CONFIG_PATH.patch"; + url = "https://github.com/miracle-wm-org/miracle-wm/commit/0a8809d4362e1d3abbea6e29fd1234c8fa981bfb.patch"; + hash = "sha256-Fy/fDmV1uXRt4omxccpFkZb0vE8iHYSS9A7E+PEFBOM="; + }) + + # Remove when version > 0.3.7 + (fetchpatch { + name = "0002-miracle-wm-Fix-mir-2.19-support.patch"; + url = "https://github.com/miracle-wm-org/miracle-wm/commit/a9db8b539a5396e9df6f6f009cbabcbb053f2b05.patch"; + hash = "sha256-VxUVpwBSHuLzs0yEQ7gStpMnHRJJtZ/Shmjb2un3qI0="; }) ]; From b14e7f5fc29be74157917db7af3a7de64213f0bc Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Dec 2024 23:15:37 +0100 Subject: [PATCH 3/3] miriway: 24.10.1 -> 24.11.1 --- pkgs/by-name/mi/miriway/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/miriway/package.nix b/pkgs/by-name/mi/miriway/package.nix index fe41c1b313b22..830b8c28d7e28 100644 --- a/pkgs/by-name/mi/miriway/package.nix +++ b/pkgs/by-name/mi/miriway/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "24.10.1"; + version = "24.11.1"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-jpXsvr2HnfMCJh851oS+IiQLSmL9C1bnaG6IPSq5xrA="; + hash = "sha256-DphzqU0jT2NE2dSDuQf6BQIjXTwJuPiOjfxk9N9YmaQ="; }; postPatch = ''