diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2017-06-09 08:44:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-09 08:44:01 +0100 |
| commit | 7badb92629191ea9d67ca855aa477d88272aeca9 (patch) | |
| tree | 86348538f1bd23baa89ac9feac8693f78a286d9b /pkgs/applications/editors | |
| parent | fbb5b2ef016a2dfc35f5d81664e78d84ac08d1f7 (diff) | |
| parent | 8f4619bb3d5229cc4fd0734d9a6aac19e923571a (diff) | |
| download | nixlib-7badb92629191ea9d67ca855aa477d88272aeca9.tar nixlib-7badb92629191ea9d67ca855aa477d88272aeca9.tar.gz nixlib-7badb92629191ea9d67ca855aa477d88272aeca9.tar.bz2 nixlib-7badb92629191ea9d67ca855aa477d88272aeca9.tar.lz nixlib-7badb92629191ea9d67ca855aa477d88272aeca9.tar.xz nixlib-7badb92629191ea9d67ca855aa477d88272aeca9.tar.zst nixlib-7badb92629191ea9d67ca855aa477d88272aeca9.zip | |
Merge pull request #26404 from ambrop72/kdevelop-511
kdevelop: 5.0.4 -> 5.1.1
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/kdevelop5/kdevelop.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/editors/kdevelop5/kdevplatform.nix | 17 |
2 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 9191d7a66537..c599666f4d52 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -9,16 +9,15 @@ let pname = "kdevelop"; - version = "5.0.4"; - dirVersion = "5.0.4"; + version = "5.1.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz"; - sha256 = "191142b2bdb14837c82721fdfeb15e852329f2c4c0d48fd479c57514c3235d55"; + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "0a01a4ffb2f01802cf4945521a3149a8f82c21fa8a97935991f1854b7db5d754"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix index f2b4fc32fe4c..d3680aff3d85 100644 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper +{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper , boost, subversion, apr, aprutil , qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n , kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications @@ -6,18 +6,25 @@ let pname = "kdevplatform"; - version = "5.0.4"; - dirVersion = "5.0.4"; + version = "5.1.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz"; - sha256 = "01abfcd71383048d017fe989ccce0e7590010a3975bbe6e161f55ababe2ad471"; + url = "mirror://kde/stable/kdevelop/${version}/src/${name}.tar.xz"; + sha256 = "3159440512b1373c1a4b35f401ba1f81217de9578372b45137af141eeda6e726"; }; + patches = [ + (fetchpatch { + name = "kdevplatform-project-selection.patch"; + url = "https://cgit.kde.org/kdevplatform.git/patch/?id=da4c0fdfcf21dc2a8f48a2b1402213a32effd47a"; + sha256 = "16ws8l6dciy2civjnsaj03ml2bzvg4a9g7gd4iyx4hprw65zrcxm"; + }) + ]; + nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ]; propagatedBuildInputs = [ ]; |