From 93f702763cfb48b5ab719a69f55fdb1cbd3a37ca Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 2 Oct 2024 14:13:36 +0200
Subject: [PATCH 1/3] miriway: 0-unstable-2024-08-31 -> 24.09

---
 pkgs/applications/window-managers/miriway/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix
index c23f1e799c35..2eeef4d68eff 100644
--- a/pkgs/applications/window-managers/miriway/default.nix
+++ b/pkgs/applications/window-managers/miriway/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, unstableGitUpdater
+, gitUpdater
 , nixosTests
 , cmake
 , pkg-config
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "miriway";
-  version = "0-unstable-2024-08-31";
+  version = "24.09";
 
   src = fetchFromGitHub {
     owner = "Miriway";
     repo = "Miriway";
-    rev = "2d754931f038865bd91938578b862262f0ce7c00";
-    hash = "sha256-wmtAbajZ859tvLjKuwqFUq05VGLxHNJX1XyIXM6vvgU=";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-/0txc9ynC3rj9tbHwYNlDe2C1DlmjoE2Q2/uoBz2GFg=";
   };
 
   strictDeps = true;
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   passthru = {
-    updateScript = unstableGitUpdater { };
+    updateScript = gitUpdater { rev-prefix = "v"; };
     providedSessions = [ "miriway" ];
     tests = {
       inherit (nixosTests) miriway;

From 0aee5249b065e98947e33d3d277f74c20890c277 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 2 Oct 2024 14:15:51 +0200
Subject: [PATCH 2/3] miriway: nixfmt, modernise

---
 .../window-managers/miriway/default.nix       | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix
index 2eeef4d68eff..9ae59bf05347 100644
--- a/pkgs/applications/window-managers/miriway/default.nix
+++ b/pkgs/applications/window-managers/miriway/default.nix
@@ -1,12 +1,13 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, gitUpdater
-, nixosTests
-, cmake
-, pkg-config
-, mir
-, libxkbcommon
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  gitUpdater,
+  nixosTests,
+  cmake,
+  pkg-config,
+  mir,
+  libxkbcommon,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Mir based Wayland compositor";
     longDescription = ''
       Miriway is a starting point for creating a Wayland based desktop environment using Mir.
@@ -64,8 +65,9 @@ stdenv.mkDerivation (finalAttrs: {
       enabling these in miriway-shell.config.
     '';
     homepage = "https://github.com/Miriway/Miriway";
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ OPNA2608 ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    mainProgram = "miriway";
+    maintainers = with lib.maintainers; [ OPNA2608 ];
   };
 })

From cb53ffd4d40f469d13d7272f4efb8dbf381c4586 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 2 Oct 2024 14:17:53 +0200
Subject: [PATCH 3/3] miriway: Move to by-name

---
 .../miriway/default.nix => by-name/mi/miriway/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/miriway/default.nix => by-name/mi/miriway/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/by-name/mi/miriway/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/miriway/default.nix
rename to pkgs/by-name/mi/miriway/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12aace53e661..221dfc3c9182 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25020,8 +25020,6 @@ with pkgs;
     mir
     mir_2_15;
 
-  miriway = callPackage ../applications/window-managers/miriway { };
-
   icinga2 = callPackage ../servers/monitoring/icinga2 { };
 
   icinga2-agent = callPackage ../servers/monitoring/icinga2 {