quaternion: 0.0.96.1 -> 0.0.97.1, move to by-name, fix build (#476464)

This commit is contained in:
Peter Hoeg
2026-01-03 13:29:01 +00:00
committed by GitHub
3 changed files with 14 additions and 35 deletions
@@ -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;
};
})
+1
View File
@@ -1415,6 +1415,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`.";
-5
View File
@@ -1670,11 +1670,6 @@ with pkgs;
charles5
;
quaternion-qt6 =
qt6Packages.callPackage ../applications/networking/instant-messengers/quaternion
{ };
quaternion = quaternion-qt6;
tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };
libtensorflow = python3.pkgs.tensorflow-build.libtensorflow;