From 4142633ab2e6a3145873f17005ece448dffc0e1a Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 31 Mar 2026 21:22:43 +0200 Subject: [PATCH] notepadqq: drop Unmaintained upstream [1], depends on qmake and qt5 webengine. [1] https://github.com/notepadqq/notepadqq/commit/b426303b5df28b63b6316308927f62db072c27e6 --- .../editors/notepadqq/default.nix | 72 ------------------- .../editors/notepadqq/fix-configure.patch | 22 ------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 pkgs/applications/editors/notepadqq/default.nix delete mode 100644 pkgs/applications/editors/notepadqq/fix-configure.patch diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix deleted file mode 100644 index 43f2aef74697..000000000000 --- a/pkgs/applications/editors/notepadqq/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - which, - qttools, - wrapQtAppsHook, - libuchardet, - qtbase, - qtsvg, - qtwebengine, - qtwebsockets, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "notepadqq"; - # shipping a beta build as there's no proper release which supports qtwebengine - version = "2.0.0-beta"; - - src = fetchFromGitHub { - owner = "notepadqq"; - repo = "notepadqq"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-XA9Ay9kJApY+bDeOf0iPv+BWYFuTmIuqsLEPgRTCZCE="; - }; - - patches = [ - # Fix: chmod in the Makefile fails randomly - # Move it to preFixup instead - ./fix-configure.patch - ]; - - nativeBuildInputs = [ - pkg-config - which - qttools - wrapQtAppsHook - ]; - - buildInputs = [ - libuchardet - qtbase - qtsvg - qtwebengine - qtwebsockets - ]; - - strictDeps = false; # breaks qmake - - preConfigure = '' - export LRELEASE="lrelease" - ''; - - dontWrapQtApps = true; - - preFixup = '' - chmod +x $out/bin/notepadqq - wrapQtApp $out/bin/notepadqq - ''; - - enableParallelBuilding = true; - - meta = { - homepage = "https://notepadqq.com/"; - description = "Notepad++-like editor for the Linux desktop"; - license = lib.licenses.gpl3; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.rszibele ]; - mainProgram = "notepadqq"; - }; -}) diff --git a/pkgs/applications/editors/notepadqq/fix-configure.patch b/pkgs/applications/editors/notepadqq/fix-configure.patch deleted file mode 100644 index 56c0eaadd5e0..000000000000 --- a/pkgs/applications/editors/notepadqq/fix-configure.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/ui/ui.pro b/src/ui/ui.pro -index a1346eb..f8052a2 100644 ---- a/src/ui/ui.pro -+++ b/src/ui/ui.pro -@@ -293,16 +293,9 @@ unix:!macx { - appstream.path = "$$INSTALL_ROOT$$PREFIX/share/metainfo/" - appstream.files += "$$INSTALLFILESDIR/notepadqq.appdata.xml" - -- # == Dummy target used to fix permissions at the end of the install == -- # A random path. Without one, qmake refuses to create the rule. -- set_permissions.path = "$$INSTALL_ROOT$$PREFIX/bin/" -- # We want to keep $$INSTALL_ROOT as a variable in the makefile, so we use $(INSTALL_ROOT) -- unix:set_permissions.extra = chmod 755 $(INSTALL_ROOT)\"$$PREFIX/bin/notepadqq\" -- - # MAKE INSTALL - INSTALLS += target \ - icon_h16 icon_h22 icon_h24 icon_h32 icon_h48 icon_h64 icon_h96 icon_h128 icon_h256 icon_h512 icon_hscalable \ -- misc_data launch shortcuts appstream \ -- set_permissions -+ misc_data launch shortcuts appstream - - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9fa7e9f9816a..6466cb041a55 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1501,6 +1501,7 @@ mapAliases { nomacs-qt6 = nomacs; # Added 2025-08-30 norouter = throw "norouter has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29 notary = throw "'notary' has been removed due to being archived upstream. Consider using 'notation' instead."; # Added 2025-11-13 + notepadqq = throw "'notepadqq' has been removed due to upstream stopping maintenance in 2023."; # Added 2026-02-10 notes-up = throw "'notes-up' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09 notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25 noto-fonts-emoji = throw "'noto-fonts-emoji' has been renamed to/replaced by 'noto-fonts-color-emoji'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d1043ce0185..2cc92f7d4673 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10033,8 +10033,6 @@ with pkgs; ncdu_1 = callPackage ../by-name/nc/ncdu/1.nix { }; - notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; - notmuch = callPackage ../applications/networking/mailreaders/notmuch { pythonPackages = python3Packages; };