summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-02-18 12:00:27 -0600
committerThomas Tuegel <ttuegel@mailbox.org>2017-02-24 16:48:32 -0600
commit0757d49800154b1936cb4c89c578b2ca3c380e71 (patch)
tree65de001b4d234f5f351186ebb9b3ac1813fd512a
parente5e0f8961204caa3de9b2e7a76774061e7a5d76c (diff)
downloadnixlib-0757d49800154b1936cb4c89c578b2ca3c380e71.tar
nixlib-0757d49800154b1936cb4c89c578b2ca3c380e71.tar.gz
nixlib-0757d49800154b1936cb4c89c578b2ca3c380e71.tar.bz2
nixlib-0757d49800154b1936cb4c89c578b2ca3c380e71.tar.lz
nixlib-0757d49800154b1936cb4c89c578b2ca3c380e71.tar.xz
nixlib-0757d49800154b1936cb4c89c578b2ca3c380e71.tar.zst
nixlib-0757d49800154b1936cb4c89c578b2ca3c380e71.zip
Remove kde4.kdevelop
- Already updated to KDE 5 in Nixpkgs
-rw-r--r--pkgs/applications/editors/kdevelop/default.nix38
-rw-r--r--pkgs/applications/editors/kdevelop/gettext.patch8
-rw-r--r--pkgs/development/libraries/kdevplatform/default.nix35
-rw-r--r--pkgs/development/libraries/kdevplatform/dependency.patch12
-rw-r--r--pkgs/development/libraries/kdevplatform/gettext.patch8
-rw-r--r--pkgs/top-level/all-packages.nix6
6 files changed, 0 insertions, 107 deletions
diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix
deleted file mode 100644
index 938a56518d5f..000000000000
--- a/pkgs/applications/editors/kdevelop/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info,
-  kdebase_workspace, gettext, perl, okteta, qjson, kate, konsole, kde_runtime, oxygen_icons }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  version = "4.7.3";
-  pname = "kdevelop";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "9db388d1c8274da7d168c13db612c7e94ece7815757b945b0aa0371620a06b35";
-  };
-
-  buildInputs = [ kdevplatform kdebase_workspace okteta qjson ];
-
-  nativeBuildInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
-
-  propagatedUserEnvPkgs = [ kdevplatform kate konsole kde_runtime oxygen_icons ];
-
-  patches = [ ./gettext.patch ];
-
-  NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
-
-  meta = with stdenv.lib; {
-    maintainers = [ maintainers.urkud ];
-    platforms = platforms.linux;
-    description = "KDE official IDE";
-    longDescription =
-      ''
-        A free, opensource IDE (Integrated Development Environment)
-        for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a
-        feature-full, plugin extendable IDE for C/C++ and other
-        programing languages. It is based on KDevPlatform, KDE and Qt
-        libraries and is under development since 1998.
-      '';
-    homepage = https://www.kdevelop.org;
-  };
-}
diff --git a/pkgs/applications/editors/kdevelop/gettext.patch b/pkgs/applications/editors/kdevelop/gettext.patch
deleted file mode 100644
index cefbc743fc3e..000000000000
--- a/pkgs/applications/editors/kdevelop/gettext.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -urN kdevelop-4.7.3.orig/po/CMakeLists.txt kdevelop-4.7.3/po/CMakeLists.txt
---- kdevelop-4.7.3.orig/po/CMakeLists.txt	2016-03-04 23:29:09.411886565 +0100
-+++ kdevelop-4.7.3/po/CMakeLists.txt	2016-03-04 23:28:35.108451713 +0100
-@@ -1,3 +1,4 @@
-+cmake_policy(SET CMP0002 OLD)
- find_package(Gettext REQUIRED)
- if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
- MESSAGE(FATAL_ERROR "Please install msgmerge binary")
diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix
deleted file mode 100644
index 549be9a71f50..000000000000
--- a/pkgs/development/libraries/kdevplatform/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, phonon,
-  gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }:
-
-stdenv.mkDerivation rec {
-  name = "kdevplatform-1.7.3";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kdevelop/4.7.3/src/${name}.tar.bz2";
-    sha256 = "195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b";
-  };
-
-  patches = [
-    ./gettext.patch     # build error caused by CMake update
-    ./dependency.patch  # build error: https://phabricator.kde.org/D1160
-  ];
-
-  propagatedBuildInputs = [ kdelibs qt4 phonon ];
-  buildInputs = [ apr aprutil subversion boost qjson grantlee ];
-
-  nativeBuildInputs = [ cmake automoc4 gettext pkgconfig ];
-
-  enableParallelBuilding = false;
-
-  meta = with stdenv.lib; {
-    maintainers = [ maintainers.ambrop72 ];
-    platforms = platforms.linux;
-    description = "KDE libraries for IDE-like programs";
-    longDescription = ''
-      A free, opensource set of libraries that can be used as a foundation for
-      IDE-like programs. It is programing-language independent, and is planned
-      to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc."
-    '';
-    homepage = https://www.kdevelop.org;
-  };
-}
diff --git a/pkgs/development/libraries/kdevplatform/dependency.patch b/pkgs/development/libraries/kdevplatform/dependency.patch
deleted file mode 100644
index 3205b4cab675..000000000000
--- a/pkgs/development/libraries/kdevplatform/dependency.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt
---- a/plugins/filetemplates/CMakeLists.txt
-+++ b/plugins/filetemplates/CMakeLists.txt
-@@ -81,6 +81,7 @@
- )
- 
- kde4_add_executable(testfiletemplates ${test_srcs})
-+add_dependencies(testfiletemplates kdevfiletemplates)
- 
- target_link_libraries(testfiletemplates
-     ${KDE4_KDECORE_LIBS}
-
diff --git a/pkgs/development/libraries/kdevplatform/gettext.patch b/pkgs/development/libraries/kdevplatform/gettext.patch
deleted file mode 100644
index 733a542e0c8b..000000000000
--- a/pkgs/development/libraries/kdevplatform/gettext.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -urN kdevplatform-1.7.3.orig/po/CMakeLists.txt kdevplatform-1.7.3/po/CMakeLists.txt
---- kdevplatform-1.7.3.orig/po/CMakeLists.txt	2016-03-04 23:25:30.102112596 +0100
-+++ kdevplatform-1.7.3/po/CMakeLists.txt	2016-03-04 23:26:06.242570024 +0100
-@@ -1,3 +1,4 @@
-+cmake_policy(SET CMP0002 OLD)
- find_package(Gettext REQUIRED)
- if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
- MESSAGE(FATAL_ERROR "Please install msgmerge binary")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20144d6df410..84229ed4e3a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16735,12 +16735,6 @@ with pkgs;
 
         kdesvn = callPackage ../applications/version-management/kdesvn { };
 
-        kdevelop = callPackage ../applications/editors/kdevelop { };
-
-        kdevplatform = callPackage ../development/libraries/kdevplatform {
-          boost = boost155;
-        };
-
         kdiff3 = callPackage ../tools/text/kdiff3 { };
 
         kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };