about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-12-26 12:19:52 -0500
committerGitHub <noreply@github.com>2017-12-26 12:19:52 -0500
commit93829f1b031a66c093865910b1e8823c6b59c720 (patch)
treedbdb85d390b737aa7437bd81a3b58ca2c80b311c /pkgs/development
parente7b51bb38f87b461501feae48892c25ee5f672a0 (diff)
parent416d9bd7f82ec8e378f42cfeee930179c8571da8 (diff)
downloadnixlib-93829f1b031a66c093865910b1e8823c6b59c720.tar
nixlib-93829f1b031a66c093865910b1e8823c6b59c720.tar.gz
nixlib-93829f1b031a66c093865910b1e8823c6b59c720.tar.bz2
nixlib-93829f1b031a66c093865910b1e8823c6b59c720.tar.lz
nixlib-93829f1b031a66c093865910b1e8823c6b59c720.tar.xz
nixlib-93829f1b031a66c093865910b1e8823c6b59c720.tar.zst
nixlib-93829f1b031a66c093865910b1e8823c6b59c720.zip
Merge pull request #33077 from pbogdan/scalendar-cycle
haskellPackages.{SC,sc}alendar: nullify to fix ofborg eval
Diffstat (limited to 'pkgs/development')
-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 218d4a140ec5..a7ba0dea10dc 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 = null;
+  SCalendar = null;
 
   # Needs QuickCheck <2.10, which we don't have.
   edit-distance = doJailbreak super.edit-distance;