summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix365
1 files changed, 217 insertions, 148 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 36062652b1f..0e4fd3cc5d1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -33,116 +33,9 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # should be fixed in versions > 0.6
-  pandoc-citeproc = overrideCabal super.pandoc-citeproc (drv: {
-    patches = [
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc-citeproc/commit/4e4f9c2.patch";
-         sha256 = "18b08k56g5q4zz6jxczkrddblyn52vmd0811n1icfdpzqhgykn4p";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc-citeproc/commit/34cc147.patch";
-         sha256 = "09vrdvg5w14qckn154zlxvk6i2ikmmhpsl9mxycxkql3rl4dqam3";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc-citeproc/commit/8242c70.patch";
-         sha256 = "1lqpwxzz2www81w4mym75z36bsavqfj67hyvzn20ffvxq42yw7ry";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc-citeproc/commit/e59f88d.patch";
-         sha256 = "05699hj3qa2vrfdnikj7rzmc2ajrkd7p8yd4cjlhmqq9asq90xzb";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc-citeproc/commit/ae6ca86.patch";
-         sha256 = "19cag39k5s7iqagpvss9c2ny5g0lwnrawaqcc0labihc1a181k8l";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc-citeproc/commit/f5a9fc7.patch";
-         sha256 = "08lsinh3mkjpz3cqj5i1vcnzkyl07jp38qcjcwcw7m2b7gsjbpvm";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc-citeproc/commit/780a554.patch";
-         sha256 = "1kfn0mcp3vp32c9w8gyz0p0jv0xn90as9mxm8a2lmjng52jlzvy4";
-      })
-   ];
-  });
-
-  # should be fixed in versions > 1.13.2
-  pandoc = overrideCabal super.pandoc (drv: {
-    patches = [
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/693f9ab.patch";
-         sha256 = "1niyrigs47ia1bhk6yrnzf0sq7hz5b7xisc8ph42wkp5sl8x9h1y";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/9c68017.patch";
-         sha256 = "0zccb6l5vmfyq7p8ii88fgggfhrff32hj43f5pp3w88l479f1qlh";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/dbe1b38.patch";
-         sha256 = "0d80692liyjx2y56w07k23adjcxb57w6vzcylmc4cfswzy8agrgy";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/5ea3856.patch";
-         sha256 = "1z15lc0ix9fv278v1xmfw3a6gl85ydahgs8kz61sfvh4jdiacabw";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/c80c9ac.patch";
-         sha256 = "0fk3j53zx0x88jmh0ism0aghs2w5qf87zcp9cwbfcgg5izh3b344";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/8b9bded.patch";
-         sha256 = "0f1dh1jmhq55mlv4dawvx3ck330y82qmys06bfkqcpl0jsyd9x1a";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/e4c7894.patch";
-         sha256 = "1rfdaq6swrl3m9bmbf6yhqq57kv3l3f4927xya3zq29dpvkmmi4z";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/2a6f68f.patch";
-         sha256 = "0sbh2x9jqvis9ln8r2dr6ihkjdn480mjskm4ny91870vg852228c";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/4e3281c.patch";
-         sha256 = "0zafhxxijli2mf1h0j7shp7kd7fxqbvlswm1m8ikax3aknvjxymi";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/cd5b1fe.patch";
-         sha256 = "0nxq7c0gpdiycgdrcj3llbfwxdni6k7hqqniwsbn2ha3h03i8hg1";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/ed7606d.patch";
-         sha256 = "0gchm46ziyj7vw6ibn3kk49cjzsc78z2lm8k7892g79q2livlc1f";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/b748833.patch";
-         sha256 = "03gj4qn9c5zyqrxyrw4xh21xlvbx9rbvw6gh8msgf5xk53ibs68b";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/10d5398.patch";
-         sha256 = "1nhp5b07vywk917bfap6pzahhqnwvvlbbfg5336a2nvb0c8iq6ih";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/f18ceb1.patch";
-         sha256 = "1vxsy5fn4nscvim9wcx1n78q7yh05x0z8p812csi3v3z79lbabhq";
-      })
-    ];
-    # jailbreak-cabal omits part of the file
-    # https://github.com/peti/jailbreak-cabal/issues/9
-    postPatch = ''
-      sed -i '420i\ \ \ \ \ \ \ \ \ \ \ \ buildable: False' pandoc.cabal
-    '';
-  });
-
-  # see: https://github.com/jaspervdj/hakyll/issues/343
-  hakyll = overrideCabal super.hakyll (drv: {
-    buildDepends = drv.buildDepends ++ [ self.time-locale-compat ];
-    patches = [
-      (pkgs.fetchpatch {
-         url = "https://github.com/jaspervdj/hakyll/pull/344.patch";
-         sha256 = "130c0icw3cj209p219siaq0n8avmm0fpmph0iyjgx67w62sffrli";
-      })
-    ];
+  # ekmett/linear#74
+  linear = overrideCabal super.linear (drv: {
+    prePatch = "sed -i 's/-Werror//g' linear.cabal";
   });
 
   # Cabal_1_22_1_1 requires filepath >=1 && <1.4
@@ -157,18 +50,15 @@ self: super: {
   # https://ghc.haskell.org/trac/ghc/ticket/9921
   mkDerivation = drv: super.mkDerivation (drv // { doHoogle = false; });
 
+  Extra = appendPatch super.Extra (pkgs.fetchpatch {
+    url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";
+    sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f";
+  });
+
   # haddock: No input file(s).
   nats = dontHaddock super.nats;
   bytestring-builder = dontHaddock super.bytestring-builder;
 
-  # These used to be core packages in GHC 7.8.x.
-  old-locale = self.old-locale_1_0_0_7;
-  old-time = self.old-time_1_1_0_3;
-
-  # We have transformers 4.x
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
-
   # We have time 1.5
   aeson = disableCabalFlag super.aeson "old-locale";
 
@@ -185,6 +75,13 @@ self: super: {
   esqueleto = doJailbreak super.esqueleto;
   pointfree = doJailbreak super.pointfree;
 
+  # acid-state/safecopy#25 acid-state/safecopy#26
+  safecopy = dontCheck (super.safecopy);
+
+  # test suite broken, some instance is declared twice.
+  # https://bitbucket.org/FlorianHartwig/attobencode/issue/1
+  AttoBencode = dontCheck super.AttoBencode;
+
   # bos/attoparsec#92
   attoparsec = dontCheck super.attoparsec;
 
@@ -204,19 +101,9 @@ self: super: {
   # Test suite fails in "/tokens_bytestring_unicode.g.bin".
   alex = dontCheck super.alex;
 
-  # TODO: should eventually update the versions in hackage-packages.nix
-  haddock-library = overrideCabal super.haddock-library (drv: {
-    version = "1.2.0";
-    sha256 = "0kf8qihkxv86phaznb3liq6qhjs53g3iq0zkvz5wkvliqas4ha56";
-  });
-  haddock-api = overrideCabal super.haddock-api (drv: {
-    version = "2.16.0";
-    sha256 = "0hk42w6fbr6xp8xcpjv00bhi9r75iig5kp34vxbxdd7k5fqxr1hj";
-  });
-  haddock = overrideCabal super.haddock (drv: {
-    version = "2.16.0";
-    sha256 = "1afb96w1vv3gmvha2f1h3p8zywpdk8dfk6bgnsa307ydzsmsc3qa";
-  });
+  # https://github.com/haskell/haddock/issues/378
+  haddock-library_1_2_0 = dontCheck super.haddock-library_1_2_0;
+  haddock-library = self.haddock-library_1_2_0;
 
   # Upstream was notified about the over-specified constraint on 'base'
   # but refused to do anything about it because he "doesn't want to
@@ -228,31 +115,29 @@ self: super: {
     sha256 = "1lwwvxyhxcmppdapbgpfhwi7xc2z78qir03xjrpzab79p2qyq7br";
   });
 
-  wl-pprint = overrideCabal super.wl-pprint (drv: {
-    postPatch = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs";
-    jailbreak = true;
-  });
-
   # https://github.com/kazu-yamamoto/unix-time/issues/30
   unix-time = dontCheck super.unix-time;
 
   # Until the changes have been pushed to Hackage
-  mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
-    url = "https://github.com/snoyberg/mono-traversable/pull/68.patch";
-    sha256 = "11hqf6hi3sc34wl0fn4rpigdf7wfklcjv6jwp8c3129yphg8687h";
-  });
-  conduit-combinators = appendPatch super.conduit-combinators (pkgs.fetchpatch {
-    url = "https://github.com/fpco/conduit-combinators/pull/16.patch";
-    sha256 = "0jpwpi3shdn5rms3lcr4srajbhhfp5dbwy7pl23c9kmlil3d9mk3";
-  });
-  annotated-wl-pprint = appendPatch super.annotated-wl-pprint (pkgs.fetchpatch {
-    url = "https://patch-diff.githubusercontent.com/raw/david-christiansen/annotated-wl-pprint/pull/2.patch";
-    sha256 = "0n0fbq3vd7b9kfmhg089q0dy40vawq4q88il3zc9ybivhi62nwv4";
-  });
   ghc-events = appendPatch super.ghc-events (pkgs.fetchpatch {
     url = "https://patch-diff.githubusercontent.com/raw/haskell/ghc-events/pull/8.patch";
     sha256 = "1k881jrvzfvs761jgfhf5nsbmbc33c9333l4s0f5088p46ff2n1l";
   });
+  dependent-sum-template = appendPatch super.dependent-sum-template (pkgs.fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/mokus0/dependent-sum-template/pull/4.patch";
+    sha256 = "1yb1ny4ckl4d3sf4xnvpbsa9rw2dficzgipijs5s3729dnsc3rb0";
+  });
+  mueval = appendPatch super.mueval (pkgs.fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/gwern/mueval/pull/10.patch";
+    sha256 = "1gs8p89d1qsrd1qycbhf6kv4qw0sbb8m6dy106dqkmdzcjzcyq74";
+  });
+  present = appendPatch super.present (pkgs.fetchpatch {
+    url = "https://github.com/chrisdone/present/commit/6a61f099bf01e2127d0c68f1abe438cd3eaa15f7.patch";
+    sha256 = "1vn3xm38v2f4lzyzkadvq322f3s2yf8c88v56wpdpzfxmvlzaqr8";
+  });
+
+  # Already applied in darcs repository.
+  gnuplot = appendPatch super.gnuplot ./gnuplot-fix-new-time.patch;
 
   ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation {
     pname = "ghcjs-prim";
@@ -265,4 +150,188 @@ self: super: {
     buildDepends = [ primitive ];
     license = pkgs.stdenv.lib.licenses.bsd3;
   }) {};
+
+  # diagrams/monoid-extras#19
+  monoid-extras = overrideCabal super.monoid-extras (drv: {
+    prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal";
+  });
+
+  # diagrams/statestack#5
+  statestack = overrideCabal super.statestack (drv: {
+    prePatch = "sed -i 's|4\.8|4.9|' statestack.cabal";
+  });
+
+  # diagrams/diagrams-core#83
+  diagrams-core = overrideCabal super.diagrams-core (drv: {
+    prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal";
+  });
+
+  # https://github.com/mokus0/misfortune/pull/1
+  misfortune = appendPatch super.misfortune (pkgs.fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/mokus0/misfortune/pull/1.patch";
+    sha256 = "15frwdallm3i6k7mil26bbjd4wl6k9h20ixf3cmyris3q3jhlcfh";
+  });
+
+  timezone-series = doJailbreak super.timezone-series;
+  timezone-olson = doJailbreak super.timezone-olson;
+  libmpd = dontCheck super.libmpd;
+  xmonad-extras = overrideCabal super.xmonad-extras (drv: {
+    postPatch = ''
+      sed -i -e "s,<\*,<ยค,g" XMonad/Actions/Volume.hs
+    '';
+  });
+
+  # Workaround for a workaround, see comment for "ghcjs" flag.
+  jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
+            in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
+                                          self.webkitgtk3-javascriptcore ];
+
+  # Fix evaluation in GHC >=7.8: https://github.com/lambdabot/lambdabot/issues/116
+  lambdabot = appendPatch super.lambdabot ./lambdabot-fix-ghc78.patch;
+
+  # https://github.com/haskell-infra/hackage-trustees/issues/24
+  brainfuck = appendPatch super.brainfuck ./brainfuck-fix-ghc710.patch;
+  unlambda = appendPatch super.unlambda ./unlambda-fix-ghc710.patch;
+
+  # Updated Cabal file from Hackage tightened version bounds for some reason.
+  edit-distance = let pkg = appendPatch super.edit-distance ./edit-distance-fix-boundaries.patch;
+                  in appendPatch pkg (pkgs.fetchpatch {
+                    url = "https://patch-diff.githubusercontent.com/raw/batterseapower/edit-distance/pull/3.patch";
+                    sha256 = "0v47pa5ymh9f23bqpkdv3k7vnb6h3ssccdmjdylhs2ybarqzrcwh";
+                  });
+
+  # https://github.com/BNFC/bnfc/issues/137
+  BNFC = markBrokenVersion "2.7.1" super.BNFC;
+  cubical = dontDistribute super.cubical;
+
+  # contacted maintainer by e-mail
+  HList = markBrokenVersion "0.3.4.1" super.HList;
+  AspectAG = dontDistribute super.AspectAG;
+  Rlang-QQ = dontDistribute super.Rlang-QQ;
+  SyntaxMacros = dontDistribute super.SyntaxMacros;
+  expand = dontDistribute super.expand;
+  functional-arrow = dontDistribute super.functional-arrow;
+  guess-combinator = dontDistribute super.guess-combinator;
+  ihaskell-rlangqq = dontDistribute super.ihaskell-rlangqq;
+  ipopt-hs = dontDistribute super.ipopt-hs;
+  murder = dontDistribute super.murder;
+  netcore = dontDistribute super.netcore;
+  nettle-frp = dontDistribute super.nettle-frp;
+  nettle-netkit = dontDistribute super.nettle-netkit;
+  nettle-openflow = dontDistribute super.nettle-openflow;
+  oberon0 = dontDistribute super.oberon0;
+  poly-arity = dontDistribute super.poly-arity;
+  respond = dontDistribute super.respond;
+  semi-iso = dontDistribute super.semi-iso;
+  syntax = dontDistribute super.syntax;
+  syntax-attoparsec = dontDistribute super.syntax-attoparsec;
+  syntax-example = dontDistribute super.syntax-example;
+  syntax-example-json = dontDistribute super.syntax-example-json;
+  syntax-pretty = dontDistribute super.syntax-pretty;
+  syntax-printer = dontDistribute super.syntax-printer;
+  tuple-hlist = dontDistribute super.tuple-hlist;
+  tuple-morph = dontDistribute super.tuple-morph;
+
+  # contacted maintainer by e-mail
+  cmdlib = markBroken super.cmdlib;
+  darcs-fastconvert = dontDistribute super.darcs-fastconvert;
+  ivory-backend-c = dontDistribute super.ivory-backend-c;
+  ivory-bitdata = dontDistribute super.ivory-bitdata;
+  ivory-examples = dontDistribute super.ivory-examples;
+  ivory-hw = dontDistribute super.ivory-hw;
+  laborantin-hs = dontDistribute super.laborantin-hs;
+
+  # https://github.com/cartazio/arithmoi/issues/1
+  arithmoi = markBroken super.arithmoi;
+  NTRU = dontDistribute super.NTRU;
+  arith-encode = dontDistribute super.arith-encode;
+  barchart = dontDistribute super.barchart;
+  constructible = dontDistribute super.constructible;
+  cyclotomic = dontDistribute super.cyclotomic;
+  diagrams = dontDistribute super.diagrams;
+  diagrams-contrib = dontDistribute super.diagrams-contrib;
+  enumeration = dontDistribute super.enumeration;
+  ghci-diagrams = dontDistribute super.ghci-diagrams;
+  ihaskell-diagrams = dontDistribute super.ihaskell-diagrams;
+  nimber = dontDistribute super.nimber;
+  pell = dontDistribute super.pell;
+  quadratic-irrational = dontDistribute super.quadratic-irrational;
+
+  # https://github.com/kazu-yamamoto/ghc-mod/issues/467
+  ghc-mod = markBroken super.ghc-mod;
+  HaRe = dontDistribute super.HaRe;
+  ghc-imported-from = dontDistribute super.ghc-imported-from;
+  git-vogue = dontDistribute super.git-vogue;
+  haskell-token-utils = dontDistribute super.haskell-token-utils;
+  hbb = dontDistribute super.hbb;
+  hsdev = dontDistribute super.hsdev;
+
+  # http://hub.darcs.net/ivanm/graphviz/issue/5
+  graphviz = markBroken super.graphviz;
+  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;
+
+  # The compat library is empty in the presence of mtl 2.2.x.
+  mtl-compat = dontHaddock super.mtl-compat;
+
+  # https://github.com/bos/bloomfilter/issues/11
+  bloomfilter = dontHaddock (appendConfigureFlag super.bloomfilter "--ghc-option=-XFlexibleContexts");
+
+  # https://github.com/ocharles/tasty-rerun/issues/5
+  tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
+
+  # Broken with GHC 7.10.x.
+  aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6;
+  annotated-wl-pprint_0_5_3 = markBroken super.annotated-wl-pprint_0_5_3;
+  c2hs_0_20_1 = markBroken super.c2hs_0_20_1;
+  Cabal_1_20_0_3 = markBroken super.Cabal_1_20_0_3;
+  cabal-install_1_18_0_8 = markBroken super.cabal-install_1_18_0_8;
+  containers_0_4_2_1 = markBroken super.containers_0_4_2_1;
+  control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3;
+  equivalence_0_2_5 = markBroken super.equivalence_0_2_5;
+  haddock-api_2_15_0_2 = markBroken super.haddock-api_2_15_0_2;
+  lens_4_7_0_1 = markBroken super.lens_4_7_0_1;
+  optparse-applicative_0_10_0 = markBroken super.optparse-applicative_0_10_0;
+  QuickCheck_1_2_0_1 = markBroken super.QuickCheck_1_2_0_1;
+  seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;
+  vector_0_10_9_3 = markBroken super.vector_0_10_9_3;
+
+  # https://github.com/bos/wreq/issues/61
+  wreq = markBrokenVersion "0.3.0.1" (dontCheck super.wreq);
+  wreq-sb = dontDistribute (dontCheck super.wreq-sb);
+  hipbot = dontDistribute super.hipbot;
+
 }