From dcf3dec494f34eb4b9f04b78d2eb40686b08d6a4 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sat, 3 Jul 2021 10:56:29 +0000
Subject: [PATCH] mercurialFull: add highlight in-tree extension support

This also moves the individual flag flips from the mercurialFull
definition in all-packages into the mercurial module itself.
---
 .../version-management/mercurial/default.nix         | 12 ++++++++----
 pkgs/top-level/all-packages.nix                      |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index cddb3ade4e36..aba8cb6737dc 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,13 +1,15 @@
 { lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext
 , re2Support ? true
 , rustSupport ? stdenv.hostPlatform.isLinux, rustPlatform
-, gitSupport ? false
-, guiSupport ? false, tk
+, fullBuild ? false
+, gitSupport ? fullBuild
+, guiSupport ? fullBuild, tk
+, highlightSupport ? fullBuild
 , ApplicationServices
 }:
 
 let
-  inherit (python3Packages) docutils python fb-re2 pygit2;
+  inherit (python3Packages) docutils python fb-re2 pygit2 pygments;
 
 in python3Packages.buildPythonApplication rec {
   pname = "mercurial";
@@ -43,7 +45,9 @@ in python3Packages.buildPythonApplication rec {
   } else null;
   cargoRoot = if rustSupport then "rust" else null;
 
-  propagatedBuildInputs = lib.optional re2Support fb-re2 ++ lib.optional gitSupport pygit2;
+  propagatedBuildInputs = lib.optional re2Support fb-re2
+    ++ lib.optional gitSupport pygit2
+    ++ lib.optional highlightSupport pygments;
   nativeBuildInputs = [ makeWrapper gettext ]
     ++ lib.optionals rustSupport (with rustPlatform; [
          cargoSetupHook
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6ec5a409cb3..676d7240ee95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25423,7 +25423,7 @@ in
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
   };
 
-  mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; gitSupport = true; });
+  mercurialFull = appendToName "full" (pkgs.mercurial.override { fullBuild = true; });
 
   merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };