From f5968d6601de86f822bb5af2ae44cba45a0e7d50 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 18 Mar 2023 01:39:35 +0300 Subject: [PATCH] ghostwriter: absorb into kde/gear --- .../editors/ghostwriter/default.nix | 43 ------------------- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/ghostwriter.nix | 41 ++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 5 files changed, 43 insertions(+), 45 deletions(-) delete mode 100644 pkgs/applications/editors/ghostwriter/default.nix create mode 100644 pkgs/applications/kde/ghostwriter.nix diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix deleted file mode 100644 index bcb7e066bfc6..000000000000 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, mkDerivation -, fetchFromGitHub -, qmake -, pkg-config -, qttools -, qtwebengine -, hunspell -, cmark -, multimarkdown -, pandoc -}: - -mkDerivation rec { - pname = "ghostwriter"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "KDE"; - repo = pname; - rev = version; - hash = "sha256-8JtCO5jrkbZ4uEM7SALg64L4HSzdzzh7r1pldxzaXeI="; - }; - - nativeBuildInputs = [ qmake pkg-config qttools ]; - - buildInputs = [ qtwebengine hunspell ]; - - qtWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ cmark multimarkdown pandoc ]) - ]; - - meta = with lib; { - description = "A cross-platform, aesthetic, distraction-free Markdown editor"; - homepage = "https://kde.github.io/ghostwriter"; - changelog = "https://github.com/KDE/ghostwriter/blob/${src.rev}/CHANGELOG.md"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ dotlambda erictapen ]; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index c121d0fb5399..fed0e84de737 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -86,6 +86,7 @@ let falkon = callPackage ./falkon.nix {}; ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; filelight = callPackage ./filelight.nix {}; + ghostwriter = callPackage ./ghostwriter.nix {}; granatier = callPackage ./granatier.nix {}; grantleetheme = callPackage ./grantleetheme {}; gwenview = callPackage ./gwenview.nix {}; diff --git a/pkgs/applications/kde/ghostwriter.nix b/pkgs/applications/kde/ghostwriter.nix new file mode 100644 index 000000000000..1fad4669dc62 --- /dev/null +++ b/pkgs/applications/kde/ghostwriter.nix @@ -0,0 +1,41 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, qttools +, qtwebengine +, kcoreaddons +, kconfigwidgets +, sonnet +, kxmlgui +, hunspell +, cmark +, multimarkdown +, pandoc +}: + +mkDerivation { + pname = "ghostwriter"; + + nativeBuildInputs = [ extra-cmake-modules qttools ]; + + buildInputs = [ + qtwebengine + hunspell + kcoreaddons + kconfigwidgets + sonnet + kxmlgui + ]; + + qtWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ cmark multimarkdown pandoc ]) + ]; + + meta = with lib; { + description = "A cross-platform, aesthetic, distraction-free Markdown editor"; + homepage = "https://ghostwriter.kde.org/"; + changelog = "https://invent.kde.org/office/ghostwriter/-/blob/master/CHANGELOG.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda erictapen ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 86d4c23a252b..ee87c750db94 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -545,6 +545,7 @@ mapAliases ({ getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6"; # Added 2022-01-12 gettextWithExpat = throw "'gettextWithExpat' has been renamed to/replaced by 'gettext'"; # Converted to throw 2022-02-22 gfm = throw "gfm has been removed"; # Added 2021-01-15 + ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 giblib = throw " giblib has been removed from nixpkgs because upstream is gone"; # Added 2022-01-23 giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12 git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93290034e458..d0db95eda950 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30079,8 +30079,6 @@ with pkgs; geoipupdate = callPackage ../applications/misc/geoipupdate { }; - ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; - globe-cli = callPackage ../applications/misc/globe-cli { }; gnss-sdr = callPackage ../applications/radio/gnss-sdr { };