summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-05-18 18:16:38 +0200
committerPeter Simons <simons@cryp.to>2015-05-18 20:43:51 +0200
commit0197da662d8c5d849d6cb83d2f94193e4b409b69 (patch)
treec7ea11e2cb5a00e76198d9e1a4084792f0a99b70
parent72f54f51e3ef91445cc2a313bb168529b4a89d13 (diff)
downloadnixpkgs-0197da662d8c5d849d6cb83d2f94193e4b409b69.tar
nixpkgs-0197da662d8c5d849d6cb83d2f94193e4b409b69.tar.gz
nixpkgs-0197da662d8c5d849d6cb83d2f94193e4b409b69.tar.bz2
nixpkgs-0197da662d8c5d849d6cb83d2f94193e4b409b69.tar.lz
nixpkgs-0197da662d8c5d849d6cb83d2f94193e4b409b69.tar.xz
nixpkgs-0197da662d8c5d849d6cb83d2f94193e4b409b69.tar.zst
nixpkgs-0197da662d8c5d849d6cb83d2f94193e4b409b69.zip
haskell: enable builds that used to fail because they depend on graphviz
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix61
1 files changed, 28 insertions, 33 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index c47d29e54bf..1d7eee6d3a4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -241,39 +241,6 @@ self: super: {
   hbb = dontDistribute super.hbb;
   hsdev = dontDistribute super.hsdev;
 
-  Graphalyze = dontDistribute super.Graphalyze;
-  HLearn-approximation = dontDistribute super.HLearn-approximation;
-  HLearn-classification = dontDistribute super.HLearn-classification;
-  HLearn-distributions = dontDistribute super.HLearn-distributions;
-  SourceGraph = dontDistribute super.SourceGraph;
-  Zora = dontDistribute super.Zora;
-  ampersand = dontDistribute super.ampersand;
-  caffegraph = dontDistribute super.caffegraph;
-  dot2graphml = dontDistribute super.dot2graphml;
-  dvda = dontDistribute super.dvda;
-  erd = dontDistribute super.erd;
-  filediff = dontDistribute super.filediff;
-  fsmActions = dontDistribute super.fsmActions;
-  gbu = dontDistribute super.gbu;
-  geni-gui = dontDistribute super.geni-gui;
-  ghc-vis = dontDistribute super.ghc-vis;
-  grammar-combinators = dontDistribute super.grammar-combinators;
-  llvm-analysis = dontDistribute super.llvm-analysis;
-  llvm-base-types = dontDistribute super.llvm-base-types;
-  llvm-data-interop = dontDistribute super.llvm-data-interop;
-  llvm-tools = dontDistribute super.llvm-tools;
-  marxup = dontDistribute super.marxup;
-  mathgenealogy = dontDistribute super.mathgenealogy;
-  optimusprime = dontDistribute super.optimusprime;
-  phybin = dontDistribute super.phybin;
-  prolog-graph = dontDistribute super.prolog-graph;
-  prolog-graph-lib = dontDistribute super.prolog-graph-lib;
-  teams = dontDistribute super.teams;
-  vacuum-graphviz = dontDistribute super.vacuum-graphviz;
-  vampire = dontDistribute super.vampire;
-  visual-graphrewrite = dontDistribute super.visual-graphrewrite;
-  xdot = dontDistribute super.xdot;
-
   # https://github.com/lymar/hastache/issues/47
   hastache = dontCheck super.hastache;
 
@@ -313,4 +280,32 @@ self: super: {
   harp = markBrokenVersion "0.4" super.harp;
   happstack-authenticate = dontDistribute super.happstack-authenticate;
 
+  # Upstream has no issue tracker.
+  llvm-base-types = markBroken super.llvm-base-types;
+  llvm-analysis = dontDistribute super.llvm-analysis;
+  llvm-data-interop = dontDistribute super.llvm-data-interop;
+  llvm-tools = dontDistribute super.llvm-tools;
+
+  # Upstream has no issue tracker.
+  MaybeT = markBroken super.MaybeT;
+  grammar-combinators = dontDistribute super.grammar-combinators;
+
+  # Required to fix version 0.91.0.0.
+  wx = dontHaddock (appendConfigureFlag super.wx "--ghc-option=-XFlexibleContexts");
+
+  # Upstream has no issue tracker.
+  Graphalyze = markBroken super.Graphalyze;
+  gbu = dontDistribute super.gbu;
+  SourceGraph = dontDistribute super.SourceGraph;
+
+  # Upstream has no issue tracker.
+  markBroken = super.protocol-buffers;
+  caffegraph = dontDistribute super.caffegraph;
+
+  # Deprecated: https://github.com/mikeizbicki/ConstraintKinds/issues/8
+  ConstraintKinds = markBroken super.ConstraintKinds;
+  HLearn-approximation = dontDistribute super.HLearn-approximation;
+  HLearn-distributions = dontDistribute super.HLearn-distributions;
+  HLearn-classification = dontDistribute super.HLearn-classification;
+
 }