talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

kdePackages: Gear 24.12 -> 25.04

Browse Source
This commit is contained in:
K900 2025-04-17 14:38:02 +03:00
parent 5db112e82f
commit 3a6c5166be
23 changed files with 831 additions and 884 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/kde/gear/akonadi-search/default.nix
View File

@ -18,7 +18,7 @@ mkKdeDerivation rec {
name = "${pname}-${version}";
src = sources.${pname};
sourceRoot = "${pname}-${version}/${cargoRoot}";
hash = "sha256-fx8q7b0KGEevn0DlMAGgAvQMXqZmBF8aINDwpaGyq7I=";
hash = "sha256-hdm4LfQcs4TTfBLzlZYJ0uzqfLxMXuYQExLGJg81W2U=";
};
extraNativeBuildInputs = [

2
pkgs/kde/gear/angelfish/default.nix
View File

@ -17,7 +17,7 @@ mkKdeDerivation rec {
# include version in the name so we invalidate the FOD
name = "${pname}-${version}";
src = sources.${pname};
hash = "sha256-5TMHytHLIjdzY6O1+V9do/JCfxFfBkYD+bd+FNLlrMk=";
hash = "sha256-FgzmWw8FZb+DNSf2n6H14Rq07+x1LzG9hX4hFetuqDw=";
};
extraNativeBuildInputs = [

4
pkgs/kde/gear/blinken/default.nix
View File

@ -1,14 +1,14 @@
{
mkKdeDerivation,
qtmultimedia,
qtsvg,
phonon,
}:
mkKdeDerivation {
pname = "blinken";
extraBuildInputs = [
qtmultimedia
qtsvg
phonon
];
meta.mainProgram = "blinken";
}

2
pkgs/kde/gear/default.nix
View File

@ -172,7 +172,6 @@
krecorder = callPackage ./krecorder { };
kreversi = callPackage ./kreversi { };
krfb = callPackage ./krfb { };
kross-interpreters = callPackage ./kross-interpreters { };
kruler = callPackage ./kruler { };
ksanecore = callPackage ./ksanecore { };
kshisen = callPackage ./kshisen { };
@ -237,6 +236,7 @@
plasmatube = callPackage ./plasmatube { };
poxml = callPackage ./poxml { };
qmlkonsole = callPackage ./qmlkonsole { };
qrca = callPackage ./qrca { };
rocs = callPackage ./rocs { };
signon-kwallet-extension = callPackage ./signon-kwallet-extension { };
skanlite = callPackage ./skanlite { };

5
pkgs/kde/gear/falkon/default.nix
View File

@ -9,11 +9,6 @@
mkKdeDerivation {
pname = "falkon";
# Fix build with PySide 6.9
# Submitted upstream: https://invent.kde.org/network/falkon/-/merge_requests/128
# FIXME: remove when merged
patches = [ ./qt-6.9.patch ];
extraNativeBuildInputs = [
qttools
qtwebchannel

25
pkgs/kde/gear/falkon/qt-6.9.patch
View File

@ -1,25 +0,0 @@
diff --git a/src/plugins/PyFalkon/typesystem_pyfalkon.xml b/src/plugins/PyFalkon/typesystem_pyfalkon.xml
index 45f23c49e..31eff876b 100644
--- a/src/plugins/PyFalkon/typesystem_pyfalkon.xml
+++ b/src/plugins/PyFalkon/typesystem_pyfalkon.xml
@@ -265,7 +265,7 @@
QList<QByteArray> version = QByteArray(Qz::VERSION).split('.');
PyObject *pyFalkonVersion = PyTuple_New(3);
for (int i = 0; i < 3; ++i)
- PyTuple_SET_ITEM(pyFalkonVersion, i, PyLong_FromLong(version[i].toInt()));
+ PyTuple_SetItem(pyFalkonVersion, i, PyLong_FromLong(version[i].toInt()));
PyModule_AddObject(module, "__version_info__", pyFalkonVersion);
PyModule_AddStringConstant(module, "__version__", Qz::VERSION);
</inject-code>
@@ -273,9 +273,9 @@
<template name="return_for_QFileDialog">
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, &amp;%6, %7);
%PYARG_0 = PyTuple_New(2);
- PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
+ PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
auto ARG6_PTR = &amp;%6;
- PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG6_TYPE](ARG6_PTR));
+ PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG6_TYPE](ARG6_PTR));
</template>
<suppress-warning text="Unable to translate type &quot;std::function&lt;QPoint (QSize)&gt;&quot;:*"/>

12
pkgs/kde/gear/kalarm/default.nix
View File

@ -1,13 +1,15 @@
{
mkKdeDerivation,
libcanberra,
libvlc,
pkg-config,
mpv,
}:
mkKdeDerivation {
pname = "kalarm";
extraBuildInputs = [
libcanberra
libvlc
extraCmakeFlags = [
"-DENABLE_LIBVLC=0"
];
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [ mpv ];
}

2
pkgs/kde/gear/kcalc/default.nix
View File

@ -2,6 +2,7 @@
mkKdeDerivation,
qt5compat,
gmp,
libmpc,
mpfr,
kdoctools,
}:
@ -11,6 +12,7 @@ mkKdeDerivation {
extraBuildInputs = [
qt5compat
gmp
libmpc
mpfr
kdoctools
];

8
pkgs/kde/gear/kdeconnect-kde/default.nix
View File

@ -10,7 +10,6 @@
wayland,
wayland-protocols,
libfakekey,
fetchpatch,
}:
mkKdeDerivation {
pname = "kdeconnect-kde";
@ -19,13 +18,6 @@ mkKdeDerivation {
(replaceVars ./hardcode-sshfs-path.patch {
sshfs = lib.getExe sshfs;
})
# Fix build with Qt 6.9
# FIXME: remove in next update
(fetchpatch {
url = "https://invent.kde.org/network/kdeconnect-kde/-/commit/120a089ed8a45176289b8f1addf044817b13aa7b.patch";
hash = "sha256-ifos4wMFimhtksqMhhHPfHrEV5+PSXLdapgqGwQj/Hc=";
})
];
# Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically

15
pkgs/kde/gear/kdenetwork-filesharing/samba-hint.patch
View File

@ -1,12 +1,13 @@
diff --git a/samba/filepropertiesplugin/qml/MissingSambaPage.qml b/samba/filepropertiesplugin/qml/MissingSambaPage.qml
index 4419b25..f16e70b 100644
--- a/samba/filepropertiesplugin/qml/MissingSambaPage.qml
+++ b/samba/filepropertiesplugin/qml/MissingSambaPage.qml
@@ -16,7 +16,7 @@ Item {
@@ -17,7 +17,7 @@ Item {
icon.name: "dialog-error"
- text: xi18nc("@info", "The <application>Samba</application> file sharing service must be installed before folders can be shared.")
- explanation: i18n("Because this distro does not include PackageKit, we cannot show you a nice \"Install it\" button, and you will have to use your package manager to install the <command>samba</command> server package manually.")
+ text: xi18nc("@info", "File sharing service unavailable")
text: xi18nc("@info", "File sharing service unavailable")
- explanation: i18n("Please ensure the Samba service is enabled and running.\nIf you haven't disabled it manually, consider reporting a bug to your distribution.")
+ explanation: i18n("Please enable the `services.samba.enable` and `services.samba.usershares.enable` options in your NixOS configuration.")
}
}
helpfulAction: Kirigami.Action {
icon.name: "mail-message-new"

25
pkgs/kde/gear/kdenlive/default.nix
View File

@ -1,17 +1,19 @@
{
mkKdeDerivation,
replaceVars,
mediainfo,
mlt,
glaxnimate,
ffmpeg-full,
pkg-config,
shared-mime-info,
qtsvg,
qtmultimedia,
qtnetworkauth,
qqc2-desktop-style,
ffmpeg-full,
mediainfo,
mlt,
shared-mime-info,
libv4l,
open-timeline-io,
frei0r,
glaxnimate,
}:
mkKdeDerivation {
pname = "kdenlive";
@ -23,7 +25,14 @@ mkKdeDerivation {
})
];
extraNativeBuildInputs = [ shared-mime-info ];
extraCmakeFlags = [
"-DFETCH_OTIO=0"
];
extraNativeBuildInputs = [
pkg-config
shared-mime-info
];
extraBuildInputs = [
qtsvg
@ -32,8 +41,10 @@ mkKdeDerivation {
qqc2-desktop-style
mlt
ffmpeg-full
libv4l
mlt
open-timeline-io
];
qtWrapperArgs = [

4
pkgs/kde/gear/kdepim-addons/default.nix
View File

@ -1,6 +1,7 @@
{
mkKdeDerivation,
sources,
pkg-config,
rustPlatform,
cargo,
rustc,
@ -20,10 +21,11 @@ mkKdeDerivation rec {
name = "${pname}-${version}";
src = sources.${pname};
sourceRoot = "${pname}-${version}/${cargoRoot}";
hash = "sha256-v1TJ8xu4zXXig+ESYT0ZL6l1gOTbqyVA1P/6T/YnW0k=";
hash = "sha256-66FqoD3JoPbtg6zc32uaPYaTo4zHxywiN8wPI2jtcjc=";
};
extraNativeBuildInputs = [
pkg-config
rustPlatform.cargoSetupHook
cargo
rustc

4
pkgs/kde/gear/keysmith/default.nix
View File

@ -7,6 +7,10 @@
mkKdeDerivation {
pname = "keysmith";
patches = [
./optional-runtime-dependencies.patch
];
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [
qtsvg

13
pkgs/kde/gear/keysmith/optional-runtime-dependencies.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55ce9e0..86af3e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,7 @@ find_package(KF6CoreAddons ${KF_MIN_VERSION} REQUIRED)
find_package(KF6I18n ${KF_MIN_VERSION} REQUIRED)
find_package(KF6Config ${KF_MIN_VERSION} REQUIRED)
-ecm_find_qmlmodule(org.kde.prison.scanner REQUIRED)
+ecm_find_qmlmodule(org.kde.prison.scanner)
ecm_set_disabled_deprecation_versions(QT 6.0.0
KF 6.12.0

4
pkgs/kde/gear/klettres/default.nix
View File

@ -1,14 +1,14 @@
{
mkKdeDerivation,
qtmultimedia,
qtsvg,
phonon,
}:
mkKdeDerivation {
pname = "klettres";
extraBuildInputs = [
qtmultimedia
qtsvg
phonon
];
meta.mainProgram = "klettres";
}

10
pkgs/kde/gear/kpimtextedit/default.nix
View File

@ -1,19 +1,9 @@
{
mkKdeDerivation,
qt5compat,
fetchpatch,
}:
mkKdeDerivation {
pname = "kpimtextedit";
# Fix build with Qt 6.9
# FIXME: remove in 25.04
patches = [
(fetchpatch {
url = "https://invent.kde.org/pim/kpimtextedit/-/commit/2c36ea1bdd1dcb60cd042a10668d64447484615d.patch";
hash = "sha256-Uo8yl5v9tpjXRF1AtlCGnFhprOEug9WCdmfyb+DHSUQ=";
})
];
extraBuildInputs = [ qt5compat ];
}

10
pkgs/kde/gear/krdc/default.nix
View File

@ -1,5 +1,4 @@
{
lib,
mkKdeDerivation,
pkg-config,
shared-mime-info,
@ -7,17 +6,11 @@
libssh,
libvncserver,
freerdp,
fuse3,
}:
mkKdeDerivation {
pname = "krdc";
# freerdp3 is not yet supported by 24.12 version of krdc
# can be dropped with 25.04 kdePackages release, as that will default to freerdp3
# backporting freerdp3 support is non-trivial
cmakeFlags = [
(lib.cmakeBool "WITH_RDP" false)
];
extraNativeBuildInputs = [
pkg-config
shared-mime-info
@ -28,6 +21,7 @@ mkKdeDerivation {
libssh
libvncserver
freerdp
fuse3
];
meta.mainProgram = "krdc";

11
pkgs/kde/gear/kross-interpreters/default.nix
View File

@ -1,11 +0,0 @@
{
mkKdeDerivation,
extra-cmake-modules,
}:
mkKdeDerivation {
pname = "kross-interpreters";
extraBuildInputs = [ extra-cmake-modules ];
# FIXME(qt5)
meta.broken = true;
}

15
pkgs/kde/gear/libktorrent/default.nix
View File

@ -5,25 +5,10 @@
boost,
gmp,
libgcrypt,
fetchpatch,
}:
mkKdeDerivation {
pname = "libktorrent";
# Backport patches to fix build with Qt 6.9
# FIXME: remove in 25.04
patches = [
(fetchpatch {
url = "https://invent.kde.org/network/libktorrent/-/commit/4bcf7eb1e0cb781286eae33751acd8e827080ec5.patch";
includes = [ "src/utp/connection.cpp" ];
hash = "sha256-gj5jLViuzttfzCrx/izmajJiH3vE9TkfsXS+1r/qGNc=";
})
(fetchpatch {
url = "https://invent.kde.org/network/libktorrent/-/commit/4f73038c74b5d72b2f7f1377c7bf037f111e965d.patch";
hash = "sha256-dQeZLmnagxBOUR2hnxF65jIRSAntTrEggxdUf3NNzDE=";
})
];
extraNativeBuildInputs = [ doxygen ];
extraBuildInputs = [ qt5compat ];
extraPropagatedBuildInputs = [

8
pkgs/kde/gear/mailcommon/default.nix
View File

@ -1,17 +1,17 @@
{
mkKdeDerivation,
qtwebengine,
qtmultimedia,
qttools,
qtwebengine,
libxslt,
phonon,
}:
mkKdeDerivation {
pname = "mailcommon";
extraNativeBuildInputs = [ libxslt ];
extraBuildInputs = [
qtwebengine
qtmultimedia
qttools
phonon
qtwebengine
];
}

14
pkgs/kde/gear/marble/default.nix
View File

@ -17,24 +17,10 @@
gpsd,
protobuf,
shapelib,
fetchpatch,
}:
mkKdeDerivation {
pname = "marble";
# Fix build with Qt 6.9
# FIXME: remove in 25.04
patches = [
(fetchpatch {
url = "https://invent.kde.org/education/marble/-/commit/8d21b43f569adcd3bb76d3f9d921f2aaddb2c303.patch";
hash = "sha256-UdY/4yxRMHcLb76A3elOLIEH+4v+AgVeUbUKzdavXHA=";
})
(fetchpatch {
url = "https://invent.kde.org/education/marble/-/commit/a14a3a911f5a8f152783a97410267a6fd98cce48.patch";
hash = "sha256-WY28+Ea7DQ3qkNed25EtCtAKlM3Y/57gyM/DHQqdfCc=";
})
];
extraNativeBuildInputs = [
perl
pkg-config

11
pkgs/kde/gear/qrca/default.nix Normal file
View File

@ -0,0 +1,11 @@
{
mkKdeDerivation,
pkg-config,
qtmultimedia,
}:
mkKdeDerivation {
pname = "qrca";
extraNativeBuildInputs = [ pkg-config ];
extraBuildInputs = [ qtmultimedia ];
}

1509
pkgs/kde/generated/sources/gear.json
View File

File diff suppressed because it is too large Load Diff