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

doctest-discover: move override out of configuration-nix.nix

Browse Source 
and move it to configuration-common.nix where it belongs.
configuration-nix.nix is only for fixing build failures
due to Nix.
This commit is contained in:
Bas van Dijk 2018-07-24 01:42:43 +02:00
parent 3d4ea59f20
commit f30bfcd623
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -506,11 +506,20 @@ self: super: {
# https://github.com/nushio3/doctest-prop/issues/1 # https://github.com/nushio3/doctest-prop/issues/1
doctest-prop = dontCheck super.doctest-prop; 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 # 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 tasty-discover = addBuildTool super.tasty-discover
(if pkgs.buildPlatform != pkgs.hostPlatform (if pkgs.buildPlatform != pkgs.hostPlatform
then self.buildHaskellPackages.tasty-discover then self.buildHaskellPackages.tasty-discover

5
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -506,9 +506,4 @@ self: super: builtins.intersectAttrs super {
# Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73 # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
blank-canvas = dontCheck super.blank-canvas; blank-canvas = dontCheck super.blank-canvas;
blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2; 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;
} }