From 57dcd38be45061d846f63d36e15f2024e2d1189f Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sun, 20 Nov 2022 16:35:25 -0800 Subject: [PATCH] notepadqq: 1.4.8 -> 2.0.0-beta (#202075) Co-authored-by: Sandro --- .../editors/notepadqq/default.nix | 28 +++++++++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index 545d64ef5122..3aa08559bdf7 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -1,22 +1,40 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, which, qtbase, qtsvg, qttools, qtwebkit }: +{ mkDerivation +, lib +, fetchFromGitHub +, pkg-config +, which +, libuchardet +, qtbase +, qtsvg +, qttools +, qtwebengine +, qtwebsockets +}: mkDerivation rec { pname = "notepadqq"; - version = "1.4.8"; + # 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${version}"; - sha256 = "0lbv4s7ng31dkznzbkmp2cvkqglmfj6lv4mbg3r410fif2nrva7k"; + sha256 = "sha256-XA9Ay9kJApY+bDeOf0iPv+BWYFuTmIuqsLEPgRTCZCE="; }; nativeBuildInputs = [ - pkg-config which qttools + pkg-config + which + qttools ]; buildInputs = [ - qtbase qtsvg qtwebkit + libuchardet + qtbase + qtsvg + qtwebengine + qtwebsockets ]; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf4f1a343f23..cde6b546bad3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30985,7 +30985,7 @@ with pkgs; notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; - notepadqq = libsForQt514.callPackage ../applications/editors/notepadqq { }; + notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; notmuch = callPackage ../applications/networking/mailreaders/notmuch { gmime = gmime3;