Merge pull request #65012 from aanderse/kdevelop

kdevelop, kdev-php, kdev-python: 5.3.2 -> 5.3.3
This commit is contained in:
Aaron Andersen 2019-07-18 12:27:45 -04:00 committed by GitHub
commit 02b260bc57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 20 deletions

View File

@ -1,15 +1,12 @@
{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: { stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }:
let
pname = "kdev-php";
version = "5.3.2";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; pname = "kdev-php";
version = "5.3.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
sha256 = "0yjn7y7al2xs8g0mrjvcym8gbjy4wmiv7lsljcrasjd7ymag1wgs"; sha256 = "0nn3yfbi60h7p7p1w2pvgg098qplbds79rk2iadyvhvl3sjd77wf";
}; };
nativeBuildInputs = [ cmake extra-cmake-modules ]; nativeBuildInputs = [ cmake extra-cmake-modules ];
@ -19,7 +16,7 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.aanderse ]; maintainers = [ maintainers.aanderse ];
platforms = platforms.linux; platforms = platforms.linux;
description = "PHP support for KDevelop"; description = "PHP support for KDevelop";
homepage = https://www.kdevelop.org; homepage = "https://www.kdevelop.org";
license = [ licenses.gpl2 ]; license = [ licenses.gpl2 ];
}; };
} }

View File

@ -1,15 +1,12 @@
{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: { stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }:
let
pname = "kdev-python";
version = "5.3.2";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; pname = "kdev-python";
version = "5.3.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
sha256 = "0gqv1abzfpxkrf538rb62d2291lmlra8rghm9q9r3x8a46wh96zm"; sha256 = "0bqsny2jgi6wi1cz65i2j9r1hiwna2x10mzy7vdk8bz7b4z766yg";
}; };
cmakeFlags = [ cmakeFlags = [
@ -23,7 +20,7 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.aanderse ]; maintainers = [ maintainers.aanderse ];
platforms = platforms.linux; platforms = platforms.linux;
description = "Python support for KDevelop"; description = "Python support for KDevelop";
homepage = https://www.kdevelop.org; homepage = "https://www.kdevelop.org";
license = [ licenses.gpl2 ]; license = [ licenses.gpl2 ];
}; };
} }

View File

@ -8,16 +8,15 @@
}: }:
let let
pname = "kdevelop";
version = "5.3.2";
qtVersion = "5.${lib.versions.minor qtbase.version}"; qtVersion = "5.${lib.versions.minor qtbase.version}";
in in
mkDerivation rec { mkDerivation rec {
name = "${pname}-${version}"; pname = "kdevelop";
version = "5.3.3";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
sha256 = "0akgdnvrab6mbwnmvgzsplk0qh83k1hnm5xc06yxr1s1a5sxbk08"; sha256 = "0778587qvi268ab2fgggfl40cv2swgr8q891q1paflp3m1xirpff";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -77,7 +76,7 @@ mkDerivation rec {
programing languages. It is based on KDevPlatform, KDE and Qt programing languages. It is based on KDevPlatform, KDE and Qt
libraries and is under development since 1998. libraries and is under development since 1998.
''; '';
homepage = https://www.kdevelop.org; homepage = "https://www.kdevelop.org";
license = with licenses; [ gpl2Plus lgpl2Plus ]; license = with licenses; [ gpl2Plus lgpl2Plus ];
}; };
} }