diff options
author | Peter Simons <simons@cryp.to> | 2018-03-17 14:14:28 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2018-03-17 21:16:48 +0100 |
commit | 03cae069fef51eb1d09236b6026d8d77c23a02cc (patch) | |
tree | d370c6ef03a272aa96dff042b2aacf4fc650de41 /pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | |
parent | bb6b99287bd3cd00eccc0bb7bbf49c9cf9b9fb3e (diff) | |
download | nixlib-03cae069fef51eb1d09236b6026d8d77c23a02cc.tar nixlib-03cae069fef51eb1d09236b6026d8d77c23a02cc.tar.gz nixlib-03cae069fef51eb1d09236b6026d8d77c23a02cc.tar.bz2 nixlib-03cae069fef51eb1d09236b6026d8d77c23a02cc.tar.lz nixlib-03cae069fef51eb1d09236b6026d8d77c23a02cc.tar.xz nixlib-03cae069fef51eb1d09236b6026d8d77c23a02cc.tar.zst nixlib-03cae069fef51eb1d09236b6026d8d77c23a02cc.zip |
haskell-pandoc: use current git version when building with ghc-8.4.x
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 16 |
1 files changed, 13 insertions, 3 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 5390d46c6e1d..5a0f91615c11 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -688,10 +688,20 @@ self: super: { stripLen = 1; }); - # https://github.com/jgm/pandoc-types/issues/37 - pandoc-types = self.pandoc-types_1_17_4_1; - # 1.3.0.0 does not compile. conduit = self.conduit_1_3_0_1; + # 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"; + }; + }; } |