diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-19 12:11:04 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-19 12:11:04 +0100 |
commit | 024407bf9adeadc115eeeb3fdf8dba166ea17d7c (patch) | |
tree | 0f28c316cea0b7aa95bb15a0df90077415721d71 /pkgs/development/haskell-modules/configuration-common.nix | |
parent | bce12effa7f4279d057acf437e7fdcafefd16557 (diff) | |
parent | 390ed4a626211fb7d19fb8da7661c8e3b42c4795 (diff) | |
download | nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.gz nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.bz2 nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.lz nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.xz nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.tar.zst nixpkgs-024407bf9adeadc115eeeb3fdf8dba166ea17d7c.zip |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1505754
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 270f41e14cc..41d050531a3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1225,7 +1225,7 @@ self: super: { # Use latest pandoc despite what LTS says. # Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309. - pandoc = dontCheck super.pandoc_2_6; + pandoc = doDistribute (dontCheck super.pandoc_2_6); pandoc-citeproc = self.pandoc-citeproc_0_16_1; # https://github.com/qfpl/tasty-hedgehog/issues/24 |