From 4e61a6d1253ea83b3f84ccd44741a26e818b3e6a Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Fri, 4 Jul 2025 23:28:57 +0200 Subject: [PATCH 1/3] libsForQt5.neochat: drop neochat depended on the deprecated libsForQt5.libquotient library. libquotient removed qt5 support upstream in https://github.com/quotient-im/libQuotient/pull/709. --- pkgs/applications/kde/default.nix | 1 - pkgs/applications/kde/neochat.nix | 77 ------------------------ pkgs/applications/kde/srcs.nix | 8 --- pkgs/applications/plasma-mobile/srcs.nix | 8 --- pkgs/top-level/aliases.nix | 1 + 5 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 pkgs/applications/kde/neochat.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 6daf57588163..8b1896993d3a 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -272,7 +272,6 @@ let krecorder = callPackage ./krecorder.nix { }; ktrip = callPackage ./ktrip.nix { }; kweather = callPackage ./kweather.nix { }; - neochat = callPackage ./neochat.nix { }; plasmatube = callPackage ./plasmatube { }; qmlkonsole = callPackage ./qmlkonsole.nix { }; telly-skout = callPackage ./telly-skout.nix { }; diff --git a/pkgs/applications/kde/neochat.nix b/pkgs/applications/kde/neochat.nix deleted file mode 100644 index 8f2601930d7f..000000000000 --- a/pkgs/applications/kde/neochat.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - mkDerivation, - lib, - - cmake, - extra-cmake-modules, - pkg-config, - wrapQtAppsHook, - - cmark, - kconfig, - kdbusaddons, - ki18n, - kio, - kirigami-addons, - kirigami2, - kitemmodels, - knotifications, - kquickcharts, - kquickimageedit, - libpulseaudio, - libquotient, - libsecret, - olm, - qcoro, - qqc2-desktop-style, - qtgraphicaleffects, - qtlocation, - qtmultimedia, - qtquickcontrols2, - sonnet, -}: - -mkDerivation { - pname = "neochat"; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - cmark - kconfig - kdbusaddons - kio - ki18n - kirigami-addons - kirigami2 - kitemmodels - knotifications - kquickcharts - kquickimageedit - libpulseaudio - libquotient - libsecret - olm - qcoro - qtgraphicaleffects - qtlocation - qtmultimedia - qtquickcontrols2 - qqc2-desktop-style - sonnet - ]; - - meta = with lib; { - description = "Client for matrix, the decentralized communication protocol"; - mainProgram = "neochat"; - homepage = "https://apps.kde.org/en/neochat"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ peterhoeg ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index af83cc951be8..073d8810c7a4 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -1747,14 +1747,6 @@ name = "minuet-23.08.5.tar.xz"; }; }; - neochat = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/neochat-23.08.5.tar.xz"; - sha256 = "0cj6j08g5ng1vifpb49rks9kp4mfb3h466n6afw9dk0xxgccc06k"; - name = "neochat-23.08.5.tar.xz"; - }; - }; okular = { version = "23.08.5"; src = fetchurl { diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix index 42e0612cf8cb..1167bc231a3f 100644 --- a/pkgs/applications/plasma-mobile/srcs.nix +++ b/pkgs/applications/plasma-mobile/srcs.nix @@ -115,14 +115,6 @@ name = "kweather-23.01.0.tar.xz"; }; }; - neochat = { - version = "23.01.0"; - src = fetchurl { - url = "${mirror}/stable/plasma-mobile/23.01.0/neochat-23.01.0.tar.xz"; - sha256 = "0pkas8whwy1ih4sx9vaa7k55iiiy955dh4d53i4l1d0sjdf8pysd"; - name = "neochat-23.01.0.tar.xz"; - }; - }; plasma-dialer = { version = "23.01.0"; src = fetchurl { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c4b893beb38a..5d59ab6d567a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -186,6 +186,7 @@ let inherit (libsForQt5) sddm + neochat # added 2025-07-04 ; }; From 242a5e4c4f0653d69537025200acca5aa2868dbe Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Fri, 4 Jul 2025 23:35:35 +0200 Subject: [PATCH 2/3] libsForQt5.itinerary: drop itinerary depended on the deprecated libsForQt5.libquotient library. libquotient removed qt5 support upstream in https://github.com/quotient-im/libQuotient/pull/709. --- pkgs/applications/kde/default.nix | 1 - pkgs/applications/kde/itinerary.nix | 73 ----------------------------- pkgs/applications/kde/srcs.nix | 8 ---- pkgs/top-level/aliases.nix | 1 + 4 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 pkgs/applications/kde/itinerary.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 8b1896993d3a..1fbe05d197f5 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -108,7 +108,6 @@ let grantleetheme = callPackage ./grantleetheme { }; gwenview = callPackage ./gwenview { }; incidenceeditor = callPackage ./incidenceeditor.nix { }; - itinerary = callPackage ./itinerary.nix { }; juk = callPackage ./juk.nix { }; kaccounts-integration = callPackage ./kaccounts-integration.nix { }; kaccounts-providers = callPackage ./kaccounts-providers.nix { }; diff --git a/pkgs/applications/kde/itinerary.nix b/pkgs/applications/kde/itinerary.nix deleted file mode 100644 index 1fb82cdac64e..000000000000 --- a/pkgs/applications/kde/itinerary.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - karchive, - kcalendarcore, - kcontacts, - kdbusaddons, - kfilemetadata, - kholidays, - kio, - kirigami-addons, - kitemmodels, - kitinerary, - kmime, - knotifications, - kosmindoormap, - kpkpass, - kpublictransport, - kunitconversion, - libquotient, - networkmanager-qt, - prison, - qqc2-desktop-style, - qtpositioning, - qtquickcontrols2, - shared-mime-info, -}: - -mkDerivation { - pname = "itinerary"; - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - extra-cmake-modules - shared-mime-info # for update-mime-database - ]; - - buildInputs = [ - karchive - kcalendarcore - kcontacts - kdbusaddons - kfilemetadata - kholidays - kio - kirigami-addons - kitemmodels - kitinerary - kmime - knotifications - kosmindoormap - kpkpass - kpublictransport - kunitconversion - libquotient - networkmanager-qt - prison - qqc2-desktop-style - qtpositioning - qtquickcontrols2 - ]; - - meta.license = with lib.licenses; [ - asl20 - bsd3 - cc0 - lgpl2Plus - ]; -} diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 073d8810c7a4..58f9d0e73b8c 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -331,14 +331,6 @@ name = "incidenceeditor-23.08.5.tar.xz"; }; }; - itinerary = { - version = "23.08.5"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.08.5/src/itinerary-23.08.5.tar.xz"; - sha256 = "19r7k64a4dalarxm7j2jf2p86cnxqxah0iqj68ibazhl1sdqrqs2"; - name = "itinerary-23.08.5.tar.xz"; - }; - }; juk = { version = "23.08.5"; src = fetchurl { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5d59ab6d567a..c219fa51eca7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -187,6 +187,7 @@ let inherit (libsForQt5) sddm neochat # added 2025-07-04 + itinerary # added 2025-07-04 ; }; From 6702de4f4fcf904604fd0ddafbb5f08aaef5470d Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Fri, 4 Jul 2025 23:38:10 +0200 Subject: [PATCH 3/3] libsForQt5.libquotient: mark dropped Upstream removed qt5 support in https://github.com/quotient-im/libQuotient/pull/709 --- pkgs/development/libraries/libquotient/default.nix | 4 ---- pkgs/top-level/aliases.nix | 3 ++- pkgs/top-level/qt5-packages.nix | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index 156375d8a2da..850d0c1caa70 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -10,9 +10,6 @@ qtkeychain, }: -let - isQt6 = lib.versions.major qtbase.version == "6"; -in stdenv.mkDerivation rec { pname = "libquotient"; version = "0.9.1"; @@ -41,7 +38,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQuotient_ENABLE_E2EE=ON" - (lib.cmakeBool "BUILD_WITH_QT6" isQt6) ]; # https://github.com/quotient-im/libQuotient/issues/551 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c219fa51eca7..3d137225c84c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -188,6 +188,7 @@ let sddm neochat # added 2025-07-04 itinerary # added 2025-07-04 + libquotient # added 2025-07-04 ; }; @@ -1054,7 +1055,7 @@ mapAliases { libpseudo = throw "'libpseudo' was removed as it is broken and not maintained upstream"; # Added 2025-05-17 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 libqt5pas = libsForQt5.libqtpas; # Added 2024-12-25 - libquotient = libsForQt5.libquotient; # Added 2023-11-11 + libquotient = throw "'libquotient' for qt5 was removed as upstream removed qt5 support. Consider explicitly upgrading to qt6 'libquotient'"; # Converted to throw 2025-07-04 librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as its upstream is unmaintained"; # Added 2024-06-10 librdf = throw "'librdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2024-10-17 librdf_raptor = throw "librdf_raptor has been remove due to failing to build and being unmaintained"; # Added 2025-04-14 diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 9d67d8024bcc..0e635efa2316 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -202,8 +202,6 @@ makeScopeWithSplicing' { libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { }; - libquotient = callPackage ../development/libraries/libquotient { }; - libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { };