about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--third_party/overlays/haskell/default.nix9
-rw-r--r--users/glittershark/xanthous/default.nix4
2 files changed, 5 insertions, 8 deletions
diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix
index 7b17e61e3e..16c250f820 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
diff --git a/users/glittershark/xanthous/default.nix b/users/glittershark/xanthous/default.nix
index c417c7af3e..0b89a50afb 100644
--- a/users/glittershark/xanthous/default.nix
+++ b/users/glittershark/xanthous/default.nix
@@ -4,6 +4,4 @@
 }:
 pkgs.haskell.lib.failOnAllWarnings (
   pkgs.haskellPackages.callPackage (import ./pkg.nix { inherit pkgs; }) {}
-) // {
-  meta.ci = false;
-}
+)