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

KDE Gear 24.08.2 (#347756)

parents a5883bc1 1dffb71d
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@
  lib,
  fetchFromGitLab,
  fetchgit,
  fetchpatch,

  cmake,
  ninja,
@@ -71,7 +72,16 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-GJYlxJkvFEXppVk0yC9ojszylfAGt3eBMAjNUu60XDY=";
  };

  patches = [ ./disable-tests-download.patch ];
  patches = [
    ./disable-tests-download.patch

    # Fix build with Qt 6.8
    # FIXME: remove in next update
    (fetchpatch {
      url = "https://invent.kde.org/graphics/digikam/-/commit/a8b49ed8df676cae0f48b3369831edde2b74903e.patch";
      hash = "sha256-93kQ/Dg/A9FR83ChyiUaRwyelE1Iq14eIecUteVbnqI=";
    })
  ];

  strictDeps = true;

+4 −3
Original line number Diff line number Diff line
@@ -13,12 +13,13 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
  pname = "shiboken6";
  version = "6.7.2";
  version = "6.8";

  src = fetchurl {
    # https://download.qt.io/official_releases/QtForPython/shiboken6/
    url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-${finalAttrs.version}-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz";
    hash = "sha256-OisNDW54yapd3H8GyktvEaP+FFYLrrFI7qU7XZjjaMc=";
    # FIXME: inconsistent version numbers in directory name and tarball?
    url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-${finalAttrs.version}.0-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz";
    hash = "sha256-XAWtOufnJ51tudyUpG6woF/Qk1NzCfdDnDhnG9clUZA=";
  };

  sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6";
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
  cargo,
  rustc,
  # provided as callPackage input to enable easier overrides through overlays
  cargoHash ? "sha256-myS9icWi2ZeQCCHZRP3xEMKToAa+afc8C+s3T8y19RE=",
  cargoHash ? "sha256-E+QaicYnFF79FDIhhvuEPQLikiLk5oKIjvLA132RUZo=",
}:
mkKdeDerivation rec {
  pname = "akonadi-search";
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@
  cargo,
  rustc,
  # provided as callPackage input to enable easier overrides through overlays
  cargoHash ? "sha256-xZkFVINKcJlJizHpBFLsMheQ45GsgWafzlDmxUydf5k=",
  cargoHash ? "sha256-B3M5tkmftR4nFbPAQqJDvvPidVGxq/8zH0KRgpBR92w=",
  qcoro,
}:
mkKdeDerivation rec {
+10 −0
Original line number Diff line number Diff line
{
  mkKdeDerivation,
  fetchpatch,
  pkg-config,
  ocaml,
  eigen,
@@ -10,6 +11,15 @@
mkKdeDerivation {
  pname = "kalzium";

  patches = [
    # Fix build with Qt 6.8
    # FIXME: remove in next major update
    (fetchpatch {
      url = "https://invent.kde.org/education/kalzium/-/commit/557d9bc96636f413430d0789cbf775915fc0dc45.patch";
      hash = "sha256-KDCT/COqk7OTuF8pN7qrRrIPRU4PSGm+efpCDGbtZwA=";
    })
  ];

  # FIXME: look into how to make it find libfacile
  extraNativeBuildInputs = [
    pkg-config
Loading