summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/libraries/kde-frameworks/kpackage/default.nix26
-rw-r--r--pkgs/development/libraries/kde-frameworks/srcs.nix8
2 files changed, 9 insertions, 25 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
index c3b89a05d198..86ca5935a75d 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
@@ -1,10 +1,7 @@
-{ kdeFramework, fetchurl, lib, copyPathsToStore
-, ecm
-, karchive
-, kconfig
-, kcoreaddons
-, kdoctools
-, ki18n
+{
+  kdeFramework, fetchurl, lib, copyPathsToStore,
+  ecm, kdoctools,
+  karchive, kconfig, kcoreaddons, ki18n
 }:
 
 kdeFramework {
@@ -12,18 +9,5 @@ kdeFramework {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ];
-  patches =
-    copyPathsToStore (lib.readPathsFromFile ./. ./series)
-    ++ [
-      (fetchurl {
-        url = "https://cgit.kde.org/kpackage.git/patch/?id=26e59d58438cc777873a6afc7817418ec735aaa3";
-        sha256 = "05ad3awdq8cz1bmnhnf1lapvm70z5qc8sbdzrcgxlka7wzdbm5lw";
-        name = "fix-cmake-failure-package-id-collision.patch";
-      })
-      (fetchurl {
-        url = "https://cgit.kde.org/kpackage.git/patch/?id=17915200921836d61266ad93dd6c3b87db1dc9e4";
-        sha256 = "07irfx297lf39cyrv10i3q4z04fr8msm6pcp8mcwvss4gih05b74";
-        name = "fix-cmake-failure-package-id-collision.patch";
-      })
-    ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index e8ecb3d058fc..7bc0f55dc8b5 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -387,11 +387,11 @@
     };
   };
   kpackage = {
-    version = "5.29.0";
+    version = "5.29.1";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.29/kpackage-5.29.0.tar.xz";
-      sha256 = "1hgzwfb0yxd6n8dc8hrkdsrf21s2xzrka69mhzq0giskpbd2m8fs";
-      name = "kpackage-5.29.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.29/kpackage-5.29.1.tar.xz";
+      sha256 = "1vbwq5s1psii3qa6g260lpar37y19k8b2g5hn3pyx4llz5wnrali";
+      name = "kpackage-5.29.1.tar.xz";
     };
   };
   kparts = {