mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-11 18:32:23 +08:00
kdePackages: Gear 24.12 -> 25.04, assorted cleanups (#399446)
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.packaging ps.pyyaml ])"
|
||||
#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.packaging ps.pyyaml ])" nix-update
|
||||
import base64
|
||||
import binascii
|
||||
import json
|
||||
import pathlib
|
||||
from typing import Optional
|
||||
import subprocess
|
||||
from urllib.parse import urljoin, urlparse
|
||||
|
||||
import bs4
|
||||
@@ -30,7 +30,13 @@ ROOT_TEMPLATE = jinja2.Template('''
|
||||
{{ p }} = callPackage ./{{ p }} { };
|
||||
{%- endfor %}
|
||||
}
|
||||
'''.strip());
|
||||
'''.strip())
|
||||
|
||||
PROJECTS_WITH_RUST = {
|
||||
"akonadi-search",
|
||||
"angelfish",
|
||||
"kdepim-addons",
|
||||
}
|
||||
|
||||
def to_sri(hash):
|
||||
raw = binascii.unhexlify(hash)
|
||||
@@ -65,7 +71,7 @@ def to_sri(hash):
|
||||
type=str,
|
||||
default=None,
|
||||
)
|
||||
def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[str]):
|
||||
def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: str | None):
|
||||
root_dir = nixpkgs / "pkgs/kde"
|
||||
set_dir = root_dir / set
|
||||
generated_dir = root_dir / "generated"
|
||||
@@ -119,6 +125,18 @@ def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[st
|
||||
|
||||
pkg_dir = set_dir / project_name
|
||||
pkg_file = pkg_dir / "default.nix"
|
||||
|
||||
if project_name in PROJECTS_WITH_RUST:
|
||||
print(f"Updating cargoDeps hash for {set}/{project_name}...")
|
||||
subprocess.run([
|
||||
"nix-update",
|
||||
f"kdePackages.{project_name}",
|
||||
"--version",
|
||||
"skip",
|
||||
"--override-filename",
|
||||
pkg_file
|
||||
])
|
||||
|
||||
if not pkg_file.exists():
|
||||
print(f"Generated new package: {set}/{project_name}")
|
||||
pkg_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
fetchgit,
|
||||
fetchpatch,
|
||||
|
||||
cmake,
|
||||
ninja,
|
||||
@@ -62,18 +63,25 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "digikam";
|
||||
version = "8.5.0";
|
||||
version = "8.6.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "graphics";
|
||||
repo = "digikam";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KO6kq0SlYzu7sh6+7JQWhIeHNowy3fx03OFTdDwyR10=";
|
||||
hash = "sha256-CMyvNOAlIqD6OeqUquQ+/sOiBXmEowZe3/qmaXxh0X0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./disable-tests-download.patch
|
||||
|
||||
# Fix build with Qt 6.9
|
||||
# FIXME: remove in next update
|
||||
(fetchpatch {
|
||||
url = "https://invent.kde.org/graphics/digikam/-/commit/325b19fc7f0d04cdc1308f235c207c1ab43e945d.patch";
|
||||
hash = "sha256-bsxaNuLuU9MyDRmenOqO4JuzsbpUvfKQwcSCDfLHoWQ=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
45
pkgs/by-name/op/open-timeline-io/package.nix
Normal file
45
pkgs/by-name/op/open-timeline-io/package.nix
Normal file
@@ -0,0 +1,45 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
imath,
|
||||
rapidjson,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-timeline-io";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "OpenTimelineIO";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-53KXjbhHxuEtu6iRGWrirvFamuZ/WbOTcKCfs1iqKmM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
imath
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
rapidjson
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOTIO_DEPENDENCIES_INSTALL=0"
|
||||
"-DOTIO_FIND_IMATH=1"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Open Source API and interchange format for editorial timeline information";
|
||||
homepage = "https://github.com/AcademySoftwareFoundation/OpenTimelineIO";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -18,7 +18,7 @@ mkKdeDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
src = sources.${pname};
|
||||
sourceRoot = "${pname}-${version}/${cargoRoot}";
|
||||
hash = "sha256-fx8q7b0KGEevn0DlMAGgAvQMXqZmBF8aINDwpaGyq7I=";
|
||||
hash = "sha256-hdm4LfQcs4TTfBLzlZYJ0uzqfLxMXuYQExLGJg81W2U=";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtmultimedia,
|
||||
qtsvg,
|
||||
phonon,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "blinken";
|
||||
|
||||
extraBuildInputs = [
|
||||
qtmultimedia
|
||||
qtsvg
|
||||
phonon
|
||||
];
|
||||
meta.mainProgram = "blinken";
|
||||
}
|
||||
|
||||
@@ -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 { };
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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, &%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 = &%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 "std::function<QPoint (QSize)>":*"/>
|
||||
@@ -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,6 +2,7 @@
|
||||
mkKdeDerivation,
|
||||
qt5compat,
|
||||
gmp,
|
||||
libmpc,
|
||||
mpfr,
|
||||
kdoctools,
|
||||
}:
|
||||
@@ -11,6 +12,7 @@ mkKdeDerivation {
|
||||
extraBuildInputs = [
|
||||
qt5compat
|
||||
gmp
|
||||
libmpc
|
||||
mpfr
|
||||
kdoctools
|
||||
];
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
13
pkgs/kde/gear/keysmith/optional-runtime-dependencies.patch
Normal 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
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtmultimedia,
|
||||
qtsvg,
|
||||
phonon,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "klettres";
|
||||
|
||||
extraBuildInputs = [
|
||||
qtmultimedia
|
||||
qtsvg
|
||||
phonon
|
||||
];
|
||||
meta.mainProgram = "klettres";
|
||||
}
|
||||
|
||||
@@ -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 ];
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
extra-cmake-modules,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "kross-interpreters";
|
||||
|
||||
extraBuildInputs = [ extra-cmake-modules ];
|
||||
# FIXME(qt5)
|
||||
meta.broken = true;
|
||||
}
|
||||
@@ -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 = [
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
qtwebengine,
|
||||
qtmultimedia,
|
||||
qttools,
|
||||
qtwebengine,
|
||||
libxslt,
|
||||
phonon,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "mailcommon";
|
||||
|
||||
extraNativeBuildInputs = [ libxslt ];
|
||||
extraBuildInputs = [
|
||||
qtwebengine
|
||||
qtmultimedia
|
||||
qttools
|
||||
phonon
|
||||
qtwebengine
|
||||
];
|
||||
}
|
||||
|
||||
@@ -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
11
pkgs/kde/gear/qrca/default.nix
Normal file
@@ -0,0 +1,11 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
pkg-config,
|
||||
qtmultimedia,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "qrca";
|
||||
|
||||
extraNativeBuildInputs = [ pkg-config ];
|
||||
extraBuildInputs = [ qtmultimedia ];
|
||||
}
|
||||
@@ -1147,7 +1147,9 @@
|
||||
"kirigami",
|
||||
"kirigami-addons",
|
||||
"kquickimageeditor",
|
||||
"prison"
|
||||
"kwindowsystem",
|
||||
"prison",
|
||||
"qxmpp"
|
||||
],
|
||||
"kajongg": [
|
||||
"extra-cmake-modules",
|
||||
@@ -2769,7 +2771,6 @@
|
||||
"kitemmodels",
|
||||
"kmailtransport",
|
||||
"kmime",
|
||||
"kstatusnotifieritem",
|
||||
"kwidgetsaddons",
|
||||
"kwindowsystem",
|
||||
"kxmlgui",
|
||||
@@ -3929,6 +3930,7 @@
|
||||
"kcoreaddons",
|
||||
"ki18n",
|
||||
"kio",
|
||||
"ktextwidgets",
|
||||
"qtkeychain",
|
||||
"sonnet",
|
||||
"syntax-highlighting"
|
||||
@@ -6332,5 +6334,5 @@
|
||||
"kwindowsystem"
|
||||
]
|
||||
},
|
||||
"version": "7e4e118f"
|
||||
"version": "f0a9ee94"
|
||||
}
|
||||
@@ -6,6 +6,7 @@
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
"LGPL-3.0-only",
|
||||
"LGPL-3.0-or-later",
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
],
|
||||
"akonadi": [
|
||||
@@ -252,7 +253,9 @@
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-only",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-GPL",
|
||||
"LicenseRef-Qt-Commercial",
|
||||
"MIT"
|
||||
],
|
||||
"breeze-grub": [
|
||||
@@ -372,6 +375,7 @@
|
||||
"GPL-2.0-only",
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-only",
|
||||
"LGPL-3.0-or-later",
|
||||
"LicenseRef-KDE-Accepted-GPL"
|
||||
],
|
||||
"drkonqi": [
|
||||
@@ -530,7 +534,6 @@
|
||||
"kaccounts-providers": [
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-or-later",
|
||||
"LGPL-2.0-or-later"
|
||||
],
|
||||
"kactivitymanagerd": [
|
||||
@@ -553,7 +556,8 @@
|
||||
],
|
||||
"kajongg": [
|
||||
"CC0-1.0",
|
||||
"GPL-2.0"
|
||||
"GPL-2.0",
|
||||
"GPL-2.0-only"
|
||||
],
|
||||
"kalarm": [
|
||||
"BSD-3-Clause",
|
||||
@@ -951,6 +955,7 @@
|
||||
"GPL-3.0-only",
|
||||
"LGPL-2.0-only",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-GPL",
|
||||
"LicenseRef-KDE-Accepted-LGPL",
|
||||
@@ -1096,6 +1101,7 @@
|
||||
"CC0-1.0",
|
||||
"GPL-3.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
"LGPL-2.1-or-later",
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
],
|
||||
@@ -1130,7 +1136,8 @@
|
||||
],
|
||||
"kget": [
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0"
|
||||
"CC0-1.0",
|
||||
"LGPL-3.0-or-later"
|
||||
],
|
||||
"kglobalaccel": [
|
||||
"CC0-1.0",
|
||||
@@ -1174,11 +1181,8 @@
|
||||
"khangman": [
|
||||
"BSD-2-Clause",
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-only",
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-only",
|
||||
"LGPL-2.1-or-later",
|
||||
"LicenseRef-KDE-Accepted-GPL"
|
||||
"LGPL-2.1-or-later"
|
||||
],
|
||||
"khealthcertificate": [
|
||||
"Apache-2.0",
|
||||
@@ -1203,7 +1207,6 @@
|
||||
],
|
||||
"ki18n": [
|
||||
"BSD-3-Clause",
|
||||
"BSD-3-clause",
|
||||
"CC0-1.0",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
@@ -1430,7 +1433,6 @@
|
||||
"GPL-2.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",
|
||||
"LGPL-3.0-or-later",
|
||||
@@ -1510,6 +1512,7 @@
|
||||
"GPL-2.0-or-later"
|
||||
],
|
||||
"kmix": [
|
||||
"BSD-2-Clause",
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-or-later"
|
||||
],
|
||||
@@ -1557,6 +1560,7 @@
|
||||
"LicenseRef-KDE-Accepted-GPL"
|
||||
],
|
||||
"knotifications": [
|
||||
"BSD-2-Clause",
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
"LGPL-2.0-only",
|
||||
@@ -1589,7 +1593,13 @@
|
||||
"GPL-2.0-or-later"
|
||||
],
|
||||
"kolourpaint": [
|
||||
"CC0-1.0"
|
||||
"BSD-2-Clause",
|
||||
"CC0-1.0",
|
||||
"LGPL-2.0-only",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
],
|
||||
"kompare": [
|
||||
"CC0-1.0",
|
||||
@@ -1698,7 +1708,8 @@
|
||||
"kpackage": [
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-or-later",
|
||||
"LGPL-2.0-or-later"
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-or-later"
|
||||
],
|
||||
"kparts": [
|
||||
"CC0-1.0",
|
||||
@@ -1822,9 +1833,6 @@
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
],
|
||||
"kross-interpreters": [
|
||||
"CC0-1.0"
|
||||
],
|
||||
"kruler": [
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
@@ -1910,8 +1918,13 @@
|
||||
"GPL-2.0-or-later"
|
||||
],
|
||||
"kstatusnotifieritem": [
|
||||
"BSD-2-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",
|
||||
"MIT"
|
||||
],
|
||||
"ksudoku": [
|
||||
"BSD-3-Clause",
|
||||
@@ -1988,6 +2001,7 @@
|
||||
"ktrip": [
|
||||
"BSD-2-Clause",
|
||||
"BSD-3-Clause",
|
||||
"CC-BY-SA-4.0",
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-only",
|
||||
"GPL-3.0-only",
|
||||
@@ -2015,8 +2029,12 @@
|
||||
"LGPL-2.0-or-later"
|
||||
],
|
||||
"kunitconversion": [
|
||||
"BSD-2-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"
|
||||
],
|
||||
"kuserfeedback": [
|
||||
"BSD-3-Clause",
|
||||
@@ -2074,10 +2092,12 @@
|
||||
"LGPL-2.1-or-later"
|
||||
],
|
||||
"kweathercore": [
|
||||
"BSD-2-Clause",
|
||||
"CC0-1.0",
|
||||
"LGPL-2.0-or-later"
|
||||
],
|
||||
"kwidgetsaddons": [
|
||||
"BSD-2-Clause",
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-or-later",
|
||||
"LGPL-2.0-only",
|
||||
@@ -2194,6 +2214,7 @@
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
],
|
||||
"libkleo": [
|
||||
"BSD-2-Clause",
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
"GCC-exception-3.1",
|
||||
@@ -2534,9 +2555,13 @@
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
],
|
||||
"plasma-browser-integration": [
|
||||
"BSD-2-Clause",
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-only",
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-only",
|
||||
"GPL-3.0-or-later",
|
||||
"LicenseRef-KDE-Accepted-GPL",
|
||||
"MIT"
|
||||
],
|
||||
"plasma-desktop": [
|
||||
@@ -2716,10 +2741,13 @@
|
||||
"plasma5support": [
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
"GPL-2.0-only",
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-only",
|
||||
"LGPL-2.0-only",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-or-later"
|
||||
"LGPL-2.1-or-later",
|
||||
"LicenseRef-KDE-Accepted-GPL"
|
||||
],
|
||||
"plasmatube": [
|
||||
"CC-BY-SA-4.0",
|
||||
@@ -2727,6 +2755,7 @@
|
||||
"GPL-2.0-only",
|
||||
"GPL-3.0-only",
|
||||
"GPL-3.0-or-later",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-GPL",
|
||||
@@ -2812,6 +2841,14 @@
|
||||
"LicenseRef-Qt-Commercial",
|
||||
"MIT"
|
||||
],
|
||||
"qrca": [
|
||||
"BSD-2-Clause",
|
||||
"BSD-3-Clause",
|
||||
"CC0-1.0",
|
||||
"GPL-3.0-or-later",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-or-later"
|
||||
],
|
||||
"rocs": [
|
||||
"BSD-2-Clause",
|
||||
"CC0-1.0",
|
||||
@@ -2874,7 +2911,10 @@
|
||||
"GPL-2.0-or-later",
|
||||
"GPL-3.0-only",
|
||||
"LGPL-2.0-or-later",
|
||||
"LicenseRef-KDE-Accepted-GPL"
|
||||
"LGPL-2.1-only",
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-GPL",
|
||||
"LicenseRef-KDE-Accepted-LGPL"
|
||||
],
|
||||
"spectacle": [
|
||||
"BSD-3-Clause",
|
||||
@@ -2976,6 +3016,7 @@
|
||||
"GPL-2.0-or-later",
|
||||
"LGPL-2.0-or-later",
|
||||
"LGPL-2.1-only",
|
||||
"LGPL-2.1-or-later",
|
||||
"LGPL-3.0-only",
|
||||
"LicenseRef-KDE-Accepted-LGPL",
|
||||
"MIT"
|
||||
|
||||
@@ -899,6 +899,12 @@
|
||||
"project_path": "documentation/hig-kde-org",
|
||||
"repo_path": "documentation/hig-kde-org"
|
||||
},
|
||||
"documentation-kstars-docs-kde-org": {
|
||||
"description": "Documentation for KStars",
|
||||
"name": "documentation-kstars-docs-kde-org",
|
||||
"project_path": "documentation/kstars-docs-kde-org",
|
||||
"repo_path": "documentation/kstars-docs-kde-org"
|
||||
},
|
||||
"documentation-openraster-org": {
|
||||
"description": "Sphinx setup for the Openraster.org (ORA specification) website",
|
||||
"name": "documentation-openraster-org",
|
||||
@@ -2429,6 +2435,12 @@
|
||||
"project_path": "playground/libs/kdsoap-ws-discovery-client",
|
||||
"repo_path": "libraries/kdsoap-ws-discovery-client"
|
||||
},
|
||||
"kecolab": {
|
||||
"description": "Measuring Energy Usage Remotely with Online Portal",
|
||||
"name": "kecolab",
|
||||
"project_path": "playground/sdk/kecolab",
|
||||
"repo_path": "sdk/kecolab"
|
||||
},
|
||||
"keditbookmarks": {
|
||||
"description": "Bookmarks editor",
|
||||
"name": "keditbookmarks",
|
||||
@@ -5993,6 +6005,12 @@
|
||||
"project_path": "playground/devtools/quanta",
|
||||
"repo_path": "unmaintained/quanta"
|
||||
},
|
||||
"qxmpp": {
|
||||
"description": "C++ XMPP client and server library",
|
||||
"name": "qxmpp",
|
||||
"project_path": "playground/libs/qxmpp",
|
||||
"repo_path": "libraries/qxmpp"
|
||||
},
|
||||
"qyoto": {
|
||||
"description": ".NET/Mono bindings for the Qt libraries.",
|
||||
"name": "qyoto",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -16,7 +16,7 @@ mkKdeDerivation {
|
||||
libnl
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
extraCmakeFlags = [
|
||||
"-DSYSTEMSTATS_DBUS_INTERFACE=${libksysguard}/share/dbus-1/interfaces/org.kde.ksystemstats1.xml"
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user