From a81c0cd8ab2cf6c9cbe72a37364a778626669b91 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 8 Jun 2024 09:41:00 +0200
Subject: [PATCH 1/3] monado: unstable-2024-01-02 -> 24.0.0

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/applications/graphics/monado/default.nix | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix
index 4cbd7a8f00c9..72e0df4f13f9 100644
--- a/pkgs/applications/graphics/monado/default.nix
+++ b/pkgs/applications/graphics/monado/default.nix
@@ -9,7 +9,6 @@
 , doxygen
 , eigen
 , elfutils
-, ffmpeg
 , glslang
 , gst-plugins-base
 , gstreamer
@@ -51,23 +50,23 @@
 , zlib
 , zstd
 , nixosTests
-# Set as 'false' to build monado without service support, i.e. allow VR
-# applications linking against libopenxr_monado.so to use OpenXR standalone
-# instead of via the monado-service program. For more information see:
-# https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled
+  # Set as 'false' to build monado without service support, i.e. allow VR
+  # applications linking against libopenxr_monado.so to use OpenXR standalone
+  # instead of via the monado-service program. For more information see:
+  # https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled
 , serviceSupport ? true
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "monado";
-  version = "unstable-2024-01-02";
+  version = "24.0.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "monado";
     repo = "monado";
-    rev = "bfa1c16ff9fc759327ca251a5d086b958b1a3b8a";
-    hash = "sha256-wXRwOs9MkDre/VeW686DzmvKjX0qCSS13MILbYQD6OY=";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-lFy0VvaLD4Oyu2TZJnaIWjuaJUZjGGDJS0VsRfIUpcc=";
   };
 
   nativeBuildInputs = [
@@ -92,7 +91,6 @@ stdenv.mkDerivation {
     dbus
     eigen
     elfutils
-    ffmpeg
     gst-plugins-base
     gstreamer
     hidapi
@@ -155,4 +153,4 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     mainProgram = "monado-cli";
   };
-}
+})

From 66a06e2861835ea424da753558b1b5a3e3f36ec7 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 8 Jun 2024 09:42:13 +0200
Subject: [PATCH 2/3] monado: move to by-name

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../monado/default.nix => by-name/mo/monado/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{applications/graphics/monado/default.nix => by-name/mo/monado/package.nix} (100%)

diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/by-name/mo/monado/package.nix
similarity index 100%
rename from pkgs/applications/graphics/monado/default.nix
rename to pkgs/by-name/mo/monado/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a04271b7fac7..2451cbfbdd60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5825,7 +5825,7 @@ with pkgs;
 
   monetdb = callPackage ../servers/sql/monetdb { };
 
-  monado = callPackage ../applications/graphics/monado {
+  monado = callPackage ../by-name/mo/monado/package.nix {
     inherit (gst_all_1) gstreamer gst-plugins-base;
   };
 

From d748c85b585a010431788b42db41caf63f1a963b Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 30 Jun 2024 14:31:34 -0400
Subject: [PATCH 3/3] monado: add updateScript

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/mo/monado/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix
index 72e0df4f13f9..6f420f497e33 100644
--- a/pkgs/by-name/mo/monado/package.nix
+++ b/pkgs/by-name/mo/monado/package.nix
@@ -30,6 +30,7 @@
 , libXdmcp
 , libXext
 , libXrandr
+, nix-update-script
 , onnxruntime
 , opencv4
 , openhmd
@@ -141,8 +142,9 @@ stdenv.mkDerivation (finalAttrs: {
     export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}}
   '';
 
-  passthru.tests = {
-    basic-service = nixosTests.monado;
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.basic-service = nixosTests.monado;
   };
 
   meta = with lib; {