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

haskellPackages.tldr: fix build and add to top-level packages

Browse Source
This commit is contained in:
Patrick Callahan 2017-09-13 12:06:16 -07:00
parent 12aa8b2f2b
commit 8119e48c2d
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -404,6 +404,12 @@ self: super: {
th-printf = dontCheck super.th-printf;
thumbnail-plus = dontCheck super.thumbnail-plus;
tickle = dontCheck super.tickle;
tldr = super.tldr.override {
# shell-conduit determines what commands are available at compile-time, so
# that tldr will not compile unless the shell-conduit it uses is compiled
# with git in its environment.
shell-conduit = addBuildTool self.shell-conduit pkgs.git;
};
tpdb = dontCheck super.tpdb;
translatable-intset = dontCheck super.translatable-intset;
ua-parser = dontCheck super.ua-parser;

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

@ -4566,6 +4566,8 @@ with pkgs;
tldr = callPackage ../tools/misc/tldr { };
tldr-hs = haskellPackages.tldr;
tlspool = callPackage ../tools/networking/tlspool { };
tmate = callPackage ../tools/misc/tmate { };