From 12aa8b2f2b1452875033ea7ca90226ad1929e26e Mon Sep 17 00:00:00 2001 From: Patrick Callahan Date: Wed, 13 Sep 2017 12:04:53 -0700 Subject: [PATCH 1/2] shell-conduit: disable tests on Darwin to fix build --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 77c94f9f2502..c87e2e5cfe74 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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 From 8119e48c2d90bb8252004389676d18501f0af4b7 Mon Sep 17 00:00:00 2001 From: Patrick Callahan Date: Wed, 13 Sep 2017 12:06:16 -0700 Subject: [PATCH 2/2] haskellPackages.tldr: fix build and add to top-level packages --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c87e2e5cfe74..85a5f961485c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a38d87218719..b60de5c713bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };