Merge pull request #324583 from K900/kde-gear-24.05.2

kdePackages: Gear 24.05.1 -> 24.05.2

pkgs/development/libraries/mlt/default.nix

@@ -36,7 +36,6 @@
 , enableSDL2 ? true
 , SDL2
 , gitUpdater
-, enableGlaxnimate ? true
 , libarchive
 }:
 
@@ -96,12 +95,11 @@ stdenv.mkDerivation rec {
     qt.qtbase
     qt.qtsvg
     (qt.qt5compat or null)
+    libarchive
   ] ++ lib.optionals enableSDL1 [
     SDL
   ] ++ lib.optionals enableSDL2 [
     SDL2
-  ] ++ lib.optionals enableGlaxnimate [
-    libarchive
   ];
 
   outputs = [ "out" "dev" ];
@@ -114,7 +112,6 @@ stdenv.mkDerivation rec {
     "-DSWIG_PYTHON=ON"
   ] ++ lib.optionals (qt != null) [
     "-DMOD_QT${lib.versions.major qt.qtbase.version}=ON"
-  ] ++ lib.optionals (qt != null && enableGlaxnimate) [
     "-DMOD_GLAXNIMATE${if lib.versions.major qt.qtbase.version == "5" then "" else "_QT6"}=ON"
   ];
 

pkgs/kde/gear/akonadi-search/default.nix

@@ -7,7 +7,7 @@
   cargo,
   rustc,
   # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-fSue83tCE1TqaEfp1dxlRblxzJQUTNIQMYA5fXcaDqc=",
+  cargoHash ? "sha256-po8ykNdP0+8gVUcebxqpo+p3Jm4DzZlskmgfBwzVc5s=",
 }:
 mkKdeDerivation rec {
   pname = "akonadi-search";

pkgs/kde/gear/angelfish/default.nix

@@ -8,7 +8,7 @@
   cargo,
   rustc,
   # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-Y0aG8NgiDTbDYgh8hMxfwSCHFh8f7PGABxw10m07dgs=",
+  cargoHash ? "sha256-GHXZKP4K5+ii2RyG9phllRSms4gRAl7kbFUyTUO59s0=",
   qcoro,
 }:
 mkKdeDerivation rec {

pkgs/kde/gear/kdenlive/default.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   mkKdeDerivation,
   substituteAll,
   qtsvg,
@@ -12,7 +11,6 @@
   shared-mime-info,
   libv4l,
   frei0r,
-  fetchpatch,
   glaxnimate,
 }:
 mkKdeDerivation {
@@ -26,13 +24,6 @@ mkKdeDerivation {
         ffmpeg = ffmpeg-full;
       }
     )
-
-    # Backport fix for crash after 5 minutes
-    # FIXME: remove in next release
-    (fetchpatch {
-      url = "https://invent.kde.org/multimedia/kdenlive/-/commit/8be0e826471332bb739344ebe1859298c46e9e0f.patch";
-      hash = "sha256-5hLePH5NlO4Lx8lg9kjBPI4jTmP666RGplaVCmS/9TA=";
-    })
   ];
 
   extraBuildInputs = [

pkgs/kde/gear/kdepim-addons/default.nix

@@ -8,7 +8,7 @@
   corrosion,
   alpaka,
   # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-uFQhxNpH9KG5+27EZNBwDX2sswd1nI86bESeeOnPXA4=",
+  cargoHash ? "sha256-NygCWuhwODsmUxwsMZNChVYUMI7Ryu+0MxBIsZaelC8=",
 }:
 mkKdeDerivation rec {
   pname = "kdepim-addons";