gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kdePackages: Gear 25.08 -> 25.12 (#464987)

Browse Source
This commit is contained in:
K900
2025-12-11 14:46:41 +00:00
committed by GitHub
parent 66b8a3f0e1 0849cef570
commit b86f909be9
18 changed files with 821 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/kquickimageedit/default.nix
+11 -2
View File
@@ -6,18 +6,19 @@
kdePackages,
qtbase,
qtdeclarative,
opencv,
}:
stdenv.mkDerivation rec {
pname = "kquickimageeditor";
version = "0.5.1";
version = "0.6.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "libraries";
repo = "kquickimageeditor";
rev = "v${version}";
sha256 = "sha256-8TJBg42E9lNbLpihjtc5Z/drmmSGQmic8yO45yxSNQ4=";
sha256 = "sha256-NhZ9aAZuIk9vUL2X7eivNbEs0zahuQpy8kl6dSdy5Lo=";
};
nativeBuildInputs = [ extra-cmake-modules ];
@@ -25,6 +26,14 @@ stdenv.mkDerivation rec {
kdePackages.kirigami
qtbase
qtdeclarative
(opencv.override {
enableCuda = false; # fails to compile, disabled in case someone sets config.cudaSupport
enabledModules = [
"core"
"imgproc"
];
runAccuracyTests = false; # tests will fail because of missing plugins but that's okay
})
];
dontWrapQtApps = true;
pkgs/kde/default.nix
+6 -7
View File
@@ -37,8 +37,6 @@ let
inherit (v) version;
}
) allUrls;
debugAlias = set: lib.dontRecurseIntoAttrs (lib.filterAttrs (k: v: !v.meta.broken) set);
in
(
qt6Packages
@@ -46,12 +44,13 @@ let
// gear
// plasma
// {
inherit sources;
# Aliases to simplify test-building entire package sets
frameworks = debugAlias frameworks;
gear = debugAlias gear;
plasma = debugAlias plasma;
inherit
sources
frameworks
gear
plasma
;
mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) { };
pkgs/kde/gear/calligra/default.nix
-9
View File
@@ -1,7 +1,6 @@
{
mkKdeDerivation,
lib,
fetchpatch,
boost,
eigen,
gsl,
@@ -27,14 +26,6 @@
mkKdeDerivation {
pname = "calligra";
patches = [
# Fix build with Poppler 25.10
(fetchpatch {
url = "https://invent.kde.org/office/calligra/-/commit/45e8b302bce1d318f310ea13599d7ce84acc477e.patch";
hash = "sha256-TECB3eo24+gI8TXL8gw9BIdFWqw0JBKCWpoNVqBSan8=";
})
];
extraBuildInputs = [
boost
eigen
pkgs/kde/gear/ffmpegthumbs/default.nix
+2
View File
@@ -1,9 +1,11 @@
{
mkKdeDerivation,
pkg-config,
ffmpeg,
}:
mkKdeDerivation {
pname = "ffmpegthumbs";
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [ ffmpeg ];
}
pkgs/kde/gear/itinerary/default.nix
+2
View File
@@ -3,6 +3,7 @@
pkg-config,
qtlocation,
qtpositioning,
qcoro,
shared-mime-info,
libical,
}:
@@ -19,6 +20,7 @@ mkKdeDerivation {
extraBuildInputs = [
qtlocation
qtpositioning
qcoro
libical
];
meta.mainProgram = "itinerary";
pkgs/kde/gear/kalarm/default.nix
+5 -1
View File
@@ -1,6 +1,7 @@
{
mkKdeDerivation,
pkg-config,
kauth,
mpv,
}:
mkKdeDerivation {
@@ -11,5 +12,8 @@ mkKdeDerivation {
];
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [ mpv ];
extraBuildInputs = [
kauth
mpv
];
}
pkgs/kde/gear/kamoso/default.nix
+2
View File
@@ -1,6 +1,7 @@
{
mkKdeDerivation,
pkg-config,
kirigami-addons,
gst_all_1,
frei0r,
}:
@@ -9,6 +10,7 @@ mkKdeDerivation {
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [
kirigami-addons
gst_all_1.gst-plugins-base
(gst_all_1.gst-plugins-good.override { qt6Support = true; })
gst_all_1.gst-plugins-bad
pkgs/kde/gear/kclock/default.nix
+6
View File
@@ -1,13 +1,19 @@
{
mkKdeDerivation,
pkg-config,
qtsvg,
qtmultimedia,
wayland-protocols,
}:
mkKdeDerivation {
pname = "kclock";
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [
qtsvg
qtmultimedia
wayland-protocols
];
}
pkgs/kde/gear/kdeconnect-kde/default.nix
-7
View File
@@ -10,7 +10,6 @@
wayland,
wayland-protocols,
libfakekey,
fetchpatch,
}:
mkKdeDerivation {
pname = "kdeconnect-kde";
@@ -19,12 +18,6 @@ mkKdeDerivation {
(replaceVars ./hardcode-sshfs-path.patch {
sshfs = lib.getExe sshfs;
})
# Fix CVE-2025-66270 (https://kde.org/info/security/advisory-20251128-1.txt)
(fetchpatch {
name = "CVE-2025-66270.patch";
url = "https://invent.kde.org/network/kdeconnect-kde/-/commit/4e53bcdd5d4c28bd9fefd114b807ce35d7b3373e.patch";
hash = "sha256-qtcXNJ5qL4xtZQ70R/wWVCzFGzXNltr6XTgs0fpkTi4=";
})
];
# Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically
pkgs/kde/gear/kdenetwork-filesharing/dependency-paths.patch
+20 -34
View File
@@ -1,71 +1,57 @@
diff --git a/samba/filepropertiesplugin/authhelper.cpp b/samba/filepropertiesplugin/authhelper.cpp
index 6cbbd90..ae1d696 100644
index b45b25f..b71554f 100644
--- a/samba/filepropertiesplugin/authhelper.cpp
+++ b/samba/filepropertiesplugin/authhelper.cpp
@@ -49,7 +49,7 @@ ActionReply AuthHelper::isuserknown(const QVariantMap &args)
@@ -50,7 +50,7 @@ ActionReply AuthHelper::isuserknown(const QVariantMap &args)
}
QProcess p;
- const auto program = QStringLiteral("pdbedit");
+ const auto program = QStringLiteral("@samba@/bin/pdbedit");
const auto arguments = QStringList({QStringLiteral("--debuglevel=0"), QStringLiteral("--user"), username });
const auto arguments = QStringList({QStringLiteral("--debuglevel=0"), QStringLiteral("--user"), username});
p.setProgram(program);
p.setArguments(arguments);
@@ -88,7 +88,7 @@ ActionReply AuthHelper::createuser(const QVariantMap &args)
@@ -92,7 +92,7 @@ ActionReply AuthHelper::createuser(const QVariantMap &args)
}
QProcess p;
- p.setProgram(QStringLiteral("smbpasswd"));
+ p.setProgram(QStringLiteral("@samba@/bin/smbpasswd"));
p.setArguments({
QStringLiteral("-L"), /* local mode */
QStringLiteral("-s"), /* read from stdin */
@@ -152,7 +152,7 @@ ActionReply AuthHelper::addtogroup(const QVariantMap &args)
QStringLiteral("-m"),
QStringLiteral("{%1}").arg(user.value()) });
p.setArguments({QStringLiteral("-L"), /* local mode */
QStringLiteral("-s"), /* read from stdin */
QStringLiteral("-D"),
@@ -155,7 +155,7 @@ ActionReply AuthHelper::addtogroup(const QVariantMap &args)
p.setArguments(
{QStringLiteral("group"), QStringLiteral("mod"), QStringLiteral("{%1}").arg(group), QStringLiteral("-m"), QStringLiteral("{%1}").arg(user.value())});
#elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
- p.setProgram(QStringLiteral("/usr/sbin/usermod"));
+ p.setProgram(QStringLiteral("@usermod@"));
p.setArguments({
QStringLiteral("--append"),
QStringLiteral("--groups"),
p.setArguments({QStringLiteral("--append"), QStringLiteral("--groups"), group, user.value()});
#else
#error "Platform lacks group management support. Please add support."
diff --git a/samba/filepropertiesplugin/groupmanager.cpp b/samba/filepropertiesplugin/groupmanager.cpp
index a2ba851..d54f6ce 100644
index 948f428..f25e549 100644
--- a/samba/filepropertiesplugin/groupmanager.cpp
+++ b/samba/filepropertiesplugin/groupmanager.cpp
@@ -18,7 +18,7 @@ GroupManager::GroupManager(QObject *parent)
{
metaObject()->invokeMethod(this, [this] {
QMetaObject::invokeMethod(this, [this] {
auto proc = new QProcess;
- proc->setProgram(QStringLiteral("testparm"));
+ proc->setProgram(QStringLiteral("@samba@/bin/testparm"));
proc->setArguments({QStringLiteral("--debuglevel=0"),
QStringLiteral("--suppress-prompt"),
QStringLiteral("--verbose"),
diff --git a/samba/filepropertiesplugin/sambausershareplugin.cpp b/samba/filepropertiesplugin/sambausershareplugin.cpp
index 4f6642e..86ea121 100644
--- a/samba/filepropertiesplugin/sambausershareplugin.cpp
+++ b/samba/filepropertiesplugin/sambausershareplugin.cpp
@@ -112,7 +112,8 @@ SambaUserSharePlugin::SambaUserSharePlugin(QObject *parent)
bool SambaUserSharePlugin::isSambaInstalled()
{
return QFile::exists(QStringLiteral("/usr/sbin/smbd"))
- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"));
+ || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))
+ || QFile::exists(QStringLiteral("/run/current-system/sw/bin/smbd"));
}
void SambaUserSharePlugin::showSambaStatus()
diff --git a/samba/filepropertiesplugin/usermanager.cpp b/samba/filepropertiesplugin/usermanager.cpp
index 29238ce..ff20fcb 100644
index 3be3b8c..66fd965 100644
--- a/samba/filepropertiesplugin/usermanager.cpp
+++ b/samba/filepropertiesplugin/usermanager.cpp
@@ -138,7 +138,7 @@ bool UserManager::canManageSamba() const
@@ -134,7 +134,7 @@ bool UserManager::canManageSamba() const
void UserManager::load()
{
auto proc = new QProcess(this);
- proc->setProgram(QStringLiteral("testparm"));
+ proc->setProgram(QStringLiteral("@samba@/bin/testparm"));
proc->setArguments({
QStringLiteral("--debuglevel=0"),
QStringLiteral("--suppress-prompt"),
proc->setArguments({QStringLiteral("--debuglevel=0"),
QStringLiteral("--suppress-prompt"),
QStringLiteral("--verbose"),
pkgs/kde/gear/kdenlive/default.nix
+2
View File
@@ -9,6 +9,7 @@
qtsvg,
qtmultimedia,
qtnetworkauth,
kddockwidgets,
qqc2-desktop-style,
libv4l,
opentimelineio,
@@ -38,6 +39,7 @@ mkKdeDerivation {
qtmultimedia
qtnetworkauth
kddockwidgets
qqc2-desktop-style
ffmpeg-full
pkgs/kde/gear/kpkpass/default.nix
+2
View File
@@ -1,9 +1,11 @@
{
mkKdeDerivation,
shared-mime-info,
qtdeclarative,
}:
mkKdeDerivation {
pname = "kpkpass";
extraNativeBuildInputs = [ shared-mime-info ];
extraBuildInputs = [ qtdeclarative ];
}
pkgs/kde/gear/kpublictransport/default.nix
+5 -1
View File
@@ -1,11 +1,15 @@
{
mkKdeDerivation,
qtdeclarative,
qtlocation,
pkg-config,
}:
mkKdeDerivation {
pname = "kpublictransport";
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [ qtdeclarative ];
extraBuildInputs = [
qtdeclarative
qtlocation
];
}
pkgs/kde/gear/lokalize/default.nix
+6 -1
View File
@@ -1,11 +1,16 @@
{
mkKdeDerivation,
pkg-config,
kddockwidgets,
hunspell,
}:
mkKdeDerivation {
pname = "lokalize";
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [ hunspell ];
extraBuildInputs = [
kddockwidgets
hunspell
];
}
pkgs/kde/gear/qrca/default.nix
+5 -1
View File
@@ -2,10 +2,14 @@
mkKdeDerivation,
pkg-config,
qtmultimedia,
kirigami-addons,
}:
mkKdeDerivation {
pname = "qrca";
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [ qtmultimedia ];
extraBuildInputs = [
qtmultimedia
kirigami-addons
];
}
pkgs/kde/gear/rocs/default.nix
-2
View File
@@ -6,6 +6,4 @@ mkKdeDerivation {
pname = "rocs";
extraBuildInputs = [ boost ];
# FIXME(qt5)
meta.broken = true;
}
pkgs/kde/gear/umbrello/default.nix
-2
View File
@@ -1,6 +1,4 @@
{ mkKdeDerivation }:
mkKdeDerivation {
pname = "umbrello";
# FIXME(qt5)
meta.broken = true;
}
pkgs/kde/generated/sources/gear.json
+747 -747
View File
File diff suppressed because it is too large Load Diff