Merge pull request #33089 from NixOS/revert-33077-scalendar-cycle

Revert "haskellPackages.{SC,sc}alendar: nullify to fix ofborg eval"
NixOS · Dec 27, 2017 · d9d554a · d9d554a
2 parents 92cdd7d + 39eb15b
commit d9d554a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -952,8 +952,8 @@ self: super: {
   hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_20_1; };
 
   # These packages depend on each other, forming an infinite loop.
-  scalendar = null;
-  SCalendar = null;
+  scalendar = markBroken (super.scalendar.override { SCalendar = null; });
+  SCalendar = markBroken (super.SCalendar.override { scalendar = null; });
 
   # Needs QuickCheck <2.10, which we don't have.
   edit-distance = doJailbreak super.edit-distance;