Unverified Commit e9e72a4b authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #251163 from K900/kde-gear-23.08

kde/gear: 23.04.3 -> 23.08.0
parents 30006c19 e50edcb5
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
  mkDerivation, lib, kdepimTeam,
  extra-cmake-modules, kdoctools,
  akonadi, akonadi-contacts, kcalendarcore, kcalutils, kcontacts,
  kidentitymanagement, kio, kmailtransport,
  kidentitymanagement, kio, kmailtransport, messagelib
}:

mkDerivation {
@@ -14,7 +14,7 @@ mkDerivation {
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  propagatedBuildInputs = [
    akonadi akonadi-contacts kcalendarcore kcalutils kcontacts kidentitymanagement
    kio kmailtransport
    kio kmailtransport messagelib
  ];
  outputs = [ "out" "dev" ];
  postInstall = ''
+5 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@
, cmake
, corrosion
, extra-cmake-modules
, futuresql
, kconfig
, kcoreaddons
, kdbusaddons
@@ -13,6 +14,7 @@
, knotifications
, kpurpose
, kwindowsystem
, qcoro
, qtfeedback
, qtquickcontrols2
, qqc2-desktop-style
@@ -22,7 +24,7 @@
, srcs

# provided as callPackage input to enable easier overrides through overlays
, cargoSha256 ? "sha256-Wthw7foadXO6jYJO1TB4OOYtpwnp8iCdda4tdiYg41A="
, cargoSha256 ? "sha256-FI94TU3MgIl1tcjwJnzb2PKO1rbZ3uRB1mzXXkNU95I="
}:

mkDerivation rec {
@@ -45,6 +47,7 @@ mkDerivation rec {
  ];

  buildInputs = [
    futuresql
    kconfig
    kcoreaddons
    kdbusaddons
@@ -54,6 +57,7 @@ mkDerivation rec {
    knotifications
    kpurpose
    kwindowsystem
    qcoro
    qtfeedback
    qtquickcontrols2
    qqc2-desktop-style
+25 −24
Original line number Diff line number Diff line
{ lib
, mkDerivation
, fetchurl
, cmake
, extra-cmake-modules
, pkg-config
, qtbase
, qtdeclarative
, qtquickcontrols2
, qtwebchannel
, qtwebengine
, qtwebsockets
, baloo
, karchive
, kconfig
, kcoreaddons
, kdbusaddons
, kfilemetadata
, kirigami2
, ki18n
, kirigami-addons
, kitemmodels
, kquickcharts
, plasma-framework
, kwindowsystem
, qqc2-desktop-style
, qtbase
, qtquickcontrols2
, qtwebsockets
, qtwebengine
}:

mkDerivation rec {
mkDerivation {
  pname = "arianna";
  version = "1.1.0";

  src = fetchurl {
    url = "mirror://kde/stable/arianna/arianna-${version}.tar.xz";
    hash = "sha256-C60PujiUTyw2DwImu8PVmU687CP9CuWZ+d8LuZKthKY=";
  };

  nativeBuildInputs = [
    cmake
    extra-cmake-modules
    pkg-config
  ];

  buildInputs = [
    qtbase
    qtdeclarative
    qtquickcontrols2
    qtwebchannel
    qtwebengine
    qtwebsockets
    baloo
    karchive
    kconfig
    kcoreaddons
    kdbusaddons
    kfilemetadata
    kirigami2
    ki18n
    kirigami-addons
    kitemmodels
    kquickcharts
    plasma-framework
    kwindowsystem
    qqc2-desktop-style
    qtbase
    qtquickcontrols2
    qtwebsockets
    qtwebengine
  ];

  meta = with lib; {
+4 −0
Original line number Diff line number Diff line
@@ -4,12 +4,14 @@
, extra-cmake-modules
, wrapGAppsHook

, futuresql
, gst_all_1
, kcoreaddons
, kcrash
, ki18n
, kirigami2
, kirigami-addons
, qcoro
, qtimageformats
, qtmultimedia
, qtquickcontrols2
@@ -27,11 +29,13 @@ mkDerivation rec {
  ];

  buildInputs = [
    futuresql
    kcoreaddons
    kcrash
    ki18n
    kirigami2
    kirigami-addons
    qcoro
    qtimageformats
    qtmultimedia
    qtquickcontrols2
+1 −6
Original line number Diff line number Diff line
@@ -93,12 +93,7 @@ mkDerivation {

  qtWrapperArgs = [
    "--prefix PATH : ${placeholder "out"}/bin"
  ];

  postInstall = lib.optionalString withSage ''
    wrapProgram $out/share/cantor/sagebackend/cantor-execsage \
      --prefix PATH : ${sage-with-env}/bin
  '';
  ] ++ lib.optional withSage "--prefix PATH : ${sage-with-env}/bin";

  meta = with lib; {
    description = "Front end to powerful mathematics and statistics packages";
Loading