From 93cb49e202f70756095c558c4496c92adab1aa4d Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Wed, 31 Dec 2025 17:02:35 +0200
Subject: [PATCH 1/2] quaternion-qt6: create alias

---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7dfe86967e25..05569c6d2f6b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1414,6 +1414,7 @@ mapAliases {
   qtile-unwrapped = throw "'qtile-unwrapped' has been renamed to/replaced by 'python3.pkgs.qtile'"; # Converted to throw 2025-10-27
   quantum-espresso-mpi = throw "'quantum-espresso-mpi' has been renamed to/replaced by 'quantum-espresso'"; # Converted to throw 2025-10-27
   quaternion-qt5 = throw "'quaternion-qt5' has been removed as quaternion dropped Qt5 support with v0.0.97.1"; # Added 2025-05-24
+  quaternion-qt6 = warnAlias "'quaternion-qt6 has been renamed to quaternion"; # Added 2025-12-31
   qubes-core-vchan-xen = throw "'qubes-core-vchan-xen' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   quicksynergy = throw "'quicksynergy' has been removed due to lack of maintenance upstream. Consider using 'deskflow' instead."; # Added 2025-06-18
   quictls = throw "'quictls' has been removed. QUIC support is now available in `openssl`.";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9bce7e6e5c84..b904a8bd18aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1670,10 +1670,8 @@ with pkgs;
     charles5
     ;
 
-  quaternion-qt6 =
-    qt6Packages.callPackage ../applications/networking/instant-messengers/quaternion
+  quaternion =  qt6Packages.callPackage ../applications/networking/instant-messengers/quaternion
       { };
-  quaternion = quaternion-qt6;
 
   tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };
 

From 010f412c0f225014b52a704b112e26227ddc3f5e Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sat, 3 Jan 2026 04:52:20 +0200
Subject: [PATCH 2/2] quaternion: 0.0.96.1 -> 0.0.97.1, move to by-name, fix
 build

---
 .../qu/quaternion/package.nix}                | 43 ++++++-------------
 pkgs/top-level/all-packages.nix               |  3 --
 2 files changed, 13 insertions(+), 33 deletions(-)
 rename pkgs/{applications/networking/instant-messengers/quaternion/default.nix => by-name/qu/quaternion/package.nix} (51%)

diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/by-name/qu/quaternion/package.nix
similarity index 51%
rename from pkgs/applications/networking/instant-messengers/quaternion/default.nix
rename to pkgs/by-name/qu/quaternion/package.nix
index e275452c9b9e..209c96528916 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/by-name/qu/quaternion/package.nix
@@ -3,56 +3,40 @@
   lib,
   fetchFromGitHub,
   cmake,
-  wrapQtAppsHook,
-  qtbase,
-  qtquickcontrols2 ? null, # only a separate package on qt5
-  qtkeychain,
-  qtmultimedia,
-  qttools,
-  libquotient,
+  qt6,
   libsecret,
   olm,
+  kdePackages,
 }:
 
-let
-  inherit (lib) cmakeBool;
-
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "quaternion";
-  version = "0.0.96.1";
+  version = "0.0.97.1";
 
   src = fetchFromGitHub {
     owner = "quotient-im";
     repo = "Quaternion";
-    rev = finalAttrs.version;
-    hash = "sha256-lRCSEb/ldVnEv6z0moU4P5rf0ssKb9Bw+4QEssLjuwI=";
+    tag = finalAttrs.version;
+    hash = "sha256-Dn4E3mTqcNK88PNraL+qR1gREob5j7s3Qf8XAaTNSJg=";
   };
 
   buildInputs = [
-    libquotient
+    kdePackages.libquotient
     libsecret
     olm
-    qtbase
-    qtkeychain
-    qtmultimedia
-    qtquickcontrols2
+    qt6.qtbase
+    kdePackages.qtkeychain
+    qt6.qtmultimedia
   ];
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
-  # qt6 needs UTF
   env.LANG = "C.UTF-8";
 
-  cmakeFlags = [
-    # drop this from 0.0.97 onwards as it will be qt6 only
-    (cmakeBool "BUILD_WITH_QT6" ((lib.versions.major qtbase.version) == "6"))
-  ];
-
   postInstall =
     if stdenv.hostPlatform.isDarwin then
       ''
@@ -62,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
       ''
     else
       ''
-        substituteInPlace $out/share/applications/com.github.quaternion.desktop \
-          --replace 'Exec=quaternion' "Exec=$out/bin/quaternion"
+        substituteInPlace $out/share/applications/io.github.quotient_im.Quaternion.desktop \
+          --replace-fail 'Exec=quaternion' "Exec=$out/bin/quaternion"
       '';
 
   meta = {
@@ -72,6 +56,5 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://matrix.org/ecosystem/clients/quaternion/";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ peterhoeg ];
-    inherit (qtbase.meta) platforms;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b904a8bd18aa..654acbe0c198 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1670,9 +1670,6 @@ with pkgs;
     charles5
     ;
 
-  quaternion =  qt6Packages.callPackage ../applications/networking/instant-messengers/quaternion
-      { };
-
   tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };
 
   libtensorflow = python3.pkgs.tensorflow-build.libtensorflow;