From c20742614c340fe1f2e39152521a969335652176 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 6 Jun 2025 15:28:19 +0800 Subject: [PATCH 1/5] qxmpp: move to by-name --- .../qxmpp/default.nix => by-name/qx/qxmpp/package.nix} | 10 ++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-) rename pkgs/{development/libraries/qxmpp/default.nix => by-name/qx/qxmpp/package.nix} (92%) diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/by-name/qx/qxmpp/package.nix similarity index 92% rename from pkgs/development/libraries/qxmpp/default.nix rename to pkgs/by-name/qx/qxmpp/package.nix index 3fe969629394..beb89bf5b35b 100644 --- a/pkgs/development/libraries/qxmpp/default.nix +++ b/pkgs/by-name/qx/qxmpp/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, cmake, pkg-config, - wrapQtAppsNoGuiHook, - qtbase, - qca, + kdePackages, withGstreamer ? true, gst_all_1, withOmemo ? true, @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - wrapQtAppsNoGuiHook + kdePackages.wrapQtAppsNoGuiHook ] ++ lib.optionals (withGstreamer || withOmemo) [ pkg-config @@ -43,8 +41,8 @@ stdenv.mkDerivation rec { ] ) ++ lib.optionals withOmemo [ - qtbase - qca + kdePackages.qtbase + kdePackages.qca libomemo-c ]; cmakeFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 339dc8a399fe..3c933c33ed6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8327,8 +8327,6 @@ with pkgs; } ); - qxmpp = qt6Packages.callPackage ../development/libraries/qxmpp { }; - gnutls = callPackage ../development/libraries/gnutls { util-linux = util-linuxMinimal; # break the cyclic dependency autoconf = buildPackages.autoconf269; From a7dcf1e09afc97b685062045eff322f017af3749 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 6 Jun 2025 15:31:06 +0800 Subject: [PATCH 2/5] qxmpp: avoid with lib; --- pkgs/by-name/qx/qxmpp/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix index beb89bf5b35b..7c5380d6b14f 100644 --- a/pkgs/by-name/qx/qxmpp/package.nix +++ b/pkgs/by-name/qx/qxmpp/package.nix @@ -57,11 +57,11 @@ stdenv.mkDerivation rec { "-DBUILD_OMEMO=ON" ]; - meta = with lib; { + meta = { description = "Cross-platform C++ XMPP client and server library"; homepage = "https://github.com/qxmpp-project/qxmpp"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ astro ]; - platforms = with platforms; linux; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ astro ]; + platforms = with lib.platforms; linux; }; } From c1c8a4150e02656c745594feb0072e42d9886726 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 6 Jun 2025 15:32:43 +0800 Subject: [PATCH 3/5] qxmpp: use finalAttrs --- pkgs/by-name/qx/qxmpp/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix index 7c5380d6b14f..d8cf5f1f85e1 100644 --- a/pkgs/by-name/qx/qxmpp/package.nix +++ b/pkgs/by-name/qx/qxmpp/package.nix @@ -11,14 +11,14 @@ libomemo-c, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qxmpp"; version = "1.10.2"; src = fetchFromGitHub { owner = "qxmpp-project"; - repo = pname; - rev = "v${version}"; + repo = "qxmpp"; + rev = "v${finalAttrs.version}"; hash = "sha256-M3F4tNIO3RvDxk/lce8/J6kmQtnsGLILQ15uEzgyfds="; }; @@ -64,4 +64,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ astro ]; platforms = with lib.platforms; linux; }; -} +}) From a72edd6dc1b86cd2d240ac9e31bdfa524c020bf7 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 6 Jun 2025 15:35:23 +0800 Subject: [PATCH 4/5] qxmpp: update upstream --- pkgs/by-name/qx/qxmpp/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix index d8cf5f1f85e1..c1b83ef71a50 100644 --- a/pkgs/by-name/qx/qxmpp/package.nix +++ b/pkgs/by-name/qx/qxmpp/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitHub, + fetchFromGitLab, cmake, pkg-config, kdePackages, @@ -15,10 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qxmpp"; version = "1.10.2"; - src = fetchFromGitHub { - owner = "qxmpp-project"; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "libraries"; repo = "qxmpp"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-M3F4tNIO3RvDxk/lce8/J6kmQtnsGLILQ15uEzgyfds="; }; @@ -59,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Cross-platform C++ XMPP client and server library"; - homepage = "https://github.com/qxmpp-project/qxmpp"; + homepage = "https://invent.kde.org/libraries/qxmpp"; license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ astro ]; platforms = with lib.platforms; linux; From d02baa0b676710692b4a559e5e79cb8e1e5b4b4e Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 6 Jun 2025 15:37:06 +0800 Subject: [PATCH 5/5] qxmpp: 1.10.2 -> 1.10.4 --- pkgs/by-name/qx/qxmpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix index c1b83ef71a50..de253a65b997 100644 --- a/pkgs/by-name/qx/qxmpp/package.nix +++ b/pkgs/by-name/qx/qxmpp/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qxmpp"; - version = "1.10.2"; + version = "1.10.4"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = "qxmpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-M3F4tNIO3RvDxk/lce8/J6kmQtnsGLILQ15uEzgyfds="; + hash = "sha256-iSsQKVfcH5AjX+bURYK7UPdZKWFX6WaFSrpeRC5IE/0="; }; nativeBuildInputs =