diff --git a/pkgs/development/libraries/qscintilla-qt4/default.nix b/pkgs/development/libraries/qscintilla-qt4/default.nix deleted file mode 100644 index 23daedd217e2..000000000000 --- a/pkgs/development/libraries/qscintilla-qt4/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv -, lib -, fetchurl -, unzip -, qt4 -, qmake4Hook -}: - -stdenv.mkDerivation rec { - pname = "qscintilla-qt4"; - version = "2.11.6"; - - src = fetchurl { - url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz"; - sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc="; - }; - - sourceRoot = "QScintilla-${version}/Qt4Qt5"; - - buildInputs = [ qt4 ]; - - nativeBuildInputs = [ unzip qmake4Hook ]; - - patches = [ - ./fix-qt4-build.patch - ]; - - # Make sure that libqscintilla2.so is available in $out/lib since it is expected - # by some packages such as sqlitebrowser - postFixup = '' - ln -s $out/lib/libqscintilla2_qt4.so $out/lib/libqscintilla2.so - ''; - - dontWrapQtApps = true; - - postPatch = '' - substituteInPlace qscintilla.pro \ - --replace '$$[QT_INSTALL_LIBS]' $out/lib \ - --replace '$$[QT_INSTALL_HEADERS]' $out/include \ - --replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \ - --replace '$$[QT_HOST_DATA]/mkspecs' $out/mkspecs \ - --replace '$$[QT_INSTALL_DATA]/mkspecs' $out/mkspecs \ - --replace '$$[QT_INSTALL_DATA]' $out/share - ''; - - meta = with lib; { - description = "A Qt port of the Scintilla text editing library"; - longDescription = '' - QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor - control. - - As well as features found in standard text editing components, - QScintilla includes features especially useful when editing and - debugging source code. These include support for syntax styling, - error indicators, code completion and call tips. The selection - margin can contain markers like those used in debuggers to - indicate breakpoints and the current line. Styling choices are - more open than with many editors, allowing the use of - proportional fonts, bold and italics, multiple foreground and - background colours and multiple fonts. - ''; - homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro"; - license = with licenses; [ gpl3 ]; # and commercial - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch b/pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch deleted file mode 100644 index 520a55b1ea21..000000000000 --- a/pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur QScintilla_gpl-2.11.2/Qt4Qt5/Qsci/qsciscintillabase.h QScintilla_gpl-2.11.2-fix/Qt4Qt5/Qsci/qsciscintillabase.h ---- Qt4Qt5/Qsci/qsciscintillabase.h 2019-06-25 14:49:27.000000000 +0200 -+++ Qt4Qt5-fix/Qsci/qsciscintillabase.h 2019-10-04 10:22:26.337474261 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #include - diff --git a/pkgs/development/python-modules/qscintilla-qt4/default.nix b/pkgs/development/python-modules/qscintilla-qt4/default.nix deleted file mode 100644 index a356bfddb934..000000000000 --- a/pkgs/development/python-modules/qscintilla-qt4/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, isPy3k -, isPyPy -, pkgs -, python -, pyqt4 -}: - -buildPythonPackage { - pname = "qscintilla-qt4"; - version = pkgs.qscintilla-qt4.version; - format = "other"; - - disabled = isPyPy; - - src = pkgs.qscintilla-qt4.src; - - nativeBuildInputs = [ pkgs.xorg.lndir ]; - - buildInputs = [ pyqt4.qt pyqt4 ]; - - preConfigure = '' - mkdir -p $out - lndir ${pyqt4} $out - rm -rf "$out/nix-support" - cd Python - ${python.executable} ./configure-old.py \ - --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \ - --apidir $out/api/${python.libPrefix} \ - -n ${pkgs.qscintilla-qt4}/include \ - -o ${pkgs.qscintilla-qt4}/lib \ - --sipdir $out/share/sip - ''; - - meta = with lib; { - description = "A Python binding to QScintilla, Qt based text editing control"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ danbst ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a4b4e02523d..d321ca348275 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12469,8 +12469,6 @@ with pkgs; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; - qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { }; - qscintilla-qt6 = qt6Packages.callPackage ../development/libraries/qscintilla { }; qrcp = callPackage ../tools/networking/qrcp { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88312ac29767..f6c160f5663d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10902,8 +10902,6 @@ self: super: with self; { qreactor = callPackage ../development/python-modules/qreactor { }; - qscintilla-qt4 = callPackage ../development/python-modules/qscintilla-qt4 { }; - qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; };