···1165 # $HOME, which we don't have in our build sandbox.
1166 cabal-install-parsers = dontCheck super.cabal-install-parsers;
11671168- # * jailbreak can be removed at the next release (current is 0.13.0.0)
1169- # * patch fixes compilation with pandoc >= 2.12, can be removed if a
1170- # release contains https://github.com/jgm/gitit/pull/670 or equivalent.
1171- # Patch is vendored in as it may change upstream in the future.
1172- gitit = doJailbreak (appendPatch super.gitit ./patches/gitit-pandoc-2.12.patch);
00011731174 # Test suite requires database
1175 persistent-mysql = dontCheck super.persistent-mysql;
···1239 patch = doJailbreak super.patch;
12401241 # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
1242- reflex-dom-core = doDistribute (unmarkBroken (dontCheck (appendPatch super.reflex-dom-core (pkgs.fetchpatch {
1243 url = https://github.com/reflex-frp/reflex-dom/commit/6aed7b7ebb70372778f1a29a724fcb4de815ba04.patch;
1244 sha256 = "1g7lgwj7rpziilif2gian412iy05gqbzwx9w0m6ajq3clxs5zs7l";
1245 stripLen = 2;
···1393 pkgs.lib.makeBinPath deps
1394 }"
1395 '';
00001396 }));
13971398 # Our quickcheck-instances is too old for the newer binary-instances, but
···14161417 # 2021-03-09: Golden tests seem to be missing in hackage release:
1418 # https://github.com/haskell/haskell-language-server/issues/1536
1419- hls-tactics-plugin = dontCheck super.hls-tactics-plugin;
14201421 # 2021-03-24: hlint 3.3 is for ghc 9 compat, but hls only supports ghc 8.10
1422 hls-hlint-plugin = super.hls-hlint-plugin.override {
···1468 # https://github.com/obsidiansystems/dependent-sum/issues/55
1469 dependent-sum = doJailbreak super.dependent-sum;
14701471- dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch {
01472 # 2020-11-18: https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/9
1473 # Bump version bounds for ghc 8.10
1474 url = https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/e1f5898116222a1bc557d41f3395066f83736093.patch;
···1692 # https://github.com/jgm/pandoc/issues/7163
1693 pandoc = dontCheck super.pandoc;
16941695- # test suite triggers some kind of linking bug at runtime
1696- # https://github.com/noinia/hgeometry/issues/132
1697- hgeometry-combinatorial = dontCheck super.hgeometry-combinatorial;
0016981699 # Too strict version bounds on ansi-terminal
1700 # https://github.com/kowainik/co-log/pull/218
···1716 # Issue reported upstream, no bug tracker url yet.
1717 darcs = doJailbreak super.darcs;
17181719- # Too strict version bounds on ansi-terminal
1720- # This patch will be contained with the next release (current is 0.1.0.0).
1721- colourista = appendPatch super.colourista
1722- (pkgs.fetchpatch {
1723- url = "https://github.com/kowainik/colourista/commit/15ace92105b56eba4ea3717bd55f733afe5be401.patch";
1724- sha256 = "sha256-9gJFlyWUkO5sJodDRNuH10I66j8/0ZZIv6nJQkhlA0s=";
1725- });
1726-1727 # Too strict version bounds on base16-bytestring and http-link-header.
1728 # This patch will be merged when next release comes.
1729 github = appendPatch super.github (pkgs.fetchpatch {
1730 url = "https://github.com/phadej/github/commit/514b175851dd7c4a9722ff203dd6f652a15d33e8.patch";
1731 sha256 = "0pmx54xd7ah85y9mfi5366wbnwrp918j0wbx8yw8hrdac92qi4gh";
000001732 });
17331734 # 2021-04-02: Outdated optparse-applicative bound is fixed but not realeased on upstream.
···1743 # Overriding bounds behind a cabal flag
1744 preConfigure = ''substituteInPlace iCalendar.cabal --replace "network >=2.6 && <2.7" "network -any"'';
1745 };
1746-1747- # Too strict bounds on base: https://github.com/runarorama/fuzzyfind/issues/1
1748- fuzzyfind = doJailbreak super.fuzzyfind;
17491750 # Apply patch from master relaxing the version bounds on tasty.
1751 # Can be removed at next release (current is 0.10.1.0).
···1779 # https://github.com/smallhadroncollider/taskell/issues/100
1780 # May be possible to remove at the next release (1.11.0)
1781 taskell = doJailbreak super.taskell;
00000000000000000000000000017821783} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
···1165 # $HOME, which we don't have in our build sandbox.
1166 cabal-install-parsers = dontCheck super.cabal-install-parsers;
11671168+ # jailbreak and patch (for pandoc >= 2.12) ensure compilation with newer dependencies.
1169+ # can both be removed at the next release (current is 0.13.0.0)
1170+ gitit = doJailbreak (appendPatch super.gitit
1171+ (pkgs.fetchpatch {
1172+ url = "https://github.com/jgm/gitit/commit/e8c9d94be332e2f73de9b0eee222a2a09f191faf.patch";
1173+ sha256 = "1rl2c3sz8cd2c3qwv9b640853s4bblcknvfv29k472wqhs62mwz1";
1174+ includes = [ "src/**" ];
1175+ }));
11761177 # Test suite requires database
1178 persistent-mysql = dontCheck super.persistent-mysql;
···1242 patch = doJailbreak super.patch;
12431244 # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
1245+ reflex-dom-core = doDistribute (unmarkBroken (dontCheck (appendPatch (doJailbreak super.reflex-dom-core) (pkgs.fetchpatch {
1246 url = https://github.com/reflex-frp/reflex-dom/commit/6aed7b7ebb70372778f1a29a724fcb4de815ba04.patch;
1247 sha256 = "1g7lgwj7rpziilif2gian412iy05gqbzwx9w0m6ajq3clxs5zs7l";
1248 stripLen = 2;
···1396 pkgs.lib.makeBinPath deps
1397 }"
1398 '';
1399+1400+ # 2021-04-09: test failure
1401+ # PR pending https://github.com/expipiplus1/update-nix-fetchgit/pull/60
1402+ doCheck = false;
1403 }));
14041405 # Our quickcheck-instances is too old for the newer binary-instances, but
···14231424 # 2021-03-09: Golden tests seem to be missing in hackage release:
1425 # https://github.com/haskell/haskell-language-server/issues/1536
1426+ hls-tactics-plugin = dontCheck (super.hls-tactics-plugin.override { refinery = self.refinery_0_3_0_0; });
14271428 # 2021-03-24: hlint 3.3 is for ghc 9 compat, but hls only supports ghc 8.10
1429 hls-hlint-plugin = super.hls-hlint-plugin.override {
···1475 # https://github.com/obsidiansystems/dependent-sum/issues/55
1476 dependent-sum = doJailbreak super.dependent-sum;
14771478+ # Overspecified constraint on 'constraints'. Kinda funny, huh?
1479+ dependent-sum-aeson-orphans = appendPatch (doJailbreak super.dependent-sum-aeson-orphans) (pkgs.fetchpatch {
1480 # 2020-11-18: https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/9
1481 # Bump version bounds for ghc 8.10
1482 url = https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/e1f5898116222a1bc557d41f3395066f83736093.patch;
···1700 # https://github.com/jgm/pandoc/issues/7163
1701 pandoc = dontCheck super.pandoc;
17021703+ # * doctests don't work without cabal
1704+ # https://github.com/noinia/hgeometry/issues/132
1705+ # * Too strict version bound on vector-builder
1706+ # https://github.com/noinia/hgeometry/commit/a6abecb1ce4a7fd96b25cc1a5c65cd4257ecde7a#commitcomment-49282301
1707+ hgeometry-combinatorial = dontCheck (doJailbreak super.hgeometry-combinatorial);
17081709 # Too strict version bounds on ansi-terminal
1710 # https://github.com/kowainik/co-log/pull/218
···1726 # Issue reported upstream, no bug tracker url yet.
1727 darcs = doJailbreak super.darcs;
1728000000001729 # Too strict version bounds on base16-bytestring and http-link-header.
1730 # This patch will be merged when next release comes.
1731 github = appendPatch super.github (pkgs.fetchpatch {
1732 url = "https://github.com/phadej/github/commit/514b175851dd7c4a9722ff203dd6f652a15d33e8.patch";
1733 sha256 = "0pmx54xd7ah85y9mfi5366wbnwrp918j0wbx8yw8hrdac92qi4gh";
1734+ });
1735+1736+ # list `modbus` in librarySystemDepends, correct to `libmodbus`
1737+ libmodbus = overrideCabal super.libmodbus (drv: {
1738+ librarySystemDepends = [ pkgs.libmodbus ];
1739 });
17401741 # 2021-04-02: Outdated optparse-applicative bound is fixed but not realeased on upstream.
···1750 # Overriding bounds behind a cabal flag
1751 preConfigure = ''substituteInPlace iCalendar.cabal --replace "network >=2.6 && <2.7" "network -any"'';
1752 };
00017531754 # Apply patch from master relaxing the version bounds on tasty.
1755 # Can be removed at next release (current is 0.10.1.0).
···1783 # https://github.com/smallhadroncollider/taskell/issues/100
1784 # May be possible to remove at the next release (1.11.0)
1785 taskell = doJailbreak super.taskell;
1786+1787+ # ghc-bignum is not buildable if none of the three backends
1788+ # is explicitly enabled. We enable Native for now as it doesn't
1789+ # depend on anything else as oppossed to GMP and FFI.
1790+ # Apply patch which fixes a compilation failure we encountered.
1791+ # Can be removed if the following issue is resolved / the patch
1792+ # is merged and released:
1793+ # * https://gitlab.haskell.org/ghc/ghc/-/issues/19638
1794+ # * https://gitlab.haskell.org/ghc/ghc/-/merge_requests/5454
1795+ ghc-bignum = overrideCabal super.ghc-bignum (old: {
1796+ configureFlags = (old.configureFlags or []) ++ [ "-f" "Native" ];
1797+ patches = (old.patches or []) ++ [
1798+ (pkgs.fetchpatch {
1799+ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/08d1588bf38d83140a86817a7a615db486357d4f.patch";
1800+ sha256 = "1qx4r031y72px291vz38bng9sb23r8zb35s03v5hhawlmgzfzcb5";
1801+ stripLen = 2;
1802+ })
1803+ ];
1804+ });
1805+1806+ # 2021-04-09: outdated base and alex-tools
1807+ # PR pending https://github.com/glguy/language-lua/pull/6
1808+ language-lua = doJailbreak super.language-lua;
1809+1810+ # 2021-04-09: too strict time bound
1811+ # PR pending https://github.com/zohl/cereal-time/pull/2
1812+ cereal-time = doJailbreak super.cereal-time;
18131814} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
···659 let
660 # spago requires an older version of megaparsec, but it appears to work
661 # fine with newer versions.
662- spagoWithOverrides = doJailbreak (super.spago.override {
663- dhall = self.dhall_1_37_1;
664- });
665666 # This defines the version of the purescript-docs-search release we are using.
667 # This is defined in the src/Spago/Prelude.hs file in the spago source.
···659 let
660 # spago requires an older version of megaparsec, but it appears to work
661 # fine with newer versions.
662+ spagoWithOverrides = doJailbreak super.spago;
00663664 # This defines the version of the purescript-docs-search release we are using.
665 # This is defined in the src/Spago/Prelude.hs file in the spago source.
···1-commit a03d3b043458f45d29ba32068a77c0d3b8a4223f
2-Author: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
3-Date: Fri Apr 2 15:14:02 2021 +0200
4-5- Allow compilation with pandoc 2.12 and 2.13
6-7- pandoc 2.13 introduced the following breakages for gitit:
8-9- * UTF8.readFile now returns a Text which is actually ideal for gitit.
10- If pandoc is new enough we just make readFileUTF8 an alias for
11- UTF8.readFile.
12-13- * Text.Pandoc.Shared no longer exports substitute. In order to be
14- conservative I've chosen to just copy the substitute function from
15- pandoc 2.11.4. I need this patch kind of urgently so I didn't want to
16- make any changes or refactors independently from upstream if
17- avoidable. However, I'd be happy to rebase this PR branch to adopt a
18- different solution to just copying the function.
19-20-diff --git a/src/Network/Gitit/Authentication.hs b/src/Network/Gitit/Authentication.hs
21-index 4c240e7..c0f92fd 100644
22---- a/src/Network/Gitit/Authentication.hs
23-+++ b/src/Network/Gitit/Authentication.hs
24-@@ -44,7 +44,7 @@ import System.Exit
25- import System.Log.Logger (logM, Priority(..))
26- import Data.Char (isAlphaNum, isAlpha)
27- import qualified Data.Map as M
28--import Text.Pandoc.Shared (substitute)
29-+import Data.List (stripPrefix)
30- import Data.Maybe (isJust, fromJust, isNothing, fromMaybe)
31- import Network.URL (exportURL, add_param, importURL)
32- import Network.BSD (getHostName)
33-@@ -54,6 +54,16 @@ import Codec.Binary.UTF8.String (encodeString)
34- import Data.ByteString.UTF8 (toString)
35- import Network.Gitit.Rpxnow as R
36-37-+-- | Replace each occurrence of one sublist in a list with another.
38-+-- Vendored in from pandoc 2.11.4 as 2.12 removed this function.
39-+substitute :: (Eq a) => [a] -> [a] -> [a] -> [a]
40-+substitute _ _ [] = []
41-+substitute [] _ xs = xs
42-+substitute target replacement lst@(x:xs) =
43-+ case stripPrefix target lst of
44-+ Just lst' -> replacement ++ substitute target replacement lst'
45-+ Nothing -> x : substitute target replacement xs
46-+
47- data ValidationType = Register
48- | ResetPassword
49- deriving (Show,Read)
50-diff --git a/src/Network/Gitit/Util.hs b/src/Network/Gitit/Util.hs
51-index c5e9fe5..067130a 100644
52---- a/src/Network/Gitit/Util.hs
53-+++ b/src/Network/Gitit/Util.hs
54-@@ -45,7 +45,11 @@ import Network.URL (encString)
55-56- -- | Read file as UTF-8 string. Encode filename as UTF-8.
57- readFileUTF8 :: FilePath -> IO Text
58-+#if MIN_VERSION_pandoc(2,12,0)
59-+readFileUTF8 = UTF8.readFile
60-+#else
61- readFileUTF8 = fmap T.pack . UTF8.readFile
62-+#endif
63-64- -- | Perform a function a directory and return to working directory.
65- inDir :: FilePath -> IO a -> IO a