summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2017-12-27 18:31:28 +0100
committerPeter Simons <simons@cryp.to>2017-12-27 18:33:45 +0100
commit39eb15b0288d8493f81df18ce84c04978850ba27 (patch)
tree14b0b031ef120ff3f423d338ef60cfa9214b0f42 /pkgs/development/haskell-modules/configuration-common.nix
parentadabca4b138431c62b8a4adc48675b49110a46c0 (diff)
downloadnixpkgs-39eb15b0288d8493f81df18ce84c04978850ba27.tar
nixpkgs-39eb15b0288d8493f81df18ce84c04978850ba27.tar.gz
nixpkgs-39eb15b0288d8493f81df18ce84c04978850ba27.tar.bz2
nixpkgs-39eb15b0288d8493f81df18ce84c04978850ba27.tar.lz
nixpkgs-39eb15b0288d8493f81df18ce84c04978850ba27.tar.xz
nixpkgs-39eb15b0288d8493f81df18ce84c04978850ba27.tar.zst
nixpkgs-39eb15b0288d8493f81df18ce84c04978850ba27.zip
haskell-scalendar: break the infinite recursion to avoid evaluation errors
Suggested in https://github.com/NixOS/nixpkgs/pull/33077#issuecomment-353993598.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 218d4a140ec..45f7c97af9d 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;