kdePackages: Gear 24.02 -> 24.05

- 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

View File

@ -80,6 +80,11 @@ OK_MISSING_BY_PACKAGE = {
"plasma-desktop": { "plasma-desktop": {
"scim", # upstream is dead, not packaged in Nixpkgs "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": { "powerdevil": {
"DDCUtil", # cursed, intentionally disabled "DDCUtil", # cursed, intentionally disabled
}, },
@ -87,6 +92,9 @@ OK_MISSING_BY_PACKAGE = {
"Qt6Qml", # tests only "Qt6Qml", # tests only
"Qt6Quick", "Qt6Quick",
}, },
"skladnik": {
"POVRay", # too expensive to rerender all the assets
},
"syntax-highlighting": { "syntax-highlighting": {
"XercesC", # only used for extra validation at build time "XercesC", # only used for extra validation at build time
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,28 +1,18 @@
{ {
mkKdeDerivation, mkKdeDerivation,
fetchpatch, pkg-config,
qtwayland, qtwayland,
libvncserver, libvncserver,
pipewire,
xorg, xorg,
}: }:
mkKdeDerivation { mkKdeDerivation {
pname = "krfb"; 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 = [ extraCmakeFlags = [
"-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner"
]; ];
extraBuildInputs = [qtwayland libvncserver xorg.libXdamage]; extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [qtwayland libvncserver pipewire xorg.libXdamage];
} }

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>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
stdenv, stdenv,
sources, fetchurl,
kio-extras, kio-extras,
cmake, cmake,
libsForQt5, libsForQt5,
@ -14,11 +14,16 @@
taglib, taglib,
libappimage, libappimage,
}: }:
# kio-extras-kf5 is kind of part of Gear, but also not released all the time,
# so handle it separately.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kio-extras-kf5"; 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; [ nativeBuildInputs = with libsForQt5; [
cmake cmake