From adabca4b138431c62b8a4adc48675b49110a46c0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Dec 2017 22:24:30 +0100 Subject: [PATCH 1/2] Revert "haskellPackages.{SC,sc}alendar: nullify to fix ofborg eval" --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a7ba0dea10dc..218d4a140ec5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -951,9 +951,9 @@ self: super: { # Hoogle needs a newer version than lts-10 provides. 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; + # These packages depend on each other, forming an infinte loop. + scalendar = markBroken super.scalendar; + SCalendar = markBroken super.SCalendar; # Needs QuickCheck <2.10, which we don't have. edit-distance = doJailbreak super.edit-distance; From 39eb15b0288d8493f81df18ce84c04978850ba27 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 27 Dec 2017 18:31:28 +0100 Subject: [PATCH 2/2] haskell-scalendar: break the infinite recursion to avoid evaluation errors Suggested in https://github.com/NixOS/nixpkgs/pull/33077#issuecomment-353993598. --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 218d4a140ec5..45f7c97af9d9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -951,9 +951,9 @@ self: super: { # Hoogle needs a newer version than lts-10 provides. hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_20_1; }; - # These packages depend on each other, forming an infinte loop. - scalendar = markBroken super.scalendar; - SCalendar = markBroken super.SCalendar; + # These packages depend on each other, forming an infinite loop. + 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;