Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #55872 from aanderse/kdevelop-php

kdevelop: added ability to include kdevelop plugins, kdev-php: init at 5.3.1, kdev-python: init at 5.3.1

authored by

Franz Pletz and committed by
GitHub
160abfe3 e0a92755

+82 -2
+29
pkgs/applications/editors/kdevelop5/kdev-php.nix
··· 1 + { stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: 2 + 3 + let 4 + pname = "kdev-php"; 5 + version = "5.3.1"; 6 + in 7 + stdenv.mkDerivation rec { 8 + name = "${pname}-${version}"; 9 + 10 + src = fetchurl { 11 + url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; 12 + sha256 = "1xiz4v6w30dsa7l4nk3jw3hxpkx71b0yaaj2k8s7xzgjif824bgl"; 13 + }; 14 + 15 + cmakeFlags = [ 16 + "-DBUILD_TESTING=OFF" 17 + ]; 18 + 19 + nativeBuildInputs = [ cmake extra-cmake-modules ]; 20 + buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ]; 21 + 22 + meta = with lib; { 23 + maintainers = [ maintainers.aanderse ]; 24 + platforms = platforms.linux; 25 + description = "PHP support for KDevelop"; 26 + homepage = https://www.kdevelop.org; 27 + license = [ licenses.gpl2 ]; 28 + }; 29 + }
+30
pkgs/applications/editors/kdevelop5/kdev-python.nix
··· 1 + { stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: 2 + 3 + let 4 + pname = "kdev-python"; 5 + version = "5.3.1"; 6 + in 7 + stdenv.mkDerivation rec { 8 + name = "${pname}-${version}"; 9 + 10 + src = fetchurl { 11 + url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; 12 + sha256 = "11hf8n6vrlaz31c0p3xbnf0df2q5j6ykgc9ip0l5g33kadwn5b9j"; 13 + }; 14 + 15 + cmakeFlags = [ 16 + "-DBUILD_TESTING=OFF" 17 + "-DPYTHON_EXECUTABLE=${python}/bin/python" 18 + ]; 19 + 20 + nativeBuildInputs = [ cmake extra-cmake-modules ]; 21 + buildInputs = [ threadweaver ktexteditor kdevelop-unwrapped ]; 22 + 23 + meta = with lib; { 24 + maintainers = [ maintainers.aanderse ]; 25 + platforms = platforms.linux; 26 + description = "Python support for KDevelop"; 27 + homepage = https://www.kdevelop.org; 28 + license = [ licenses.gpl2 ]; 29 + }; 30 + }
+7
pkgs/applications/editors/kdevelop5/kdevelop.nix
··· 43 43 "-DCLANG_BUILTIN_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${(builtins.parseDrvName llvmPackages.clang.name).version}/include" 44 44 ]; 45 45 46 + postPatch = '' 47 + # FIXME: temporary until https://invent.kde.org/kde/kdevelop/merge_requests/8 is merged 48 + substituteInPlace kdevplatform/language/backgroundparser/parsejob.cpp --replace \ 49 + 'if (internalFilePath.startsWith(dataPath.canonicalPath() + QStringLiteral("/kdev"))) {' \ 50 + 'if (internalFilePath.startsWith(dataPath.canonicalPath() + QStringLiteral("/kdev")) || localFile.startsWith(path + QStringLiteral("/kdev"))) {' 51 + ''; 52 + 46 53 postInstall = '' 47 54 # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. 48 55 wrapProgram "$out/bin/kdevelop!" \
+7
pkgs/applications/editors/kdevelop5/wrapper.nix
··· 1 + { symlinkJoin, kdevelop-unwrapped, plugins ? null }: 2 + 3 + symlinkJoin { 4 + name = "kdevelop-with-plugins"; 5 + 6 + paths = [ kdevelop-unwrapped ] ++ (if plugins != null then plugins else []); 7 + }
+9 -2
pkgs/top-level/all-packages.nix
··· 17906 17906 17907 17907 inherit (kdeFrameworks) kdesu; 17908 17908 17909 - kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {}; 17909 + kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; 17910 17910 17911 - kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { 17911 + kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { 17912 17912 llvmPackages = llvmPackages_7; 17913 17913 }; 17914 + 17915 + kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; 17916 + kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix { 17917 + python = python3; 17918 + }; 17919 + 17920 + kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { }; 17914 17921 17915 17922 keepnote = callPackage ../applications/office/keepnote { }; 17916 17923