From 5f220007d5f5e42ce7de55f04899dcbc7ed48212 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Sep 2019 19:50:07 +0200 Subject: [PATCH] haskell-arbtt: fix the test suite --- .../development/haskell-modules/configuration-common.nix | 9 +++++++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fc008d52623d..c4cca42309db 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1219,4 +1219,13 @@ self: super: { # https://github.com/elliottt/hsopenid/issues/15 openid = markBroken super.openid; + # The test suite needs the packages's executables in $PATH to succeed. + arbtt = overrideCabal super.arbtt (drv: { + preCheck = '' + for i in $PWD/dist/build/*; do + export PATH="$i:$PATH" + done + ''; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index d6f25ce5451c..9cbc4c21aed5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3097,7 +3097,6 @@ broken-packages: - arbor-monad-metric - arbor-monad-metric-datadog - arbor-postgres - - arbtt - archiver - archlinux - archlinux-web