diff options
| author | Peter Simons <simons@cryp.to> | 2018-03-22 14:42:09 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-03-22 21:14:24 +0100 |
| commit | 71beddad8cd7ab3f75f646cf9f7bf7ee035f8d5f (patch) | |
| tree | 8b985dfd97e2d8983d4cdcfa10f89582977871e9 /pkgs/development/haskell-modules | |
| parent | d1ba7ed4dff1bf4d40bb9112b72319f4fbe519e1 (diff) | |
| download | nixlib-71beddad8cd7ab3f75f646cf9f7bf7ee035f8d5f.tar nixlib-71beddad8cd7ab3f75f646cf9f7bf7ee035f8d5f.tar.gz nixlib-71beddad8cd7ab3f75f646cf9f7bf7ee035f8d5f.tar.bz2 nixlib-71beddad8cd7ab3f75f646cf9f7bf7ee035f8d5f.tar.lz nixlib-71beddad8cd7ab3f75f646cf9f7bf7ee035f8d5f.tar.xz nixlib-71beddad8cd7ab3f75f646cf9f7bf7ee035f8d5f.tar.zst nixlib-71beddad8cd7ab3f75f646cf9f7bf7ee035f8d5f.zip | |
Use latest versions of HaTeX and pandoc when building with GHC 8.4.1.
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index b39efcbde77d..116d89354a19 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -659,20 +659,6 @@ self: super: { sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a"; }); - # https://github.com/jgm/pandoc-types/issues/37 - pandoc-types = self.pandoc-types_1_17_4_2; - - ## Need latest git version to support current haddock-library versions. - pandoc = overrideSrc super.pandoc { - version = "2.1.2-git"; - src = pkgs.fetchFromGitHub { - owner = "jgm"; - repo = "pandoc"; - rev = "fad8d0d67ff4736e1af554d2bfcf1688aa28c8ec"; - sha256 = "1sgfnyi2ma8vf91dw9ax9xbbjfcja1q5q9vcwa1rhh05jv8j036a"; - }; - }; - # Fix missing semigroup instance. json = appendPatch super.json (pkgs.fetchpatch { url = https://github.com/GaloisInc/json/commit/9292150bbe02c2d126ad6a876242578b1a9d1bf2.patch; @@ -681,9 +667,12 @@ self: super: { # Older versions don't compile. brick = self.brick_0_35; - timezone-olson = self.timezone-olson_0_1_9; - matrix = self.matrix_0_3_6_1; getopt-generics = self.getopt-generics_0_13_0_2; + HaTeX = self.HaTeX_3_19_0_0; + matrix = self.matrix_0_3_6_1; + pandoc = self.pandoc_2_1_3; + pandoc-types = self.pandoc-types_1_17_4_2; + timezone-olson = self.timezone-olson_0_1_9; # https://github.com/xmonad/xmonad/issues/155 xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch |