about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2017-12-26 22:24:30 +0100
committerGitHub <noreply@github.com>2017-12-26 22:24:30 +0100
commitadabca4b138431c62b8a4adc48675b49110a46c0 (patch)
treece53d92f9a99ea3605d567ee1a958d4f68970ea7 /pkgs/development/haskell-modules
parentc964449c98fd44438bdc20d9d821e98b468e98c4 (diff)
downloadnixlib-adabca4b138431c62b8a4adc48675b49110a46c0.tar
nixlib-adabca4b138431c62b8a4adc48675b49110a46c0.tar.gz
nixlib-adabca4b138431c62b8a4adc48675b49110a46c0.tar.bz2
nixlib-adabca4b138431c62b8a4adc48675b49110a46c0.tar.lz
nixlib-adabca4b138431c62b8a4adc48675b49110a46c0.tar.xz
nixlib-adabca4b138431c62b8a4adc48675b49110a46c0.tar.zst
nixlib-adabca4b138431c62b8a4adc48675b49110a46c0.zip
Revert "haskellPackages.{SC,sc}alendar: nullify to fix ofborg eval"
Diffstat (limited to 'pkgs/development/haskell-modules')
-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 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;