dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

mercurialFull: add highlight in-tree extension support

Browse Source 
This also moves the individual flag flips from the mercurialFull
definition in all-packages into the mercurial module itself.
This commit is contained in:
Luke Granger-Brown 2021-07-03 10:56:29 +00:00
parent 67444f8a39
commit dcf3dec494
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/version-management/mercurial/default.nix
View File

@ -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

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };