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

Merge pull request #169600 from andrevmatos/kde/gear

Browse Source
This commit is contained in:
Sandro 2022-04-27 14:36:50 +02:00 committed by GitHub
commit 9dc734aec1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 1006 additions and 1132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/graphics/digikam/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
{ mkDerivation, lib, fetchurl, fetchpatch, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
# For `digitaglinktree`
, perl, sqlite
@ -43,6 +43,7 @@
, pcre
, threadweaver
, x265
, jasper
# For panorama and focus stacking
, enblend-enfuse
@ -55,13 +56,21 @@
mkDerivation rec {
pname = "digikam";
version = "7.4.0";
version = "7.6.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz";
sha256 = "sha256-0Iq2bacyu0SbwQEG7BHdne+ls1Yt7TdBsEHbuqcVUEo=";
sha256 = "sha256-2OHucyHT/DE5FvUVdW4wKaxBh9xFO2kzhI1N5TFLZkE=";
};
patches = [
(fetchpatch {
name = "akonadi-22.04.patch";
url = "https://github.com/archlinux/svntogit-packages/raw/1b3c76a4482055524120f598325d90545ff9c020/trunk/akonadi-22.04.patch";
sha256 = "sha256-ittgkl2t/nAD0ci2fNYoAd4E2M6Gg0vqqjxqZugBuko=";
})
];
nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
buildInputs = [
@ -86,6 +95,7 @@ mkDerivation rec {
opencv
pcre
x265
jasper
qtbase
qtxmlpatterns
@ -115,6 +125,7 @@ mkDerivation rec {
"-DENABLE_MEDIAPLAYER=1"
"-DENABLE_QWEBENGINE=on"
"-DENABLE_APPSTYLES=on"
"-DCMAKE_CXX_FLAGS=-I${libksane}/include/KF5" # fix `#include <ksane_version.h>`
];
dontWrapGApps = true;

4
pkgs/applications/kde/default.nix
View File

@ -86,6 +86,7 @@ let
dragon = callPackage ./dragon.nix {};
elisa = callPackage ./elisa.nix {};
eventviews = callPackage ./eventviews.nix {};
falkon = callPackage ./falkon.nix {};
ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
filelight = callPackage ./filelight.nix {};
granatier = callPackage ./granatier.nix {};
@ -97,7 +98,7 @@ let
kaccounts-providers = callPackage ./kaccounts-providers.nix {};
kaddressbook = callPackage ./kaddressbook.nix {};
kalarm = callPackage ./kalarm.nix {};
kalarmcal = callPackage ./kalarmcal.nix {};
kalendar = callPackage ./kalendar.nix {};
kalzium = callPackage ./kalzium.nix {};
kamoso = callPackage ./kamoso.nix {};
kapman = callPackage ./kapman.nix {};
@ -219,6 +220,7 @@ let
print-manager = callPackage ./print-manager.nix {};
rocs = callPackage ./rocs.nix {};
skanlite = callPackage ./skanlite.nix {};
skanpage = callPackage ./skanpage.nix {};
spectacle = callPackage ./spectacle.nix {};
yakuake = callPackage ./yakuake.nix {};
zanshin = callPackage ./zanshin.nix {};

17
pkgs/applications/networking/browsers/falkon/default.nix → pkgs/applications/kde/falkon.nix
View File

@ -1,21 +1,13 @@
{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch
, cmake, extra-cmake-modules, pkg-config, qmake
, cmake, extra-cmake-modules, pkg-config
, libpthreadstubs, libxcb, libXdmcp
, qtsvg, qttools, qtwebengine, qtx11extras
, qtwayland, wrapQtAppsHook
, kwallet
, kwallet, kpurpose, karchive, kio
}:
mkDerivation rec {
pname = "falkon";
version = "3.2.0";
src = fetchFromGitHub {
owner = "KDE";
repo = "falkon";
rev = "v${version}";
sha256 = "sha256-esi9YWd1PtQpDBhI1NtWEjZIoMoNUpAF+kQad67mLzE=";
};
preConfigure = ''
export NONBLOCK_JS_DIALOGS=true
@ -27,21 +19,20 @@ mkDerivation rec {
buildInputs = [
libpthreadstubs libxcb libXdmcp
qtsvg qttools qtwebengine qtx11extras
kwallet
kwallet kpurpose karchive kio
] ++ lib.optionals stdenv.isLinux [ qtwayland ];
nativeBuildInputs = [
cmake
extra-cmake-modules
pkg-config
qmake
qttools
wrapQtAppsHook
];
meta = with lib; {
description = "QtWebEngine based cross-platform web browser";
homepage = "https://community.kde.org/Incubator/Projects/Falkon";
homepage = "https://www.falkon.org";
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix;

2
pkgs/applications/kde/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.3/src -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.0/src -A '*.tar.xz' )

4
pkgs/applications/kde/kaddressbook.nix
View File

@ -21,4 +21,8 @@ mkDerivation {
kdbusaddons ki18n kontactinterface kparts kpimtextedit
kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase
];
postInstall = ''
# added as an include directory by cmake files and fails to compile if it's missing
mkdir -p "$out/include/KF5"
'';
}

4
pkgs/applications/kde/kalarm.nix
View File

@ -7,7 +7,7 @@
kio, knotifications, knotifyconfig, kservice, kwidgetsaddons,
kwindowsystem, kxmlgui, phonon,
kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils,
kimap, akonadi, akonadi-contacts, akonadi-mime, kcalendarcore, kcalutils,
kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime,
pimcommon, kpimtextedit, messagelib,
@ -31,7 +31,7 @@ mkDerivation {
kio knotifications knotifyconfig kservice kwidgetsaddons kwindowsystem
kxmlgui phonon
kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore
kimap akonadi akonadi-contacts akonadi-mime kcalendarcore
kcalutils kholidays kidentitymanagement libkdepim mailcommon kmailtransport
kmime pimcommon kpimtextedit messagelib

19
pkgs/applications/kde/kalarmcal.nix
View File

@ -1,19 +0,0 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, kcalendarcore, kholidays, kidentitymanagement,
kpimtextedit, kcalutils
}:
mkDerivation {
pname = "kalarmcal";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
akonadi kcalendarcore kholidays kidentitymanagement kpimtextedit kcalutils
];
outputs = [ "out" "dev" ];
}

11
pkgs/applications/office/kalendar/default.nix → pkgs/applications/kde/kalendar.nix
View File

@ -39,15 +39,6 @@
mkDerivation rec {
pname = "kalendar";
version = "1.0.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "pim";
repo = pname;
rev = "v${version}";
sha256 = "sha256-kjtLVU+8wbIa7R6J1XOjuvS3AnJNngxNBCx24Dy1QzM=";
};
nativeBuildInputs = [
cmake
@ -95,7 +86,7 @@ mkDerivation rec {
meta = with lib; {
description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)";
homepage = "https://invent.kde.org/pim/kalendar/";
homepage = "https://apps.kde.org/kalendar/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ chuangzhu ];
platforms = platforms.linux;

4
pkgs/applications/kde/kdegraphics-thumbnailers.nix
View File

@ -1,6 +1,6 @@
{
mkDerivation, lib, fetchpatch,
extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw
extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw, kdegraphics-mobipocket
}:
mkDerivation {
@ -10,5 +10,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive kio libkexiv2 libkdcraw ];
buildInputs = [ karchive kio libkexiv2 libkdcraw kdegraphics-mobipocket ];
}

4
pkgs/applications/kde/kdepim-addons.nix
View File

@ -5,7 +5,7 @@
incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass,
kitinerary, kontactinterface
kitinerary, kontactinterface, kaddressbook, discount
}:
mkDerivation {
@ -20,6 +20,6 @@ mkDerivation {
incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative
kholidays ki18n kmime ktexteditor ktnef libgravatar
libksieve mailcommon mailimporter messagelib poppler prison kpkpass
kitinerary kontactinterface
kitinerary kontactinterface kaddressbook discount
];
}

4
pkgs/applications/kde/kdepim-runtime/default.nix
View File

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
shared-mime-info,
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
kalarmcal, kcalutils, kcontacts, kdav, kidentitymanagement,
kholidays, kcalutils, kcontacts, kdav, kidentitymanagement,
kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
pimcommon, libkgapi, libsecret,
qca-qt5, qtkeychain, qtnetworkauth, qtspeech, qtwebengine, qtxmlpatterns,
@ -18,7 +18,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
buildInputs = [
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
kalarmcal kcalutils kcontacts kdav kidentitymanagement kimap
kholidays kcalutils kcontacts kdav kidentitymanagement kimap
kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
pimcommon libkgapi libsecret
qca-qt5 qtkeychain qtnetworkauth qtspeech qtxmlpatterns

12
pkgs/applications/kde/picmi.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchpatch
{ mkDerivation, lib
, libkdegames, extra-cmake-modules
, kdeclarative, knewstuff
}:
@ -16,16 +16,6 @@ mkDerivation {
platforms = platforms.linux;
};
patches = [
# fix compile error due to usage of deprecated things
# probably can be removed with the next kde bump
(fetchpatch {
url = "https://invent.kde.org/games/picmi/-/commit/99639fb499fe35eb463621efca1c0e4ff2a52bad.patch";
revert = true;
sha256 = "sha256-rRhTvUB1Hpc3bLv9b5yIf/G7uJy2/OgBfXToZwV4jrg=";
})
];
nativeBuildInputs = [
extra-cmake-modules
];

4
pkgs/applications/kde/pimcommon.nix
View File

@ -16,11 +16,11 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets
kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit
kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap
kpurpose kwallet kwindowsystem libkdepim qtwebengine
];
propagatedBuildInputs = [
akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap
akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap kpimtextedit
];
outputs = [ "out" "dev" ];
}

8
pkgs/applications/graphics/skanpage/default.nix → pkgs/applications/kde/skanpage.nix
View File

@ -6,16 +6,11 @@
, ktextwidgets
, libksane
, qtquickcontrols2
, kpurpose
}:
mkDerivation rec {
pname = "skanpage";
version = "1.0.0";
src = fetchurl {
url = "mirror://kde/stable/skanpage/${version}/${pname}-${version}.tar.xz";
hash = "sha256-kPVAG64oPkKF3ztHB4V7M2xc1AcvwiHnYpMMLMQNYGA=";
};
nativeBuildInputs = [ extra-cmake-modules ];
@ -24,6 +19,7 @@ mkDerivation rec {
ktextwidgets
libksane
qtquickcontrols2
kpurpose
];
meta = with lib; {

1858
pkgs/applications/kde/srcs.nix
View File

File diff suppressed because it is too large Load Diff

16
pkgs/applications/office/calligra/default.nix
View File

@ -30,7 +30,23 @@ mkDerivation rec {
sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma";
excludes = [ "CMakeLists.txt" ];
})
# Fixes for building calligra with modern poppler[-qt5]
(fetchpatch {
name = "poppler-22.03.0.patch";
url = "https://github.com/archlinux/svntogit-packages/raw/8f328bef497a9e3bc628e4e294c1a70b0c8b0eab/trunk/poppler-22.03.0.patch";
sha256 = "sha256-bOTnQcavXF49LIshNgzhXhyoEjzLmQJC/U7hO5P0bfY=";
})
# Fixes for building calligra with gcc11/c++17
(fetchpatch {
name = "build_c++17_poppler.patch";
url = "https://github.com/archlinux/svntogit-packages/raw/bbbe35f97eb1033798f1cf95d427890168598199/trunk/068cd9ae.patch";
sha256 = "sha256-d9/ILwSeW+ov11DF191hzIaUafO/rjQrAeONwqDSKbA=";
})
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17'
'';
nativeBuildInputs = [ extra-cmake-modules kdoctools ];

10
pkgs/development/libraries/mimetic/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cutee }:
{ lib, stdenv, fetchurl, fetchpatch, cutee }:
stdenv.mkDerivation rec {
pname = "mimetic";
@ -11,7 +11,13 @@ stdenv.mkDerivation rec {
buildInputs = [ cutee ];
patches = lib.optional stdenv.isAarch64 ./narrowing.patch;
patches = [
# Fix build with gcc11
(fetchpatch {
url = "https://github.com/tat/mimetic/commit/bf84940f9021950c80846e6b1a5f8b0b55991b00.patch";
sha256 = "sha256-1JW9zPg67BgNsdIjK/jp9j7QMg50eRMz5FsDsbbzBlI=";
})
] ++ lib.optional stdenv.isAarch64 ./narrowing.patch;
meta = with lib; {
description = "MIME handling library";

20
pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch
View File

@ -1,20 +0,0 @@
diff --git a/poppler/JPEG2000Stream.cc b/poppler/JPEG2000Stream.cc
--- a/poppler/JPEG2000Stream.cc
+++ b/poppler/JPEG2000Stream.cc
@@ -201,7 +201,7 @@ void JPXStream::init()
if (getDict()) smaskInData = getDict()->lookup("SMaskInData");
int bufSize = BUFFER_INITIAL_SIZE;
- if (oLen.isInt()) bufSize = oLen.getInt();
+ if (oLen.isInt() && oLen.getInt() > 0) bufSize = oLen.getInt();
if (cspace.isArray() && cspace.arrayGetLength() > 0) {
@@ -365,7 +365,7 @@ void JPXStream::init()
}
int bufSize = BUFFER_INITIAL_SIZE;
- if (oLen.isInt()) bufSize = oLen.getInt();
+ if (oLen.isInt() && oLen.getInt() > 0) bufSize = oLen.getInt();
if (cspace.isArray() && cspace.arrayGetLength() > 0) {

94
pkgs/development/libraries/poppler/0.61.nix
View File

@ -1,94 +0,0 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, cairo
, cmake
, curl
, fontconfig
, freetype
, lcms
, libiconv
, libintl
, libjpeg
, ninja
, openjpeg
, pkg-config
, zlib
, withData ? true, poppler_data
, qt5Support ? false, qtbase ? null
, introspectionSupport ? false, gobject-introspection ? null
, utils ? false
, minimal ? false, suffix ? "glib"
}:
let
version = "0.61.1";
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in
stdenv.mkDerivation rec {
pname = "poppler-${suffix}";
inherit version;
src = fetchurl {
url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz";
sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj";
};
outputs = [ "out" "dev" ];
patches = [
# Fix internal crash: a negative number that should not be
(fetchpatch {
name = "CVE-2018-13988";
url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee";
sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2";
})
# Fix internal crash: a negative number that should not be (not the above!)
./0.61-CVE-2019-9959.patch
];
nativeBuildInputs = [
cmake
ninja
pkg-config
];
buildInputs = [
libiconv
libintl
]
++ lib.optional withData poppler_data;
# TODO: reduce propagation to necessary libs
propagatedBuildInputs = with lib;
[ zlib freetype fontconfig libjpeg openjpeg ]
++ optionals (!minimal) [ cairo lcms curl ]
++ optional qt5Support qtbase
++ optional introspectionSupport gobject-introspection;
# Not sure when and how to pass it. It seems an upstream bug anyway.
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
cmakeFlags = [
(mkFlag true "XPDF_HEADERS")
(mkFlag (!minimal) "GLIB")
(mkFlag (!minimal) "CPP")
(mkFlag (!minimal) "LIBCURL")
(mkFlag utils "UTILS")
(mkFlag qt5Support "QT5")
];
dontWrapQtApps = true;
meta = with lib; {
homepage = "https://poppler.freedesktop.org/";
description = "A PDF rendering library";
longDescription = ''
Poppler is a PDF rendering library based on the xpdf-3.0 code base.
'';
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ ttuegel ];
};
}

8
pkgs/top-level/aliases.nix
View File

@ -1506,9 +1506,9 @@ mapAliases ({
inherit (plasma5Packages)
akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk
breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa
breeze-icons breeze-plymouth breeze-qt5 discover dolphin dragon elisa falkon
ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook
kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce
kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce
kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config
kdenlive kdeplasma-addons kdf kdialog kdiamond keditbookmarks kfind kfloppy
kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary
@ -1521,8 +1521,8 @@ mapAliases ({
plasma-integration plasma-nano plasma-nm plasma-pa plasma-mobile
plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace
plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style
sddm-kcm skanlite spectacle systemsettings xdg-desktop-portal-kde yakuake
zanshin
sddm-kcm skanlite skanpage spectacle systemsettings xdg-desktop-portal-kde
yakuake zanshin
;
inherit (plasma5Packages.thirdParty)

12
pkgs/top-level/all-packages.nix
View File

@ -19969,7 +19969,6 @@ with pkgs;
polkit = callPackage ../development/libraries/polkit { };
poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { lcms = lcms2; };
poppler_gi = lowPrio (poppler.override {
introspectionSupport = true;
@ -25349,10 +25348,7 @@ with pkgs;
calibre-web = callPackage ../servers/calibre-web { };
calligra = libsForQt5.callPackage ../applications/office/calligra {
# Must use the same Qt version as Calligra itself:
poppler = libsForQt5.poppler_0_61;
};
calligra = libsForQt5.callPackage ../applications/office/calligra { };
perkeep = callPackage ../applications/misc/perkeep { };
@ -25949,8 +25945,6 @@ with pkgs;
icesl = callPackage ../applications/misc/icesl { };
kalendar = libsForQt5.callPackage ../applications/office/kalendar { };
keepassx = callPackage ../applications/misc/keepassx { };
keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { };
@ -29087,8 +29081,6 @@ with pkgs;
quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {};
falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { };
quodlibet = callPackage ../applications/audio/quodlibet {
keybinder3 = null;
libmodplug = null;
@ -29510,8 +29502,6 @@ with pkgs;
sipp = callPackage ../development/tools/misc/sipp { };
skanpage = libsForQt5.callPackage ../applications/graphics/skanpage { };
soci = callPackage ../development/libraries/soci { };
socialscan = with python3.pkgs; toPythonApplication socialscan;

6
pkgs/top-level/qt5-packages.nix
View File

@ -168,12 +168,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
suffix = "qt5";
};
poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix {
lcms = pkgs.lcms2;
qt5Support = true;
suffix = "qt5";
};
pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };