diff --git a/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch b/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch deleted file mode 100644 index b42b7c3295c3..000000000000 --- a/pkgs/applications/office/cutemarked-ng/0001-remove-dependency-on-vendored-library.patch +++ /dev/null @@ -1,95 +0,0 @@ -From b9bf46966dd7931f9f33c30ed608a21d0e71e923 Mon Sep 17 00:00:00 2001 -From: rewine -Date: Tue, 19 Jul 2022 13:19:10 +0800 -Subject: [PATCH 1/2] remove dependency on vendored library - ---- - CuteMarkEd.pro | 4 +--- - app-static/app-static.pro | 11 ++--------- - app/app.pro | 2 -- - app/cutemarkdownhighlighter.h | 2 +- - 4 files changed, 4 insertions(+), 15 deletions(-) - -diff --git a/CuteMarkEd.pro b/CuteMarkEd.pro -index 4ee92e3..0d247a4 100644 ---- a/CuteMarkEd.pro -+++ b/CuteMarkEd.pro -@@ -9,12 +9,10 @@ TEMPLATE = subdirs - CONFIG += c++14 - - SUBDIRS = \ -- 3rdparty \ - libs \ - app-static \ - app \ -- fontawesomeicon \ -- test -+ fontawesomeicon - - # build order: 3rdparty -> libs -> app-static -> app & test - #libs.depends = 3rdparty -diff --git a/app-static/app-static.pro b/app-static/app-static.pro -index cd3c292..560b4fc 100644 ---- a/app-static/app-static.pro -+++ b/app-static/app-static.pro -@@ -13,7 +13,6 @@ CONFIG += c++11 - - INCLUDEPATH += $$PWD - # MD4C library --INCLUDEPATH += $$PWD/../3rdparty/md4c/src - - SOURCES += \ - snippets/jsonsnippettranslator.cpp \ -@@ -34,10 +33,7 @@ SOURCES += \ - revealviewsynchronizer.cpp \ - htmlpreviewcontroller.cpp \ - htmlviewsynchronizer.cpp \ -- yamlheaderchecker.cpp \ -- $$PWD/../3rdparty/md4c/src/md4c.c \ -- $$PWD/../3rdparty/md4c/src/entity.c \ -- $$PWD/../3rdparty/md4c/src/md4c-html.c -+ yamlheaderchecker.cpp - - HEADERS += \ - snippets/snippet.h \ -@@ -64,10 +60,7 @@ HEADERS += \ - revealviewsynchronizer.h \ - htmlpreviewcontroller.h \ - htmlviewsynchronizer.h \ -- yamlheaderchecker.h \ -- $$PWD/../3rdparty/md4c/src/md4c.h \ -- $$PWD/../3rdparty/md4c/src/entity.h \ -- $$PWD/../3rdparty/md4c/src/md4c-html.h -+ yamlheaderchecker.h - - - #unix:!symbian { -diff --git a/app/app.pro b/app/app.pro -index 4827673..ab961cf 100644 ---- a/app/app.pro -+++ b/app/app.pro -@@ -40,8 +40,6 @@ macx { - } - - #qmarkdowntextedit --include(../3rdparty/qmarkdowntextedit/qmarkdowntextedit.pri) --include(../3rdparty/hunspell/hunspell.pri) - INCLUDEPATH += $$PWD - - SOURCES += \ -diff --git a/app/cutemarkdownhighlighter.h b/app/cutemarkdownhighlighter.h -index c99ab56..78f2be6 100644 ---- a/app/cutemarkdownhighlighter.h -+++ b/app/cutemarkdownhighlighter.h -@@ -19,7 +19,7 @@ - - #include - --#include "../3rdparty/qmarkdowntextedit/markdownhighlighter.h" -+#include - - namespace hunspell { - class SpellChecker; --- -2.36.1 - diff --git a/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch b/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch deleted file mode 100644 index 89b5441738c5..000000000000 --- a/pkgs/applications/office/cutemarked-ng/0002-use-pkgcofig-to-find-libraries.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bdc66eace846edc8a7b435f7ca9f324427243ce4 Mon Sep 17 00:00:00 2001 -From: rewine -Date: Thu, 21 Jul 2022 17:30:22 +0800 -Subject: [PATCH 2/2] use pkgcofig to find libraries - ---- - app/app.pro | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/app/app.pro b/app/app.pro -index ab961cf..475487d 100644 ---- a/app/app.pro -+++ b/app/app.pro -@@ -13,6 +13,8 @@ win32: QT += winextras - TARGET = cutemarked - TEMPLATE = app - CONFIG += c++11 -+CONFIG += link_pkgconfig -+PKGCONFIG += QMarkdownTextedit hunspell md4c-html - - unix:!macx { - CONFIG += link_pkgconfig --- -2.36.1 - diff --git a/pkgs/applications/office/cutemarked-ng/default.nix b/pkgs/applications/office/cutemarked-ng/default.nix deleted file mode 100644 index 021259dd4004..000000000000 --- a/pkgs/applications/office/cutemarked-ng/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - qmake, - pkg-config, - qttools, - qtwebengine, - wrapQtAppsHook, - qmarkdowntextedit, - md4c, - hunspell, -}: - -stdenv.mkDerivation rec { - pname = "CuteMarkEd-NG"; - version = "unstable-2021-07-29"; - - src = fetchFromGitHub { - owner = "Waqar144"; - repo = pname; - rev = "9431ac603cef23d6f29e51e18f1eeee156f5bfb3"; - sha256 = "sha256-w/D4C2ZYgI/7ZCDamTQlhrJ9vtvAMThgM/fopkdKWYc"; - }; - - patches = [ - ./0001-remove-dependency-on-vendored-library.patch - ./0002-use-pkgcofig-to-find-libraries.patch - ]; - - postPatch = '' - substituteInPlace app/app.pro \ - --replace '$$[QT_INSTALL_BINS]/lrelease' "lrelease" - ''; - - nativeBuildInputs = [ - qmake - qttools - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - md4c - qtwebengine - qmarkdowntextedit - hunspell.dev - ]; - - meta = with lib; { - description = "Qt-based, free and open source markdown editor"; - mainProgram = "cutemarked"; - homepage = "https://github.com/Waqar144/CuteMarkEd-NG"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ rewine ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 931ef57cee91..54241af965dd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -256,6 +256,7 @@ mapAliases { cudaPackages_10_2 = throw "CUDA 10.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20 cudaPackages_10 = throw "CUDA 10 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 + cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27 cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17 # these are for convenience, not for backward compat and shouldn't expire diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1671ba3111e7..c692ea4871a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2188,8 +2188,6 @@ with pkgs; csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { }; - cutemarked-ng = libsForQt5.callPackage ../applications/office/cutemarked-ng { }; - dataclass-wizard = with python3Packages; toPythonApplication dataclass-wizard; datasette = with python3Packages; toPythonApplication datasette;