alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #29328 from therealpxc/tldr-hs

Browse source 
haskellPackages.tldr: fix build, add as a top-level package
This commit is contained in:
Peter Simons 2017-09-15 20:51:22 +02:00 committed by GitHub
parent 6b7a9376f1 8119e48c2d
commit d2f206c061
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -104,6 +104,10 @@ self: super: {
# Fix test trying to access /home directory
shell-conduit = (overrideCabal super.shell-conduit (drv: {
postPatch = "sed -i s/home/tmp/ test/Spec.hs";
# the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo
# see: https://github.com/psibi/shell-conduit/issues/12
doCheck = !pkgs.stdenv.hostPlatform.isDarwin;
}));
# https://github.com/froozen/kademlia/issues/2
@ -400,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

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