pyrox.dev / nixpkgs
lol
fork atom

kaidan: 0.10.1 -> 0.11.0 (#385339)

authored by kirillrdy and committed by GitHub db1f1f38 2a36a34c

+27 -18
unified split
+15 -9
pkgs/applications/networking/instant-messengers/kaidan/default.nix
··· 1 1 { 2 - mkDerivation, 2 + stdenv, 3 3 lib, 4 4 fetchFromGitLab, 5 5 cmake, 6 6 extra-cmake-modules, 7 7 pkg-config, 8 - qtquickcontrols2, 8 + wrapQtAppsHook, 9 + qtbase, 10 + qttools, 9 11 qtmultimedia, 10 12 qtlocation, 11 13 qqc2-desktop-style, 12 14 kirigami-addons, 13 - kirigami2, 15 + kirigami, 14 16 kio, 15 17 knotifications, 16 18 kquickimageedit, ··· 18 20 qxmpp, 19 21 sonnet, 20 22 gst_all_1, 23 + prison, 21 24 }: 22 25 23 - mkDerivation rec { 26 + stdenv.mkDerivation rec { 24 27 pname = "kaidan"; 25 - version = "0.10.1"; 28 + version = "0.11.0"; 26 29 27 30 src = fetchFromGitLab { 28 31 domain = "invent.kde.org"; 29 32 owner = "network"; 30 33 repo = pname; 31 34 rev = "v${version}"; 32 - hash = "sha256-u+8uNBDfszH5YJokie4A2QhW04ANq/JTwkMeu5gY0to="; 35 + hash = "sha256-8pC4vINeKSYY+LlVgCXUtBq9UjraPdTikBOwLBLeQ3Y="; 33 36 }; 34 37 35 38 nativeBuildInputs = [ 36 39 cmake 37 40 extra-cmake-modules 38 41 pkg-config 42 + wrapQtAppsHook 39 43 ]; 40 44 41 45 buildInputs = with gst_all_1; [ 42 - qtquickcontrols2 46 + qtbase 47 + qttools 43 48 qtmultimedia 44 49 qtlocation 45 50 qqc2-desktop-style 46 51 kirigami-addons 47 - kirigami2 52 + kirigami 48 53 kio 49 54 knotifications 50 55 kquickimageedit ··· 54 59 gstreamer 55 60 gst-plugins-bad 56 61 gst-plugins-base 57 - gst-plugins-good 62 + (gst-plugins-good.override { qt6Support = true; }) 63 + prison 58 64 ]; 59 65 postInstall = '' 60 66 qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+10 -7
pkgs/development/libraries/qxmpp/default.nix
··· 1 - { mkDerivation 1 + { stdenv 2 2 , lib 3 3 , fetchFromGitHub 4 4 , cmake 5 5 , pkg-config 6 + , wrapQtAppsNoGuiHook 7 + , qtbase 8 + , qca 6 9 , withGstreamer ? true 7 10 , gst_all_1 8 11 , withOmemo ? true 9 - , qca-qt5 10 12 , libomemo-c 11 13 }: 12 14 13 - mkDerivation rec { 15 + stdenv.mkDerivation rec { 14 16 pname = "qxmpp"; 15 - version = "1.10.0"; 17 + version = "1.10.1"; 16 18 17 19 src = fetchFromGitHub { 18 20 owner = "qxmpp-project"; 19 21 repo = pname; 20 22 rev = "v${version}"; 21 - sha256 = "sha256-pM0KxYoGMIukj5SX1MX5v4VJz5/zwNmaLP717o5++Ec="; 23 + hash = "sha256-mb8JMBV5M+0hFJLTxwYE47jB/FJKi/MPUwd3Nhan+QQ="; 22 24 }; 23 25 24 26 nativeBuildInputs = [ 25 - cmake 27 + cmake wrapQtAppsNoGuiHook 26 28 ] ++ lib.optionals (withGstreamer || withOmemo) [ 27 29 pkg-config 28 30 ]; ··· 32 34 gst-plugins-base 33 35 gst-plugins-good 34 36 ]) ++ lib.optionals withOmemo [ 35 - qca-qt5 37 + qtbase 38 + qca 36 39 libomemo-c 37 40 ]; 38 41 cmakeFlags = [
+2 -2
pkgs/top-level/all-packages.nix
··· 9024 9024 inherit (darwin.apple_sdk_12_3.libs) xpc; 9025 9025 }); 9026 9026 9027 - qxmpp = libsForQt5.callPackage ../development/libraries/qxmpp { }; 9027 + qxmpp = qt6Packages.callPackage ../development/libraries/qxmpp { }; 9028 9028 9029 9029 gnu-efi = if stdenv.hostPlatform.isEfi 9030 9030 then callPackage ../development/libraries/gnu-efi { } ··· 13945 13945 13946 13946 kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { }; 13947 13947 13948 - kaidan = libsForQt5.callPackage ../applications/networking/instant-messengers/kaidan { }; 13948 + kaidan = kdePackages.callPackage ../applications/networking/instant-messengers/kaidan { }; 13949 13949 13950 13950 kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { }; 13951 13951