diff options
Diffstat (limited to 'nixpkgs/pkgs/kde')
-rw-r--r-- | nixpkgs/pkgs/kde/frameworks/baloo/default.nix | 5 | ||||
-rw-r--r-- | nixpkgs/pkgs/kde/gear/akonadi/default.nix | 13 | ||||
-rw-r--r-- | nixpkgs/pkgs/kde/gear/akonadi/ignore-mysql-config-timestamp.patch | 12 | ||||
-rw-r--r-- | nixpkgs/pkgs/kde/gear/filelight/default.nix | 13 | ||||
-rw-r--r-- | nixpkgs/pkgs/kde/generated/sources/plasma.json | 386 | ||||
-rw-r--r-- | nixpkgs/pkgs/kde/lib/mk-kde-derivation.nix | 27 | ||||
-rw-r--r-- | nixpkgs/pkgs/kde/plasma/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/kde/plasma/oxygen/default.nix | 51 |
8 files changed, 297 insertions, 214 deletions
diff --git a/nixpkgs/pkgs/kde/frameworks/baloo/default.nix b/nixpkgs/pkgs/kde/frameworks/baloo/default.nix index 517e5285a4e0..40ab00ebd193 100644 --- a/nixpkgs/pkgs/kde/frameworks/baloo/default.nix +++ b/nixpkgs/pkgs/kde/frameworks/baloo/default.nix @@ -6,5 +6,10 @@ mkKdeDerivation { pname = "baloo"; + # kde-systemd-start-condition is not part of baloo + postPatch = '' + substituteInPlace src/file/kde-baloo.service.in --replace-fail @KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition /run/current-system/sw/bin/kde-systemd-start-condition + ''; + extraBuildInputs = [qtdeclarative lmdb]; } diff --git a/nixpkgs/pkgs/kde/gear/akonadi/default.nix b/nixpkgs/pkgs/kde/gear/akonadi/default.nix index 20fd1f54b1ec..15d1436e9cb5 100644 --- a/nixpkgs/pkgs/kde/gear/akonadi/default.nix +++ b/nixpkgs/pkgs/kde/gear/akonadi/default.nix @@ -1,16 +1,25 @@ { + lib, mkKdeDerivation, qttools, accounts-qt, kaccounts-integration, shared-mime-info, xz, + mariadb, }: mkKdeDerivation { pname = "akonadi"; - # FIXME(later): investigate nixpkgs patches + patches = [ + # Always regenerate MySQL config, as the store paths don't have accurate timestamps + ./ignore-mysql-config-timestamp.patch + ]; + + extraCmakeFlags = [ + "-DMYSQLD_SCRIPTS_PATH=${lib.getBin mariadb}/bin" + ]; extraNativeBuildInputs = [qttools shared-mime-info]; - extraBuildInputs = [kaccounts-integration accounts-qt xz]; + extraBuildInputs = [kaccounts-integration accounts-qt xz mariadb]; } diff --git a/nixpkgs/pkgs/kde/gear/akonadi/ignore-mysql-config-timestamp.patch b/nixpkgs/pkgs/kde/gear/akonadi/ignore-mysql-config-timestamp.patch new file mode 100644 index 000000000000..62f1556bf687 --- /dev/null +++ b/nixpkgs/pkgs/kde/gear/akonadi/ignore-mysql-config-timestamp.patch @@ -0,0 +1,12 @@ +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -241,8 +241,7 @@ bool DbConfigMysql::startInternalServer() + bool confUpdate = false; + QFile actualFile(actualConfig); + // update conf only if either global (or local) is newer than actual +- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) +- || (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) { ++ if (true) { + QFile globalFile(globalConfig); + QFile localFile(localConfig); + if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) { diff --git a/nixpkgs/pkgs/kde/gear/filelight/default.nix b/nixpkgs/pkgs/kde/gear/filelight/default.nix index 938cedda3af1..1136a3b68844 100644 --- a/nixpkgs/pkgs/kde/gear/filelight/default.nix +++ b/nixpkgs/pkgs/kde/gear/filelight/default.nix @@ -1,4 +1,15 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + kirigami, + kquickcharts, + qqc2-desktop-style, +}: mkKdeDerivation { pname = "filelight"; + + extraBuildInputs = [ + kirigami + kquickcharts + qqc2-desktop-style + ]; } diff --git a/nixpkgs/pkgs/kde/generated/sources/plasma.json b/nixpkgs/pkgs/kde/generated/sources/plasma.json index 605ff3d9fb96..18854156c38b 100644 --- a/nixpkgs/pkgs/kde/generated/sources/plasma.json +++ b/nixpkgs/pkgs/kde/generated/sources/plasma.json @@ -1,317 +1,317 @@ { "bluedevil": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/bluedevil-6.0.0.tar.xz", - "hash": "sha256-gxRzBpx78HGHryrLsQHTpsdHVVh+SQFCCY1aoFTuYmU=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/bluedevil-6.0.1.tar.xz", + "hash": "sha256-7bpz4yNYWvTgzHhtCAZXclkRP9fLH6sPYsvHOL1/53k=" }, "breeze": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/breeze-6.0.0.tar.xz", - "hash": "sha256-vHKhaxFre+q/G06aRRAZ+QSOe+awWsc6RifyWywgWeo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-6.0.1.tar.xz", + "hash": "sha256-IASCzv0Gbg1I4WqnOAqcsA5jSyujSDTNxzVPNjtgVE0=" }, "breeze-grub": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/breeze-grub-6.0.0.tar.xz", - "hash": "sha256-bsSL/16nneLcQgdr5ROGb9zV10K0ZytpDK8u3OXLcNY=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-grub-6.0.1.tar.xz", + "hash": "sha256-iI1vzXZ+j97dqgq/Uze81TSpeu+RqKXkf6oZcmdNguM=" }, "breeze-gtk": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/breeze-gtk-6.0.0.tar.xz", - "hash": "sha256-zsTK8cIpvDDKAMZgXbTbmKllAhZ/NKm3fKArJrSZqzY=" + "version": "6.0.1.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-gtk-6.0.1.1.tar.xz", + "hash": "sha256-I8qWYBzJv/AENPf7/jkB+8uSNi0XUaMcCFIPtMESRhA=" }, "breeze-plymouth": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/breeze-plymouth-6.0.0.tar.xz", - "hash": "sha256-J3eGWAwBDAmqGS+I0JZFmvYKKv/yWpDo/TldOlInpkw=" + "version": "6.0.1.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-plymouth-6.0.1.1.tar.xz", + "hash": "sha256-Xk/enHtV4kwK4inPSrct34g1nvewvSrnFbuH4eDx94I=" }, "discover": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/discover-6.0.0.tar.xz", - "hash": "sha256-e6gl/kd5pJX/7UaStQ5xFw4gIz25kB7L4VKO3Dqz37A=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/discover-6.0.1.tar.xz", + "hash": "sha256-fVGh2NErdS2rcyHMKC/mT8L2H5OAfDUzi1BEp4ahoZo=" }, "drkonqi": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/drkonqi-6.0.0.tar.xz", - "hash": "sha256-oI1SR63vWJ5K+8ow3xSPjxgjfFDWThOkzphb93h9MQY=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/drkonqi-6.0.1.tar.xz", + "hash": "sha256-X2YFQ8MKee/7SJANHrrZ+eViBRTaq96b2rwrXwGyAm0=" }, "flatpak-kcm": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/flatpak-kcm-6.0.0.tar.xz", - "hash": "sha256-3u5cNcxTHAkuSJjmvJUInDOzJ5z1mPk0RjY8bYD7cSE=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/flatpak-kcm-6.0.1.tar.xz", + "hash": "sha256-sHI/1B0LYRm1cplSH0iy1jXeIsZ3mfK/UDxbfD+N5YM=" }, "kactivitymanagerd": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kactivitymanagerd-6.0.0.tar.xz", - "hash": "sha256-khCzkcMpAY5FrGXG46d/ZFMvPgF2xYm812RgwgMBAvw=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kactivitymanagerd-6.0.1.tar.xz", + "hash": "sha256-L5LCvqE8fGn2gjfoyHBvfNnP70CdWex8HcSd+JRvsrc=" }, "kde-cli-tools": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kde-cli-tools-6.0.0.tar.xz", - "hash": "sha256-Q3DJO7XCBe8yv0i8APJj6qOQt/G0bfh1pC/L/79Ch0E=" - }, - "kdecoration": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kdecoration-6.0.0.tar.xz", - "hash": "sha256-NjpdI9kJUqXi4yvH+/Qf9Nu7fM/xOL7xnUiz2tEfFVE=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kde-cli-tools-6.0.1.tar.xz", + "hash": "sha256-RuDbooTXS1BpScAw4/gX8RwpJiwRbT6aKp5l855DzRU=" }, "kde-gtk-config": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kde-gtk-config-6.0.0.tar.xz", - "hash": "sha256-YAcf/LVCeBilDKqVsickidoQgFwyuXXTggJsB4+NhFM=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kde-gtk-config-6.0.1.tar.xz", + "hash": "sha256-u1Df3OqfIavqqAs91SiZMhrRi2bjNRYfZrRHKWCJflU=" + }, + "kdecoration": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kdecoration-6.0.1.tar.xz", + "hash": "sha256-gSDaTJyMrv6nYKj5egjz7P//uK8ncqtE34EJ9hn/NZY=" }, "kdeplasma-addons": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kdeplasma-addons-6.0.0.tar.xz", - "hash": "sha256-vQ1ZBmRGTIhv4URHvjjBYakntw+2yc4opwkPkJAmDPc=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kdeplasma-addons-6.0.1.tar.xz", + "hash": "sha256-ZFjmBdJY4LKkLWAUwzaALBDfGvP+FPNND9v56THNK28=" }, "kgamma": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kgamma-6.0.0.tar.xz", - "hash": "sha256-lwTTLITibYwzAX8LDFYrdBu7ZpW4n6OIKfyEN1pQVmU=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kgamma-6.0.1.tar.xz", + "hash": "sha256-+2CVNijflwfXuoMVXVgo1fRNCT7YQZdMeO6adOzjyRI=" }, "kglobalacceld": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kglobalacceld-6.0.0.tar.xz", - "hash": "sha256-qn6zTz36/cL0dbsg7WqFY6Lp+/sGRwiQ4SfckFT5Rao=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kglobalacceld-6.0.1.tar.xz", + "hash": "sha256-tA1DMo0CPXqxsmWj6FUNv+8rjQ0dsq2oWBEdzzwZTqc=" }, "kinfocenter": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kinfocenter-6.0.0.tar.xz", - "hash": "sha256-byma0LoUOGQSDazzZUSGOkkGg1pZFcHLiRcGzzmjfnk=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kinfocenter-6.0.1.tar.xz", + "hash": "sha256-FP7LO/ME5sI3eJ2WL+o/vHJWsEAwde2b9K661Y+IluA=" }, "kmenuedit": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kmenuedit-6.0.0.tar.xz", - "hash": "sha256-+moJ6P7DQ2gNWNR9rt8NWCZ/i5kPEuLFCqcrq8ljrF8=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kmenuedit-6.0.1.tar.xz", + "hash": "sha256-9wZA2Q88JbE5NFM5UDwAGax0Oy8ldd+d+Ywn0URcdiQ=" }, "kpipewire": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kpipewire-6.0.0.tar.xz", - "hash": "sha256-3Vhe5N47W83BDzb+XfkZZkR8pxZXDWtOoVFg2x8dc7w=" + "version": "6.0.1.1", + "url": "mirror://kde/stable/plasma/6.0.1/kpipewire-6.0.1.1.tar.xz", + "hash": "sha256-GQLzlJBS/xq12nnGMJWG8+EaKcfASgRPc7P2rJglHEo=" }, "kscreen": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kscreen-6.0.0.tar.xz", - "hash": "sha256-+XwEV2MLzg2Q/bwPbEXx4rIaYBRL0YLYtB9Yk5v9c0Y=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kscreen-6.0.1.tar.xz", + "hash": "sha256-WHLCDvu4mvi59SZWsFyYaE4PrOWAAdOw7g2nslgi9ho=" }, "kscreenlocker": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kscreenlocker-6.0.0.tar.xz", - "hash": "sha256-JQL6qFyHRgpLXqu5J2nTPBls0zc7PzpSHtOW5QTSKrY=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kscreenlocker-6.0.1.tar.xz", + "hash": "sha256-Kd74dcQG41cCjekXiFh/3mtTrL0Q1LgXd1S+z12VYCg=" }, "ksshaskpass": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/ksshaskpass-6.0.0.tar.xz", - "hash": "sha256-tdkYWBTLYsZMVfTA67KQ0jn3Pqr3IVjEWOVkM4xV7cY=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/ksshaskpass-6.0.1.tar.xz", + "hash": "sha256-0kRZcKvMZXYVKLfTp7KAJAb6ykTYkowpUOR7dXMDIUY=" }, "ksystemstats": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/ksystemstats-6.0.0.tar.xz", - "hash": "sha256-qFAYXmObZ4kt6lGy/7cadJj9BJ/8KNFz5u58atPzzro=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/ksystemstats-6.0.1.tar.xz", + "hash": "sha256-Bxr+Zkw47Gq3spK5DmtVzC0r6yC+P4qlOxMWgok6XEk=" }, "kwallet-pam": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwallet-pam-6.0.0.tar.xz", - "hash": "sha256-GTqIHaQf8VG84ejt86CUqzUbUi/ZDjenNX0aGV7wBno=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwallet-pam-6.0.1.tar.xz", + "hash": "sha256-Gti7wB7F0cIUQSK9PYKyJn2nfQdq47+ku/HEGi1wulA=" }, "kwayland": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwayland-6.0.0.tar.xz", - "hash": "sha256-ADEglGgZZqTPaSKIOYBHokE28bzhMjBzBNDf+hz57Xk=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwayland-6.0.1.tar.xz", + "hash": "sha256-0rTZqzHiVNZ1ek7GqxzngNvGwA1Mj2pdoHz5GB6MhZU=" }, "kwayland-integration": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwayland-integration-6.0.0.tar.xz", - "hash": "sha256-BOLLxF6jxLbxiroWYQ/Sx/ogsmPKYGKQsbJ1RmUBAek=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwayland-integration-6.0.1.tar.xz", + "hash": "sha256-G4S88fPSm7FKvEVUR4r9srx8x5UboSwtPIgCM4uzLHM=" }, "kwin": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwin-6.0.0.tar.xz", - "hash": "sha256-sZR8K0TeYZCQhGLIHorIn/nHMmqHZB/rZebM2FJipNs=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwin-6.0.1.tar.xz", + "hash": "sha256-bmGFfFAwt7OVPMDaXulKJDdVmZpM4AegAxH5HbiXXwQ=" }, "kwrited": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwrited-6.0.0.tar.xz", - "hash": "sha256-9kHAA98JHE83lsTG8xUdVieoo4UxAITi5/T8rPT3SmI=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwrited-6.0.1.tar.xz", + "hash": "sha256-YGx8Iojk9T9YmUPQhhjuFcOulE+HCDwJM7u+LeAhdBI=" }, "layer-shell-qt": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/layer-shell-qt-6.0.0.tar.xz", - "hash": "sha256-FaV6gtnMsNUgtVihc/Mxs5d1yADAsoSB2oCBFeHSirQ=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/layer-shell-qt-6.0.1.tar.xz", + "hash": "sha256-PbMq6DC2f1Wl3ikrdXkRJKft0DOYm36T5L2RPFj9l58=" }, "libkscreen": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/libkscreen-6.0.0.tar.xz", - "hash": "sha256-xCpykMiZ/IuIeJCnsD79cgtHbXrG/JHGTm8D2t/wm0Q=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/libkscreen-6.0.1.tar.xz", + "hash": "sha256-8D3Px59OGyDSvT0WluRiKpW8TTtjYHgP3wxAj/o2KJs=" }, "libksysguard": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/libksysguard-6.0.0.tar.xz", - "hash": "sha256-a3LM++1p8nvOwNhkFO14CHAQmAHMIMUFkBZXyFw2RN0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/libksysguard-6.0.1.tar.xz", + "hash": "sha256-kPDmZzBbmqucMqToAQyqzGqfsfyBpzuB0uu7SEXrLwM=" }, "libplasma": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/libplasma-6.0.0.tar.xz", - "hash": "sha256-sdj0cBoAndGHl8v2jwa9xFo+haJDsEGQiQtLQEQJJ9I=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/libplasma-6.0.1.tar.xz", + "hash": "sha256-df7WkHW/Eazi++KfHRUnDIc3+6qReJBQSe/YAt52tHQ=" }, "milou": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/milou-6.0.0.tar.xz", - "hash": "sha256-yOqST3w5FeHeqlIgugByOFJrPfkCmzrJjsoVjlVSs0o=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/milou-6.0.1.tar.xz", + "hash": "sha256-wC6xYOq3nUvsGvh3RDptPGVfS5UsUXHhmHAT2s1L5hA=" }, "ocean-sound-theme": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/ocean-sound-theme-6.0.0.tar.xz", - "hash": "sha256-IqDtyoacebSb5aJVtsPfsNJYTJ72jbt5BhOKfJb2efo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/ocean-sound-theme-6.0.1.tar.xz", + "hash": "sha256-YoctZEvuhcjofoyUcER3ttxIdyU8bqLfwGWeodN6sp0=" }, "oxygen": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/oxygen-6.0.0.tar.xz", - "hash": "sha256-+5NjfGeceeuPdkPn1IQiVfN/kluWW84v1Vf4Ct/6weg=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/oxygen-6.0.1.tar.xz", + "hash": "sha256-Tdkt0bgp7pwlSRunoigb2cTsmV1ujdBM+ZDr+4lJ91Q=" }, "oxygen-sounds": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/oxygen-sounds-6.0.0.tar.xz", - "hash": "sha256-dWWuHsxtOVvK9DaH7/lPVu2opCidDG/19KV1E5HG5Y8=" - }, - "plasma5support": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma5support-6.0.0.tar.xz", - "hash": "sha256-qhMUh/8sdciSzoxSgTtuH+LWpJ9S7QjzhwDiLA6Z6+0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/oxygen-sounds-6.0.1.tar.xz", + "hash": "sha256-bMbU68dKW17oLbEg9tdX28F/m3CRJ5hACiATMjGbeo8=" }, "plasma-activities": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-activities-6.0.0.tar.xz", - "hash": "sha256-8L0Hu82QIscuVkBGBGAps59x0cxbRnufUJFIEwQ7J5U=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-activities-6.0.1.tar.xz", + "hash": "sha256-L9fe7g6q78KXoC5o4Ra09tqUdbtvJvc9fO0bWSK/TYY=" }, "plasma-activities-stats": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-activities-stats-6.0.0.tar.xz", - "hash": "sha256-Xmqw/l88XbDeLr5q3NecJhcLkq3cBWzzXwSE+0UAfS4=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-activities-stats-6.0.1.tar.xz", + "hash": "sha256-d5/1WkSbl0UpWn3L/5oiq7TU8PdKgHIZZ09iT3tVpuo=" }, "plasma-browser-integration": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-browser-integration-6.0.0.tar.xz", - "hash": "sha256-IdX3JyJKnhxUhqc0UELbQoLqpC4JpoUvt3tbATX09kE=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-browser-integration-6.0.1.tar.xz", + "hash": "sha256-QpBJgaCwFxKG71tTAJHrXzZgBfEfzLlslcr2GQXYFjU=" }, "plasma-desktop": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-desktop-6.0.0.tar.xz", - "hash": "sha256-kkzgTbLIjPeuGiPxmzjrRSl3CHtuk37QVozlOXvMkn0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-desktop-6.0.1.tar.xz", + "hash": "sha256-l9dA6OO1/5IXO5qQhlZ9/0D/dwyjTQzs/rNdZQgIovE=" }, "plasma-disks": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-disks-6.0.0.tar.xz", - "hash": "sha256-uC/+Mn227ddGxCL3HgBxUjcT3m2bL0b7DhLQMAKHTyo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-disks-6.0.1.tar.xz", + "hash": "sha256-eC8HigBYUBU7uH3zZjRI/Uqpz/TMfMve+kClFq1+p/4=" }, "plasma-firewall": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-firewall-6.0.0.tar.xz", - "hash": "sha256-MrC04kHmfXqrKt5eo0VnDwlFhQ4iDWWro8blX2AYV5Y=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-firewall-6.0.1.tar.xz", + "hash": "sha256-K+GFZDSTYBGZiCUf4VLAdiBLR0LsDSFv5RtRjopzaec=" }, "plasma-integration": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-integration-6.0.0.tar.xz", - "hash": "sha256-Ez/2bspjY7eYtRUuluNwQAIT5aK8KL1jPYtpFAawLEE=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-integration-6.0.1.tar.xz", + "hash": "sha256-FtEj3D9ZxJIlG44vupScddO/D2fzzs+WxRvkjcQUQp8=" }, "plasma-mobile": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-mobile-6.0.0.tar.xz", - "hash": "sha256-128H4RR/0utqMuNdfLTIR5XtoysWHLCmCgRnah6ab/M=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-mobile-6.0.1.tar.xz", + "hash": "sha256-snOILhyWtKu57n9BInxHokC6v+9FkJ8N13ysBa02QAg=" }, "plasma-nano": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-nano-6.0.0.tar.xz", - "hash": "sha256-mfxE3tTdO0TEX4k+2SIaphJt3p1Paty3JwTAOpMgfCc=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-nano-6.0.1.tar.xz", + "hash": "sha256-IEHQFekEQButOtNaSjEC2kaGau6PycwMk9o3246plHQ=" }, "plasma-nm": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-nm-6.0.0.tar.xz", - "hash": "sha256-Us+Wc4zur85l8YOjRXMlrrWx8YpDNs7t5aImVW5unrQ=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-nm-6.0.1.tar.xz", + "hash": "sha256-cKIB7prSAiQrAP9QYZZkrFIFlE+J3yrDpyqfTOV4kyo=" }, "plasma-pa": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-pa-6.0.0.tar.xz", - "hash": "sha256-tJq7K7dEAbIs2uHZkhAddktIOhjGAIfCAvbmlRRdAiw=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-pa-6.0.1.tar.xz", + "hash": "sha256-Jyjs2fHFEG/ovAfwsDvaMWA2rcXQOjrAAVEfdUPDN8c=" }, "plasma-sdk": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-sdk-6.0.0.tar.xz", - "hash": "sha256-jLLeV6og30Qzp9lRMGpjfMKErOuuKzTPpxxQ7j7eKqo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-sdk-6.0.1.tar.xz", + "hash": "sha256-cuDXrIGZJI96emqO3nvc1geZDVhnqZmOHmrxT9cjKLc=" }, "plasma-systemmonitor": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-systemmonitor-6.0.0.tar.xz", - "hash": "sha256-WJ/QTx/g2Wv6KXpP4D7rAVx7X4OZMlvyMyd9/nnmb5k=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-systemmonitor-6.0.1.tar.xz", + "hash": "sha256-L4l5l4s0jWtxrAePmJ3SH/TptrDSW15Zo3G+UA/JnVE=" }, "plasma-thunderbolt": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-thunderbolt-6.0.0.tar.xz", - "hash": "sha256-BHjvWduv56m0l00o8Ukcud37OZ+DHW3BulqwN1zoqJ8=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-thunderbolt-6.0.1.tar.xz", + "hash": "sha256-mzw6wQ94iaZr+rv2KCPsld/a2f9GZSltDCB9S9KIkr0=" }, "plasma-vault": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-vault-6.0.0.tar.xz", - "hash": "sha256-ZB3XHds51dFb6E1LDCTVoODEG0zityVzj6cuWcRS7ak=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-vault-6.0.1.tar.xz", + "hash": "sha256-rWYoml4dP23zwX2xah+IwVi0z3h2VnJuiVhI0L5u0AU=" }, "plasma-welcome": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-welcome-6.0.0.tar.xz", - "hash": "sha256-xihVGMLHIQfGgnqdcZj5Oh8wrsb5mZPCoxHjE3/T5mw=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-welcome-6.0.1.tar.xz", + "hash": "sha256-+Lrjd8pQpMvsSpYwXy4rjowzNZ9ZamSFEQirCVC280E=" }, "plasma-workspace": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-workspace-6.0.0.tar.xz", - "hash": "sha256-R92HtMDgnBvLNBYreq4+WjuaSquhuf7Q9NaBuz+f67o=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-workspace-6.0.1.tar.xz", + "hash": "sha256-1MNcsWi5kEh7OfG36xlGkJxedPAgDQ3i0xdlnBbxWgw=" }, "plasma-workspace-wallpapers": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-workspace-wallpapers-6.0.0.tar.xz", - "hash": "sha256-Tde+PXqq8Bt8mmKGX/BITnSvEbJGhcVCMaMV90r2uB0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-workspace-wallpapers-6.0.1.tar.xz", + "hash": "sha256-MWMiru1TqQSs+mk3gT320hZEmM2dTC8th7YQu1vPgs4=" + }, + "plasma5support": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma5support-6.0.1.tar.xz", + "hash": "sha256-CyW9EyMGCEy1wNrgfFwP+noy2eserMDTS1bnhHEe0zU=" }, "plymouth-kcm": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plymouth-kcm-6.0.0.tar.xz", - "hash": "sha256-D79i6jP593fdbe4JPQlALUtNmF2Ghuc1S7xDavqJLeM=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plymouth-kcm-6.0.1.tar.xz", + "hash": "sha256-RQtov7L/0cuFzQLE1kEgg3iHB4SBGn+POngU1mM1Ink=" }, "polkit-kde-agent-1": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/polkit-kde-agent-1-6.0.0.tar.xz", - "hash": "sha256-LM/EGoPP74ybMxH+H5OrUtBi9jsPblpjsIJA7RFTqk4=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/polkit-kde-agent-1-6.0.1.tar.xz", + "hash": "sha256-YpgXxuVqVkfDr5fW3JYOd0RGAzK9PeavgJCV6LUy2T0=" }, "powerdevil": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/powerdevil-6.0.0.tar.xz", - "hash": "sha256-EmNCdg4bjKS5j6hXmryqQVuFnX1tGAKzagJWSGcssFA=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/powerdevil-6.0.1.tar.xz", + "hash": "sha256-CsSPI+gmRDhDQPBjkDeoQkFpqOGjS0nz9tJQUzJC0K8=" }, "print-manager": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/print-manager-6.0.0.tar.xz", - "hash": "sha256-vZBXi5HmyQoTxa/PlLwW1XvHo7feiURb+gFfDE54FP0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/print-manager-6.0.1.tar.xz", + "hash": "sha256-qMam4P00JMAi1yEUEKP3dMNT+G7ny08Yrb06pnEhl0o=" }, "qqc2-breeze-style": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/qqc2-breeze-style-6.0.0.tar.xz", - "hash": "sha256-pDDhl8ITxJif4Q/CSeTwrkYu4dP11vvJWPQus4sEySc=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/qqc2-breeze-style-6.0.1.tar.xz", + "hash": "sha256-d4hSRmOyOT2I8DeYeKu9HlLAUg6zyofZVHh3aiUCkLQ=" }, "sddm-kcm": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/sddm-kcm-6.0.0.tar.xz", - "hash": "sha256-iBIFJOqFFY5nhPNSP7cGQ8KmXBn+cu4NXwQAc6wih48=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/sddm-kcm-6.0.1.tar.xz", + "hash": "sha256-f8538z7WWFkQNx2YP+LiCxB/7KvIZS+K+wjZrhk+4c8=" }, "systemsettings": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/systemsettings-6.0.0.tar.xz", - "hash": "sha256-Vh+QE7oHBxwK3Xd4WOyF1AqN3fzIOhD18Ess4QFmZrw=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/systemsettings-6.0.1.tar.xz", + "hash": "sha256-HGShWBnCxoPGaXJfEa6Fos3ElOR5lvalbLLYExiQTZU=" }, "wacomtablet": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/wacomtablet-6.0.0.tar.xz", - "hash": "sha256-1/MYJz6HWKOiJAFuEJMIc/uO1wnZzWrMJm1lp47k0Ww=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/wacomtablet-6.0.1.tar.xz", + "hash": "sha256-m4LCsY3YClBN6OAM1qT5ypB2vZj6b6EReCIj3pRdzj4=" }, "xdg-desktop-portal-kde": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/xdg-desktop-portal-kde-6.0.0.tar.xz", - "hash": "sha256-xW7ePlFI33RoOWGLdLCuOPsPtrEM0Eo1xxvJL41X3Wo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/xdg-desktop-portal-kde-6.0.1.tar.xz", + "hash": "sha256-2koLhkyhdujOGfbhXSfI+RkyOlGgck7II3gXnDFY2Zk=" } } \ No newline at end of file diff --git a/nixpkgs/pkgs/kde/lib/mk-kde-derivation.nix b/nixpkgs/pkgs/kde/lib/mk-kde-derivation.nix index ddada8fb77f0..042c7531f07e 100644 --- a/nixpkgs/pkgs/kde/lib/mk-kde-derivation.nix +++ b/nixpkgs/pkgs/kde/lib/mk-kde-derivation.nix @@ -78,7 +78,6 @@ in extraNativeBuildInputs ? [], extraPropagatedBuildInputs ? [], extraCmakeFlags ? [], - meta ? {}, ... } @ args: let # FIXME(later): this is wrong for cross, some of these things really need to go into nativeBuildInputs, @@ -102,17 +101,7 @@ in separateDebugInfo = true; - meta = - { - description = projectInfo.${pname}.description; - homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}"; - license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname}); - maintainers = lib.teams.qt-kde.members; - # Platforms are currently limited to what upstream tests in CI, but can be extended if - # there's interest. - platforms = lib.platforms.linux ++ lib.platforms.freebsd; - } - // meta; + env.LANG = "C.UTF-8"; }; cleanArgs = builtins.removeAttrs args [ @@ -122,5 +111,17 @@ in "extraCmakeFlags" "meta" ]; + + meta = let + pos = builtins.unsafeGetAttrPos "pname" args; + in { + description = projectInfo.${pname}.description; + homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}"; + license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname}); + maintainers = lib.teams.qt-kde.members; + # Platforms are currently limited to what upstream tests in CI, but can be extended if there's interest. + platforms = lib.platforms.linux ++ lib.platforms.freebsd; + position = "${pos.file}:${toString pos.line}"; + } // (args.meta or { }); in - stdenv.mkDerivation (defaultArgs // cleanArgs) + stdenv.mkDerivation (defaultArgs // cleanArgs) // { inherit meta; } diff --git a/nixpkgs/pkgs/kde/plasma/default.nix b/nixpkgs/pkgs/kde/plasma/default.nix index b50dc05b2fa4..a29c1fc36d2e 100644 --- a/nixpkgs/pkgs/kde/plasma/default.nix +++ b/nixpkgs/pkgs/kde/plasma/default.nix @@ -9,8 +9,8 @@ flatpak-kcm = callPackage ./flatpak-kcm {}; kactivitymanagerd = callPackage ./kactivitymanagerd {}; kde-cli-tools = callPackage ./kde-cli-tools {}; - kdecoration = callPackage ./kdecoration {}; kde-gtk-config = callPackage ./kde-gtk-config {}; + kdecoration = callPackage ./kdecoration {}; kdeplasma-addons = callPackage ./kdeplasma-addons {}; kgamma = callPackage ./kgamma {}; kglobalacceld = callPackage ./kglobalacceld {}; @@ -34,7 +34,6 @@ ocean-sound-theme = callPackage ./ocean-sound-theme {}; oxygen = callPackage ./oxygen {}; oxygen-sounds = callPackage ./oxygen-sounds {}; - plasma5support = callPackage ./plasma5support {}; plasma-activities = callPackage ./plasma-activities {}; plasma-activities-stats = callPackage ./plasma-activities-stats {}; plasma-browser-integration = callPackage ./plasma-browser-integration {}; @@ -53,6 +52,7 @@ plasma-welcome = callPackage ./plasma-welcome {}; plasma-workspace = callPackage ./plasma-workspace {}; plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers {}; + plasma5support = callPackage ./plasma5support {}; plymouth-kcm = callPackage ./plymouth-kcm {}; polkit-kde-agent-1 = callPackage ./polkit-kde-agent-1 {}; powerdevil = callPackage ./powerdevil {}; diff --git a/nixpkgs/pkgs/kde/plasma/oxygen/default.nix b/nixpkgs/pkgs/kde/plasma/oxygen/default.nix index 5b5de64af90f..718a9737a8e1 100644 --- a/nixpkgs/pkgs/kde/plasma/oxygen/default.nix +++ b/nixpkgs/pkgs/kde/plasma/oxygen/default.nix @@ -1,6 +1,51 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + qtbase, + libsForQt5, +}: mkKdeDerivation { pname = "oxygen"; - # FIXME(qt5) - meta.broken = true; + + outputs = ["out" "dev" "qt5"]; + + # We can't add qt5 stuff to dependencies or the hooks blow up, + # so manually point everything to everything. Oof. + extraCmakeFlags = [ + "-DQt5_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5" + "-DQt5Core_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Core" + "-DQt5DBus_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5DBus" + "-DQt5Gui_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Gui" + "-DQt5Network_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Network" + "-DQt5Qml_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5Qml" + "-DQt5QmlModels_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5QmlModels" + "-DQt5Quick_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5Quick" + "-DQt5Widgets_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Widgets" + "-DQt5X11Extras_DIR=${libsForQt5.qtx11extras.dev}/lib/cmake/Qt5X11Extras" + "-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml" + + "-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth" + "-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs" + "-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config" + "-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" + "-DKF5Completion_DIR=${libsForQt5.kcompletion.dev}/lib/cmake/KF5Completion" + "-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" + "-DKF5FrameworkIntegration_DIR=${libsForQt5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration" + "-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" + "-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes" + "-DKF5I18n_DIR=${libsForQt5.ki18n.dev}/lib/cmake/KF5I18n" + "-DKF5Kirigami2_DIR=${libsForQt5.kirigami2.dev}/lib/cmake/KF5Kirigami2" + "-DKF5Service_DIR=${libsForQt5.kservice.dev}/lib/cmake/KF5Service" + "-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" + "-DKF5WindowSystem_DIR=${libsForQt5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" + ]; + + # Move Qt5 plugin to Qt5 plugin path + postInstall = '' + mkdir -p $qt5/${libsForQt5.qtbase.qtPluginPrefix}/styles + mv $out/${qtbase.qtPluginPrefix}/styles/oxygen5.so $qt5/${libsForQt5.qtbase.qtPluginPrefix}/styles + + moveToOutput bin/oxygen-demo5 $qt5 + moveToOutput 'lib/liboxygenstyle5*' $qt5 + moveToOutput 'lib/liboxygenstyleconfig5*' $qt5 + ''; } |