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

Merge pull request #26404 from ambrop72/kdevelop-511

Browse Source 
kdevelop: 5.0.4 -> 5.1.1
This commit is contained in:
Joachim F 2017-06-09 08:44:01 +01:00 committed by GitHub
commit 7badb92629
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/editors/kdevelop5/kdevelop.nix
View File

@ -9,16 +9,15 @@
let let
pname = "kdevelop"; pname = "kdevelop";
version = "5.0.4"; version = "5.1.1";
dirVersion = "5.0.4";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz"; url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
sha256 = "191142b2bdb14837c82721fdfeb15e852329f2c4c0d48fd479c57514c3235d55"; sha256 = "0a01a4ffb2f01802cf4945521a3149a8f82c21fa8a97935991f1854b7db5d754";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

17
pkgs/applications/editors/kdevelop5/kdevplatform.nix
View File

@ -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 , boost, subversion, apr, aprutil
, qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n , qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n
, kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications , kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications
@ -6,18 +6,25 @@
let let
pname = "kdevplatform"; pname = "kdevplatform";
version = "5.0.4"; version = "5.1.1";
dirVersion = "5.0.4";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz"; url = "mirror://kde/stable/kdevelop/${version}/src/${name}.tar.xz";
sha256 = "01abfcd71383048d017fe989ccce0e7590010a3975bbe6e161f55ababe2ad471"; 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 ]; nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];
propagatedBuildInputs = [ ]; propagatedBuildInputs = [ ];