diff options
author | Luke Granger-Brown <git@lukegb.com> | 2021-07-03 10:56:29 +0000 |
---|---|---|
committer | Luke Granger-Brown <git@lukegb.com> | 2021-07-03 10:56:29 +0000 |
commit | dcf3dec494f34eb4b9f04b78d2eb40686b08d6a4 (patch) | |
tree | 3250cba90e1e747778658460783bb2b5de455674 /pkgs/applications/version-management | |
parent | 67444f8a393846b1431cfeb936e83a9f24725e2d (diff) | |
download | nixpkgs-dcf3dec494f34eb4b9f04b78d2eb40686b08d6a4.tar nixpkgs-dcf3dec494f34eb4b9f04b78d2eb40686b08d6a4.tar.gz nixpkgs-dcf3dec494f34eb4b9f04b78d2eb40686b08d6a4.tar.bz2 nixpkgs-dcf3dec494f34eb4b9f04b78d2eb40686b08d6a4.tar.lz nixpkgs-dcf3dec494f34eb4b9f04b78d2eb40686b08d6a4.tar.xz nixpkgs-dcf3dec494f34eb4b9f04b78d2eb40686b08d6a4.tar.zst nixpkgs-dcf3dec494f34eb4b9f04b78d2eb40686b08d6a4.zip |
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.
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index cddb3ade4e3..aba8cb6737d 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 |