JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kde5.kpackage: 5.29.0 -> 5.29.1

Browse Source
This commit is contained in:
Thomas Tuegel 2016-12-18 08:26:15 -06:00
parent 46b1cc4f75
commit 3f206e34f2
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/libraries/kde-frameworks/kpackage/default.nix
View File

@ -1,10 +1,7 @@
{ kdeFramework, fetchurl, lib, copyPathsToStore {
, ecm kdeFramework, fetchurl, lib, copyPathsToStore,
, karchive ecm, kdoctools,
, kconfig karchive, kconfig, kcoreaddons, ki18n
, kcoreaddons
, kdoctools
, ki18n
}: }:
kdeFramework { kdeFramework {
@ -12,18 +9,5 @@ kdeFramework {
meta = { maintainers = [ lib.maintainers.ttuegel ]; }; meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ ecm kdoctools ]; nativeBuildInputs = [ ecm kdoctools ];
propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ]; propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ];
patches = patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
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";
})
];
} }

8
pkgs/development/libraries/kde-frameworks/srcs.nix
View File

@ -387,11 +387,11 @@
}; };
}; };
kpackage = { kpackage = {
version = "5.29.0"; version = "5.29.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/frameworks/5.29/kpackage-5.29.0.tar.xz"; url = "${mirror}/stable/frameworks/5.29/kpackage-5.29.1.tar.xz";
sha256 = "1hgzwfb0yxd6n8dc8hrkdsrf21s2xzrka69mhzq0giskpbd2m8fs"; sha256 = "1vbwq5s1psii3qa6g260lpar37y19k8b2g5hn3pyx4llz5wnrali";
name = "kpackage-5.29.0.tar.xz"; name = "kpackage-5.29.1.tar.xz";
}; };
}; };
kparts = { kparts = {