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

kdePackages: Gear 24.02 -> 24.05

Browse Source 
- kio-extras-kf5 moved to misc because of release schedule weirdness
- calindori ported to KF6, reenabled
- some build fixes all over
- add 7zip to a bunch of games for SVG compression
This commit is contained in:
K900 2024-05-23 14:19:54 +03:00
parent 8402044163
commit c7d9fae3fd
36 changed files with 952 additions and 853 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maintainers/scripts/kde/collect-missing-deps.py
View File

@ -80,6 +80,11 @@ OK_MISSING_BY_PACKAGE = {
"plasma-desktop": {
"scim", # upstream is dead, not packaged in Nixpkgs
},
"poppler-qt6": {
"gobject-introspection-1.0", # we don't actually want to build the GTK variant
"gdk-pixbuf-2.0",
"gtk+-3.0",
},
"powerdevil": {
"DDCUtil", # cursed, intentionally disabled
},
@ -87,6 +92,9 @@ OK_MISSING_BY_PACKAGE = {
"Qt6Qml", # tests only
"Qt6Quick",
},
"skladnik": {
"POVRay", # too expensive to rerender all the assets
},
"syntax-highlighting": {
"XercesC", # only used for extra validation at build time
}

2
pkgs/kde/default.nix
View File

@ -3,7 +3,6 @@
generateSplicesForMkScope,
makeScopeWithSplicing',
fetchurl,
fetchFromGitLab,
libsForQt5,
qt6Packages,
cmark,
@ -65,6 +64,7 @@
kdiagram = self.callPackage ./misc/kdiagram {};
kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {};
kirigami-addons = self.callPackage ./misc/kirigami-addons {};
kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {};
kio-fuse = self.callPackage ./misc/kio-fuse {};
ktextaddons = self.callPackage ./misc/ktextaddons {};
kunifiedpush = self.callPackage ./misc/kunifiedpush {};

4
pkgs/kde/gear/accessibility-inspector/default.nix Normal file
View File

@ -0,0 +1,4 @@
{mkKdeDerivation}:
mkKdeDerivation {
pname = "accessibility-inspector";
}

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

@ -7,7 +7,7 @@
cargo,
rustc,
# provided as callPackage input to enable easier overrides through overlays
cargoHash ? "sha256-fY0mQiYS/CMThOVsWp8NgxpWfUph2dZ7hj7W5JUJ2J4=",
cargoHash ? "sha256-xT1SkW5iJy5Y9CK0CSxp+08XXjrbljxZzwYo2fEqxYE=",
}:
mkKdeDerivation rec {
pname = "akonadi-search";

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

@ -8,7 +8,7 @@
cargo,
rustc,
# provided as callPackage input to enable easier overrides through overlays
cargoHash ? "sha256-QJZJqdixPThgiKnruKetmzhbvtY/MsGy4v+OdQiEFR8=",
cargoHash ? "sha256-94f4DKRXcp3o6l3zbQzCpH2ZOztZMEAHa9ookPxbeDU=",
qcoro,
}:
mkKdeDerivation rec {

10
pkgs/kde/gear/audex/default.nix Normal file
View File

@ -0,0 +1,10 @@
{
mkKdeDerivation,
libcdio,
libcdio-paranoia,
}:
mkKdeDerivation {
pname = "audex";
extraBuildInputs = [libcdio libcdio-paranoia];
}

3
pkgs/kde/gear/bovo/default.nix
View File

@ -1,10 +1,13 @@
{
mkKdeDerivation,
qtsvg,
_7zz,
}:
mkKdeDerivation {
pname = "bovo";
extraNativeBuildInputs = [_7zz];
extraBuildInputs = [qtsvg];
meta.mainProgram = "bovo";
}

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

@ -1,15 +1,9 @@
{
mkKdeDerivation,
qtsvg,
qqc2-desktop-style,
}:
mkKdeDerivation {
pname = "calindori";
extraBuildInputs = [
qtsvg
qqc2-desktop-style
];
# FIXME(qt5)
meta.broken = true;
extraBuildInputs = [qtsvg];
}

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

@ -1,4 +1,5 @@
{callPackage}: {
accessibility-inspector = callPackage ./accessibility-inspector {};
akonadi = callPackage ./akonadi {};
akonadi-calendar = callPackage ./akonadi-calendar {};
akonadi-calendar-tools = callPackage ./akonadi-calendar-tools {};
@ -15,6 +16,7 @@
arianna = callPackage ./arianna {};
ark = callPackage ./ark {};
artikulate = callPackage ./artikulate {};
audex = callPackage ./audex {};
audiocd-kio = callPackage ./audiocd-kio {};
audiotube = callPackage ./audiotube {};
baloo-widgets = callPackage ./baloo-widgets {};
@ -34,6 +36,7 @@
falkon = callPackage ./falkon {};
ffmpegthumbs = callPackage ./ffmpegthumbs {};
filelight = callPackage ./filelight {};
francis = callPackage ./francis {};
ghostwriter = callPackage ./ghostwriter {};
granatier = callPackage ./granatier {};
grantlee-editor = callPackage ./grantlee-editor {};
@ -51,6 +54,7 @@
kalarm = callPackage ./kalarm {};
kalgebra = callPackage ./kalgebra {};
kalk = callPackage ./kalk {};
kalm = callPackage ./kalm {};
kalzium = callPackage ./kalzium {};
kamera = callPackage ./kamera {};
kamoso = callPackage ./kamoso {};
@ -112,7 +116,6 @@
kimap = callPackage ./kimap {};
kio-admin = callPackage ./kio-admin {};
kio-extras = callPackage ./kio-extras {};
kio-extras-kf5 = callPackage ./kio-extras-kf5 {};
kio-gdrive = callPackage ./kio-gdrive {};
kio-zeroconf = callPackage ./kio-zeroconf {};
kipi-plugins = callPackage ./kipi-plugins {};
@ -236,6 +239,7 @@
signon-kwallet-extension = callPackage ./signon-kwallet-extension {};
skanlite = callPackage ./skanlite {};
skanpage = callPackage ./skanpage {};
skladnik = callPackage ./skladnik {};
spectacle = callPackage ./spectacle {};
step = callPackage ./step {};
svgpart = callPackage ./svgpart {};

9
pkgs/kde/gear/francis/default.nix Normal file
View File

@ -0,0 +1,9 @@
{
mkKdeDerivation,
qtsvg,
}:
mkKdeDerivation {
pname = "francis";
extraBuildInputs = [qtsvg];
}

4
pkgs/kde/gear/kalm/default.nix Normal file
View File

@ -0,0 +1,4 @@
{mkKdeDerivation}:
mkKdeDerivation {
pname = "kalm";
}

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

@ -1,5 +1,11 @@
{mkKdeDerivation}:
{
mkKdeDerivation,
_7zz
}:
mkKdeDerivation {
pname = "katomic";
extraNativeBuildInputs = [_7zz];
meta.mainProgram = "katomic";
}

3
pkgs/kde/gear/kblackbox/default.nix
View File

@ -1,10 +1,13 @@
{
mkKdeDerivation,
qtsvg,
_7zz,
}:
mkKdeDerivation {
pname = "kblackbox";
extraNativeBuildInputs = [_7zz];
extraBuildInputs = [qtsvg];
meta.mainProgram = "kblackbox";
}

3
pkgs/kde/gear/kbounce/default.nix
View File

@ -1,10 +1,13 @@
{
mkKdeDerivation,
qtsvg,
_7zz,
}:
mkKdeDerivation {
pname = "kbounce";
extraNativeBuildInputs = [_7zz];
extraBuildInputs = [qtsvg];
meta.mainProgram = "kbounce";
}

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

@ -8,7 +8,7 @@
corrosion,
alpaka,
# provided as callPackage input to enable easier overrides through overlays
cargoHash ? "sha256-Yt1Gxw9Q1Q108YRJoUIpeNZlGjZ7yabLW3bRO4+x6Vo=",
cargoHash ? "sha256-AMOgchdx9754rkGJg8IdsNgYgH8esnlrreuY5AFZlwE=",
}:
mkKdeDerivation rec {
pname = "kdepim-addons";

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

@ -1,9 +1,11 @@
{
mkKdeDerivation,
qtsvg,
_7zz,
}:
mkKdeDerivation {
pname = "kfourinline";
extraNativeBuildInputs = [_7zz];
extraBuildInputs = [qtsvg];
}

3
pkgs/kde/gear/kjumpingcube/default.nix
View File

@ -1,10 +1,13 @@
{
mkKdeDerivation,
qtsvg,
_7zz,
}:
mkKdeDerivation {
pname = "kjumpingcube";
extraNativeBuildInputs = [_7zz];
extraBuildInputs = [qtsvg];
meta.mainProgram = "kjumpingcube";
}

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

@ -1,5 +1,11 @@
{mkKdeDerivation}:
{
mkKdeDerivation,
_7zz,
}:
mkKdeDerivation {
pname = "klickety";
extraNativeBuildInputs = [_7zz];
meta.mainProgram = "klickety";
}

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

@ -1,5 +1,11 @@
{mkKdeDerivation}:
{
mkKdeDerivation,
_7zz,
}:
mkKdeDerivation {
pname = "klines";
extraNativeBuildInputs = [_7zz];
meta.mainProgram = "klines";
}

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

@ -1,5 +1,11 @@
{mkKdeDerivation}:
{
mkKdeDerivation,
_7zz,
}:
mkKdeDerivation {
pname = "kmines";
extraNativeBuildInputs = [_7zz];
meta.mainProgram = "kmines";
}

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

@ -1,5 +1,11 @@
{mkKdeDerivation}:
{
mkKdeDerivation,
_7zz,
}:
mkKdeDerivation {
pname = "knavalbattle";
extraNativeBuildInputs = [_7zz];
meta.mainProgram = "knavalbattle";
}

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

@ -1,5 +1,11 @@
{mkKdeDerivation}:
{
mkKdeDerivation,
_7zz,
}:
mkKdeDerivation {
pname = "kolf";
extraNativeBuildInputs = [_7zz];
meta.mainProgram = "kolf";
}

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

@ -1,5 +1,11 @@
{mkKdeDerivation}:
{
mkKdeDerivation,
_7zz,
}:
mkKdeDerivation {
pname = "kollision";
extraNativeBuildInputs = [_7zz];
meta.mainProgram = "kollision";
}

3
pkgs/kde/gear/kreversi/default.nix
View File

@ -1,10 +1,13 @@
{
mkKdeDerivation,
qtsvg,
_7zz,
}:
mkKdeDerivation {
pname = "kreversi";
extraNativeBuildInputs = [_7zz];
extraBuildInputs = [qtsvg];
meta.mainProgram = "kreversi";
}

18
pkgs/kde/gear/krfb/default.nix
View File

@ -1,28 +1,18 @@
{
mkKdeDerivation,
fetchpatch,
pkg-config,
qtwayland,
libvncserver,
pipewire,
xorg,
}:
mkKdeDerivation {
pname = "krfb";
# Backports.
# FIXME: remove in next release
patches = [
# Build fix for Qt 6.7.1
./fix-build-with-qt-6.7.1.diff
# Wayland crash fix
(fetchpatch {
url = "https://invent.kde.org/network/krfb/-/commit/6e7a5ba56966ea1b67400be9ab7c82885abb76be.diff";
hash = "sha256-kqD4B2Nixw8KMCOc4RpoEmvII2JZYBPxog6TT/BPuFs=";
})
];
extraCmakeFlags = [
"-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner"
];
extraBuildInputs = [qtwayland libvncserver xorg.libXdamage];
extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [qtwayland libvncserver pipewire xorg.libXdamage];
}

51
pkgs/kde/gear/krfb/fix-build-with-qt-6.7.1.diff
View File

@ -1,51 +0,0 @@
diff --git a/framebuffers/pipewire/CMakeLists.txt b/framebuffers/pipewire/CMakeLists.txt
index 99f4562..3bf5f63 100644
--- a/framebuffers/pipewire/CMakeLists.txt
+++ b/framebuffers/pipewire/CMakeLists.txt
@@ -9,11 +9,6 @@ set (krfb_framebuffer_pw_SRCS
screencasting.cpp
)
-ecm_add_qtwayland_client_protocol(krfb_framebuffer_pw_SRCS
- PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
- BASENAME zkde-screencast-unstable-v1
-)
-
ecm_qt_declare_logging_category(krfb_framebuffer_pw_SRCS
HEADER krfb_fb_pipewire_debug.h
IDENTIFIER KRFB_FB_PIPEWIRE
@@ -38,6 +33,18 @@ add_library(krfb_framebuffer_pw
MODULE
${krfb_framebuffer_pw_SRCS}
)
+
+if (Qt6_VERSION VERSION_LESS "6.7.1")
+ ecm_add_qtwayland_client_protocol(krfb_framebuffer_pw
+ PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
+ BASENAME zkde-screencast-unstable-v1
+ )
+else()
+ qt6_generate_wayland_protocol_client_sources(krfb_framebuffer_pw
+ FILES ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
+ )
+endif()
+
set_property(TARGET krfb_framebuffer_pw PROPERTY C_STANDARD 99)
target_link_libraries(krfb_framebuffer_pw
diff --git a/framebuffers/pipewire/screencasting.cpp b/framebuffers/pipewire/screencasting.cpp
index 3c4d1ab..c338699 100644
--- a/framebuffers/pipewire/screencasting.cpp
+++ b/framebuffers/pipewire/screencasting.cpp
@@ -5,7 +5,11 @@
*/
#include "screencasting.h"
+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 1)
#include "qwayland-zkde-screencast-unstable-v1.h"
+#else
+#include "qwayland-screencast.h"
+#endif
#include <KWayland/Client/registry.h>
#include <QDebug>
#include <QRect>

3
pkgs/kde/gear/ksudoku/default.nix
View File

@ -1,10 +1,13 @@
{
mkKdeDerivation,
qtsvg,
_7zz,
}:
mkKdeDerivation {
pname = "ksudoku";
extraBuildInputs = [qtsvg];
extraNativeBuildInputs = [_7zz];
meta.mainProgram = "ksudoku";
}

3
pkgs/kde/gear/kubrick/default.nix
View File

@ -1,11 +1,14 @@
{
mkKdeDerivation,
qtsvg,
_7zz,
libGLU,
}:
mkKdeDerivation {
pname = "kubrick";
extraNativeBuildInputs = [_7zz];
extraBuildInputs = [qtsvg libGLU];
meta.mainProgram = "kubrick";
}

3
pkgs/kde/gear/lskat/default.nix
View File

@ -1,10 +1,13 @@
{
mkKdeDerivation,
qtsvg,
_7zz,
}:
mkKdeDerivation {
pname = "lskat";
extraNativeBuildInputs = [_7zz];
extraBuildInputs = [qtsvg];
meta.mainProgram = "lskat";
}

3
pkgs/kde/gear/picmi/default.nix
View File

@ -1,10 +1,13 @@
{
mkKdeDerivation,
qtsvg,
_7zz,
}:
mkKdeDerivation {
pname = "picmi";
extraNativeBuildInputs = [_7zz];
extraBuildInputs = [qtsvg];
meta.mainProgram = "picmi";
}

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

@ -1,5 +1,6 @@
{
mkKdeDerivation,
qtwebengine,
tesseractLanguages ? [],
tesseract5,
leptonica,
@ -8,6 +9,7 @@ mkKdeDerivation {
pname = "skanpage";
extraBuildInputs = [
qtwebengine
(tesseract5.override {enableLanguages = tesseractLanguages;})
leptonica
];

4
pkgs/kde/gear/skladnik/default.nix Normal file
View File

@ -0,0 +1,4 @@
{mkKdeDerivation}:
mkKdeDerivation {
pname = "skladnik";
}

3
pkgs/kde/gear/spectacle/default.nix
View File

@ -2,10 +2,11 @@
mkKdeDerivation,
qtwayland,
qtmultimedia,
opencv,
}:
mkKdeDerivation {
pname = "spectacle";
extraBuildInputs = [qtwayland qtmultimedia];
extraBuildInputs = [qtwayland qtmultimedia opencv];
meta.mainProgram = "spectacle";
}

74
pkgs/kde/generated/licenses.json
View File

@ -1,4 +1,13 @@
{
"accessibility-inspector": [
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"LGPL-2.0-or-later",
"LGPL-2.1-only",
"LGPL-3.0-only",
"LicenseRef-KDE-Accepted-LGPL"
],
"akonadi": [
"BSD-3-Clause",
"CC0-1.0",
@ -159,6 +168,11 @@
"LGPL-3.0-only",
"LicenseRef-KDE-Accepted-LGPL"
],
"audex": [
"CC0-1.0",
"GPL-3.0-or-later",
"LGPL-2.0-or-later"
],
"audiocd-kio": [
"BSD-3-Clause",
"CC0-1.0",
@ -255,9 +269,11 @@
"CC0-1.0"
],
"breeze-icons": [
"CC-BY-SA-4.0",
"CC0-1.0",
"LGPL-2.0-or-later",
"LGPL-2.1-only",
"LGPL-2.1-or-later",
"LGPL-3.0-only",
"LicenseRef-KDE-Accepted-LGPL"
],
@ -331,8 +347,7 @@
],
"dolphin-plugins": [
"CC0-1.0",
"GPL-2.0-or-later",
"MIT"
"GPL-2.0-or-later"
],
"dragon": [
"CC0-1.0",
@ -413,6 +428,14 @@
"LGPL-3.0-only",
"LicenseRef-KDE-Accepted-LGPL"
],
"francis": [
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"GPL-3.0-or-later",
"LGPL-2.0-or-later",
"LGPL-2.1-or-later"
],
"ghostwriter": [
"Apache-2.0",
"BSD-3-Clause",
@ -527,6 +550,11 @@
"GPL-2.0-or-later",
"GPL-3.0-or-later"
],
"kalm": [
"BSD-2-Clause",
"CC0-1.0",
"LGPL-2.1-or-later"
],
"kalzium": [
"BSD-3-Clause",
"CC0-1.0",
@ -1266,23 +1294,6 @@
"LicenseRef-KDE-Accepted-LGPL",
"MIT"
],
"kio-extras-kf5": [
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"GPL-2.0-only",
"GPL-2.0-or-later",
"GPL-3.0-only",
"GPL-3.0-or-later",
"LGPL-2.0-only",
"LGPL-2.0-or-later",
"LGPL-2.1-only",
"LGPL-2.1-or-later",
"LGPL-3.0-only",
"LicenseRef-KDE-Accepted-GPL",
"LicenseRef-KDE-Accepted-LGPL",
"MIT"
],
"kio-gdrive": [
"CC0-1.0",
"GPL-2.0-only",
@ -1301,6 +1312,7 @@
"CC0-1.0"
],
"kirigami": [
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"FSFAP",
@ -1419,10 +1431,12 @@
"Qt-Commercial-exception-1.0"
],
"kmail-account-wizard": [
"BSD-2-Clause",
"BSD-3-Clause",
"CC0-1.0",
"LGPL-2.0-or-later"
"LGPL-2.0-or-later",
"LGPL-2.1-only",
"LGPL-3.0-only",
"LicenseRef-KDE-Accepted-LGPL"
],
"kmailtransport": [
"BSD-3-Clause",
@ -1470,6 +1484,7 @@
"GPL-2.0-or-later"
],
"knavalbattle": [
"BSD-3-Clause",
"CC0-1.0",
"GPL-2.0-or-later"
],
@ -1533,6 +1548,7 @@
"LicenseRef-KDE-Accepted-LGPL"
],
"kolf": [
"BSD-3-Clause",
"CC0-1.0"
],
"kollision": [
@ -1610,7 +1626,6 @@
"BSD-3-Clause",
"CC-BY-SA-4.0",
"CC0-1.0",
"GPL-3.0-only",
"GPL-3.0-or-later"
],
"konversation": [
@ -1938,6 +1953,7 @@
"GPL-2.0-or-later"
],
"kubrick": [
"BSD-3-Clause",
"CC0-1.0",
"GPL-2.0-or-later"
],
@ -2360,7 +2376,6 @@
"GPL-2.0-only",
"GPL-2.0-or-later",
"GPL-3.0-only",
"GPL-3.0-or-later",
"LGPL-2.0-only",
"LGPL-2.0-or-later",
"LicenseRef-KDE-Accepted-GPL",
@ -2397,7 +2412,8 @@
"GPL-2.0-or-later",
"GPL-3.0-only",
"LGPL-2.1-or-later",
"LicenseRef-KDE-Accepted-GPL"
"LicenseRef-KDE-Accepted-GPL",
"MIT"
],
"partitionmanager": [
"CC-BY-4.0",
@ -2705,7 +2721,8 @@
"LGPL-3.0-only",
"LicenseRef-KDE-Accepted-LGPL",
"LicenseRef-KFQF-Accepted-GPL",
"LicenseRef-Qt-Commercial"
"LicenseRef-Qt-Commercial",
"MIT"
],
"rocs": [
"BSD-2-Clause",
@ -2741,6 +2758,13 @@
"GPL-3.0-only",
"LicenseRef-KDE-Accepted-GPL"
],
"skladnik": [
"BSD-3-Clause",
"CC-BY-SA-4.0",
"CC0-1.0",
"GFDL-1.2-or-later",
"GPL-2.0-or-later"
],
"solid": [
"BSD-3-Clause",
"CC0-1.0",

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

File diff suppressed because it is too large Load Diff

11
pkgs/kde/gear/kio-extras-kf5/default.nix → pkgs/kde/misc/kio-extras-kf5/default.nix
View File

@ -1,6 +1,6 @@
{
stdenv,
sources,
fetchurl,
kio-extras,
cmake,
libsForQt5,
@ -14,11 +14,16 @@
taglib,
libappimage,
}:
# kio-extras-kf5 is kind of part of Gear, but also not released all the time,
# so handle it separately.
stdenv.mkDerivation rec {
pname = "kio-extras-kf5";
inherit (sources.${pname}) version;
version = "24.02.2";
src = sources.${pname};
src = fetchurl {
url = "mirror://kde/stable/release-service/${version}/src/kio-extras-kf5-${version}.tar.xz";
hash = "sha256-qar1jzuALINBu6HOuVBU+RUFnqRH9Z/8e5M8ynGxKsk=";
};
nativeBuildInputs = with libsForQt5; [
cmake