kdePackages.plasma-desktop: 6.3.1 -> 6.3.1.1 (#383349)

NixOS · Feb 19, 2025 · 732e35c · 732e35c
2 parents c69aad4 + a56a3d7
commit 732e35c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 115 deletions.
diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
@@ -195,9 +195,9 @@
     "hash": "sha256-kaSXmq4aChMZSLCz+JcIvREGsH59sPwdU708omjaYSc="
   },
   "plasma-desktop": {
-    "version": "6.3.1",
-    "url": "mirror://kde/stable/plasma/6.3.1/plasma-desktop-6.3.1.tar.xz",
-    "hash": "sha256-EZydNhJ0NnBIMghky6/8YSUwy6TqYtbf1QTz7+WyVKQ="
+    "version": "6.3.1.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-desktop-6.3.1.1.tar.xz",
+    "hash": "sha256-zgKHR9MeF2vem/RoA7LaVKy8Beu8/52cWFzALpsmrP0="
   },
   "plasma-dialer": {
     "version": "6.3.1",

diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix
@@ -43,11 +43,6 @@ mkKdeDerivation {
     (replaceVars ./wallpaper-paths.patch {
       wallpapers = "${lib.getBin breeze}/share/wallpapers";
     })
-
-    # Fix build failure due to C++ template nonsense
-    # Submitted upstream: https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/2833
-    # FIXME: remove when merged
-    ./fix-build.patch
   ];
 
   extraNativeBuildInputs = [ pkg-config ];

diff --git a/pkgs/kde/plasma/plasma-desktop/fix-build.patch b/pkgs/kde/plasma/plasma-desktop/fix-build.patch