on iko/ghcjs-patch-master help sign in
Non deterministic failures should not be deferred (#1075)
dff62ecHamish Mackenzie
lib/call-cabal-project-to-nix.nix+6
@@ -528,6 +528,12 @@ let
528 # move pkgs.nix to default.nix ensure we can just nix `import` the result.
528 # move pkgs.nix to default.nix ensure we can just nix `import` the result.
529 mv $out${subDir'}/pkgs.nix $out${subDir'}/default.nix
529 mv $out${subDir'}/pkgs.nix $out${subDir'}/default.nix
530 else
530 else
531+ # Check that this was a solver failure that (not some other
532+ # possibly non deterministic failure).
533+ # TODO replace grep once https://github.com/haskell/cabal/issues/5191
534+ # is fixed.
535+ grep "cabal: Could not resolve dependencies" cabal-configure.out
536+
531 # When cabal configure fails copy the output that we captured above and
537 # When cabal configure fails copy the output that we captured above and
532 # use `failed-cabal-configure.nix` to make a suitable derviation with.
538 # use `failed-cabal-configure.nix` to make a suitable derviation with.
533 cp cabal-configure.out $out
539 cp cabal-configure.out $out