KDE-frameworks: 5.85 -> 5.86#137669
Conversation
|
@Artturin could you review this, please? |
| mkDerivation rec { | ||
| pname = "plasma-wayland-protocols"; | ||
| version = "1.3.0"; | ||
| version = "1.4.0"; |
There was a problem hiding this comment.
Why is this not part of srcs?
There was a problem hiding this comment.
I'm not sure, maybe this library is not considered part of the official kde-frameworks distribution/release, and/or has different release schedule.
|
You might want to add diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix
index 3602cb7b061..bd010f3f11c 100644
--- a/pkgs/development/libraries/kde-frameworks/karchive.nix
+++ b/pkgs/development/libraries/kde-frameworks/karchive.nix
@@ -1,13 +1,13 @@
{
mkDerivation,
extra-cmake-modules,
- bzip2, xz, qtbase, zlib,
+ bzip2, xz, qtbase, zlib, zstd
}:
mkDerivation {
name = "karchive";
nativeBuildInputs = [ extra-cmake-modules ];
- buildInputs = [ bzip2 xz zlib ];
+ buildInputs = [ bzip2 xz zlib zstd ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
} |
|
…and another one to satisfy a runtime requirement of diff --git a/pkgs/development/libraries/kde-frameworks/kcontacts.nix b/pkgs/development/libraries/kde-frameworks/kcontacts.nix
index 74b6652aee2..56887b775f4 100644
--- a/pkgs/development/libraries/kde-frameworks/kcontacts.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcontacts.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules,
+ extra-cmake-modules, isocodes,
kcoreaddons, kconfig, kcodecs, ki18n, qtbase,
}:
@@ -9,6 +9,9 @@ mkDerivation {
meta = {
license = [ lib.licenses.lgpl21 ];
};
+ propagatedBuildInputs = [
+ isocodes
+ ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ];
outputs = [ "out" "dev" ]; |
Suggested by @eliasp, to improve compatibility and address missing runtime dependency.
|
First, it fails completely to build: After adding
This fixes most of those issues for me: diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index 47b958ea0b3..5a2fa7f30d3 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -1,8 +1,9 @@
{
- mkDerivation, fetchpatch,
+ stdenv, lib, mkDerivation, fetchpatch,
extra-cmake-modules, kdoctools, qttools,
+ acl, attr, libkrb5, util-linuxMinimal ? null,
karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
- kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
+ kdbusaddons, kded, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
qtbase, qtscript, qtx11extras, solid, kcrash
}:
@@ -11,9 +12,13 @@ mkDerivation {
name = "kio";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
+ libkrb5 # provides GSSAPI support, libheimdal would work as well
karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications
ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras
kcrash
+ ] ++ lib.lists.optionals stdenv.isLinux [
+ acl attr # both are needed for ACL support
+ util-linuxMinimal # provides libmount
];
propagatedBuildInputs = [
kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kserviceThere's one remaining issue of which I'm not sure how to properly solve it. It complains about the Adding it as |
|
@eliasp |
|
…aand another one in Fix: diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix
index b775fcbef8f..6d170c0bb12 100644
--- a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix
@@ -3,7 +3,7 @@
extra-cmake-modules,
attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes,
kio, kitemviews, kpackage, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase,
- qtdeclarative, kirigami2,
+ qtdeclarative, kirigami2, syndication,
}:
mkDerivation {
@@ -12,7 +12,7 @@ mkDerivation {
buildInputs = [
karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews
kpackage
- ktextwidgets kwidgetsaddons qtbase qtdeclarative kirigami2
+ ktextwidgets kwidgetsaddons qtbase qtdeclarative kirigami2 syndication
];
propagatedBuildInputs = [ attica kservice kxmlgui ];
patches = [ |
|
It seems |
|
Fix in and… diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix
index 7e4d002e2a1..0f376ce9ec3 100644
--- a/pkgs/development/libraries/kde-frameworks/purpose.nix
+++ b/pkgs/development/libraries/kde-frameworks/purpose.nix
@@ -1,14 +1,14 @@
{
- mkDerivation, extra-cmake-modules, qtbase
-, qtdeclarative, kconfig, kcoreaddons, ki18n, kio, kirigami2
-, fetchpatch
+ mkDerivation, extra-cmake-modules, intltool, qtbase
+, accounts-qt, qtdeclarative, kaccounts-integration, kconfig, kcoreaddons, ki18n, kio, kirigami2
+, fetchpatch, signond
}:
mkDerivation {
name = "purpose";
- nativeBuildInputs = [ extra-cmake-modules ];
+ nativeBuildInputs = [ extra-cmake-modules intltool ];
buildInputs = [
- qtbase qtdeclarative kconfig kcoreaddons
- ki18n kio kirigami2
+ qtbase accounts-qt qtdeclarative kaccounts-integration kconfig kcoreaddons
+ ki18n kio kirigami2 signond
];
}Furthermore, |
49108b4 to
fd7ca42
Compare
|
I accepted the last suggestion, but I think fixing purpose's last runtime warnings is getting beyond the purpose of this PR. I'd say minor things like this could be looked on only if someone misses some functionality, but I assume this would be detected at runtime if needed. |
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Motivation for this change
Follow up of #136341 , bump KDE-frameworks to most recent version.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)