From f30bfcd6235a34768aebd3244cb7c175af39a821 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 24 Jul 2018 01:42:43 +0200 Subject: [PATCH] doctest-discover: move override out of configuration-nix.nix and move it to configuration-common.nix where it belongs. configuration-nix.nix is only for fixing build failures due to Nix. --- .../haskell-modules/configuration-common.nix | 17 +++++++++++++---- .../haskell-modules/configuration-nix.nix | 5 ----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a9f1ac7cb882..942d5fcd27d4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -506,11 +506,20 @@ self: super: { # https://github.com/nushio3/doctest-prop/issues/1 doctest-prop = dontCheck super.doctest-prop; + # Missing file in source distribution: + # - https://github.com/karun012/doctest-discover/issues/22 + # - https://github.com/karun012/doctest-discover/issues/23 + # + # When these are fixed the following needs to be enabled again: + # + # # Depends on itself for testing + # doctest-discover = addBuildTool super.doctest-discover + # (if pkgs.buildPlatform != pkgs.hostPlatform + # then self.buildHaskellPackages.doctest-discover + # else dontCheck super.doctest-discover); + doctest-discover = dontCheck super.doctest-discover; + # Depends on itself for testing - doctest-discover = addBuildTool super.doctest-discover - (if pkgs.buildPlatform != pkgs.hostPlatform - then self.buildHaskellPackages.doctest-discover - else dontCheck super.doctest-discover); tasty-discover = addBuildTool super.tasty-discover (if pkgs.buildPlatform != pkgs.hostPlatform then self.buildHaskellPackages.tasty-discover diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c7d3f7bc0519..2ae35c0aa688 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -506,9 +506,4 @@ self: super: builtins.intersectAttrs super { # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73 blank-canvas = dontCheck super.blank-canvas; blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2; - - # Missing file in source distribution: - # - https://github.com/karun012/doctest-discover/issues/22 - # - https://github.com/karun012/doctest-discover/issues/23 - doctest-discover = dontCheck super.doctest-discover; }