pyrox.dev
lol
haskellPackages: Fixup pandoc minor version in overrides
+4
-4
pkgs/development/haskell-modules/configuration-common.nix
+4
-4
pkgs/development/haskell-modules/configuration-common.nix
···
295
295
296
296
# Overriding the version pandoc dependency uses as the latest release has version bounds
297
297
# defined as >= 3.1 && < 3.2, can be removed once pandoc gets bumped by Stackage.
298
-
patat = super.patat.override { pandoc = self.pandoc_3_1_8; };
298
+
patat = super.patat.override { pandoc = self.pandoc_3_1_9; };
299
299
300
300
# http2 also overridden in all-packages.nix for mailctl.
301
301
# twain is currently only used by mailctl, so the .overrideScope shouldn't
···
1841
1841
inherit (let
1842
1842
pandoc-cli-overlay = self: super: {
1843
1843
# pandoc-cli requires pandoc >= 3.1
1844
-
pandoc = self.pandoc_3_1_8;
1844
+
pandoc = self.pandoc_3_1_9;
1845
1845
1846
1846
# pandoc depends on http-client-tls, which only starts depending
1847
1847
# on crypton-connection in http-client-tls-0.3.6.2.
···
1853
1853
};
1854
1854
in {
1855
1855
pandoc-cli = super.pandoc-cli.overrideScope pandoc-cli-overlay;
1856
-
pandoc_3_1_8 = doDistribute (super.pandoc_3_1_8.overrideScope pandoc-cli-overlay);
1856
+
pandoc_3_1_9 = doDistribute (super.pandoc_3_1_9.overrideScope pandoc-cli-overlay);
1857
1857
pandoc-lua-engine = super.pandoc-lua-engine.overrideScope pandoc-cli-overlay;
1858
1858
})
1859
1859
pandoc-cli
1860
-
pandoc_3_1_8
1860
+
pandoc_3_1_9
1861
1861
pandoc-lua-engine
1862
1862
;
1863
1863
+2
-2
pkgs/development/tools/pandoc/default.nix
+2
-2
pkgs/development/tools/pandoc/default.nix
···
34
34
-t ${haskellPackages.warp} \
35
35
$out/bin/pandoc
36
36
remove-references-to \
37
-
-t ${haskellPackages.pandoc_3_1_8} \
37
+
-t ${haskellPackages.pandoc_3_1_9} \
38
38
$out/bin/pandoc
39
39
'' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) ''
40
40
mkdir -p $out/share/bash-completion/completions
···
48
48
# lead to a transitive runtime dependency on the whole GHC distribution.
49
49
# This should ideally be fixed in haskellPackages (or even Cabal),
50
50
# but a minimal pandoc is important enough to patch it manually.
51
-
disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc_3_1_8 ];
51
+
disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc_3_1_9 ];
52
52
})