fix(3p/haskellPackages): re-add random 1.2.0 to fix xanthous r/2479

The random_1_2_0 attribute of haskellPackages currently holds random
1.2.0 which is what we want to have. We need to disable tests because
they cause an infinite recursion as basically all testing libraries
depend on random. This has the nice side effect that we no longer need
import from derivation for random 1.2.0 (but owothia and xanthous still
use it).

Re-enable CI for xanthous.

Additinonally we need to deal with the fallout of the haskellPackages
overlay now also being pulled in for some machines since cl/2910 and
let pandoc compile with random 1.2.0.

Change-Id: I78d220e5bd35f3469d80d69e77e712a529f21d33
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2924
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: glittershark <grfn@gws.fyi>

1 files changed, 4 insertions, 5 deletions

diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix
index 7b17e61e3e02..16c250f82004 100644
--- a/third_party/overlays/haskell/default.nix
+++ b/third_party/overlays/haskell/default.nix
@@ -11,16 +11,15 @@ let
     generic-arbitrary = appendPatch hsSuper.generic-arbitrary
       [ ./patches/generic-arbitrary-export-garbitrary.patch ];
 
-    # random = dontCheck (hsSuper.callHackageDirect {
-    #   pkg = "random";
-    #   ver = "1.2.0";
-    #   sha256 = "06s3mmqbsfwv09j2s45qnd66nrxfp9280gnl9ng8yh128pfr7bjh";
-    # } {});
+    # check dependencies cause circular dependency on itself
+    # and thus an infinite recursion
+    random = dontCheck hsSuper.random_1_2_0;
 
     # random <1.2
     test-framework = doJailbreak hsSuper.test-framework;
     hashable = doJailbreak hsSuper.hashable;
     test-framework-quickcheck2 = doJailbreak hsSuper.test-framework-quickcheck2;
+    pandoc = doJailbreak hsSuper.pandoc;
 
     # can be removed if we have the following PR or equivalent
     # https://github.com/NixOS/nixpkgs/pull/116931