Merge pull request #297265 from t4ccer/t4/unbreak-hs
haskellPackages.{pattern-arrows,cheapskate,aeson-better-errors:}: unbreak
This commit is contained in:
commit
262da6e97d
@ -166,7 +166,17 @@ self: super: {
|
||||
|
||||
# Allow aeson == 2.1.*
|
||||
# https://github.com/hdgarrood/aeson-better-errors/issues/23
|
||||
aeson-better-errors = doJailbreak super.aeson-better-errors;
|
||||
aeson-better-errors = lib.pipe super.aeson-better-errors [
|
||||
doJailbreak
|
||||
(appendPatches [
|
||||
# https://github.com/hdgarrood/aeson-better-errors/pull/25
|
||||
(fetchpatch {
|
||||
name = "mtl-2-3.patch";
|
||||
url = "https://github.com/hdgarrood/aeson-better-errors/commit/1ec49ab7d1472046b680b5a64ae2930515b47714.patch";
|
||||
hash = "sha256-xuuocWxSoBDclVp0bJ9UrDamVcDVOAFgJIi/un1xBvk=";
|
||||
})
|
||||
])
|
||||
];
|
||||
|
||||
# 2023-08-09: Jailbreak because of vector < 0.13
|
||||
# 2023-11-09: don't check because of https://github.com/tweag/monad-bayes/pull/326
|
||||
@ -1598,6 +1608,18 @@ self: super: {
|
||||
# Upstream issue: https://github.com/kowainik/trial/issues/62
|
||||
trial = doJailbreak super.trial;
|
||||
|
||||
# 2024-03-19: Fix for mtl >= 2.3
|
||||
pattern-arrows = lib.pipe super.pattern-arrows [
|
||||
doJailbreak
|
||||
(appendPatches [./patches/pattern-arrows-add-fix-import.patch])
|
||||
];
|
||||
|
||||
# 2024-03-19: Fix for mtl >= 2.3
|
||||
cheapskate = lib.pipe super.cheapskate [
|
||||
doJailbreak
|
||||
(appendPatches [./patches/cheapskate-mtl-2-3-support.patch])
|
||||
];
|
||||
|
||||
# 2020-06-24: Tests are broken in hackage distribution.
|
||||
# See: https://github.com/robstewart57/rdf4h/issues/39
|
||||
rdf4h = dontCheck super.rdf4h;
|
||||
|
@ -71,7 +71,6 @@ broken-packages:
|
||||
- adtrees # failure in job https://hydra.nixos.org/build/233192320 at 2023-09-02
|
||||
- AERN-Basics # failure in job https://hydra.nixos.org/build/233246999 at 2023-09-02
|
||||
- aeson-applicative # failure in job https://hydra.nixos.org/build/233213824 at 2023-09-02
|
||||
- aeson-better-errors # failure in job https://hydra.nixos.org/build/252717339 at 2024-03-16
|
||||
- aeson-bson # failure in job https://hydra.nixos.org/build/233201964 at 2023-09-02
|
||||
- aeson-commit # failure in job https://hydra.nixos.org/build/233198515 at 2023-09-02
|
||||
- aeson-compat # failure in job https://hydra.nixos.org/build/233208257 at 2023-09-02
|
||||
@ -746,7 +745,6 @@ broken-packages:
|
||||
- chatty-text # failure in job https://hydra.nixos.org/build/233199498 at 2023-09-02
|
||||
- chatty-utils # failure in job https://hydra.nixos.org/build/252710715 at 2024-03-16
|
||||
- chatwork # failure in job https://hydra.nixos.org/build/233240489 at 2023-09-02
|
||||
- cheapskate # failure in job https://hydra.nixos.org/build/233197892 at 2023-09-02
|
||||
- check-cfg-ambiguity # failure in job https://hydra.nixos.org/build/233251852 at 2023-09-02
|
||||
- checked # failure in job https://hydra.nixos.org/build/233223182 at 2023-09-02
|
||||
- Checked # failure in job https://hydra.nixos.org/build/233257598 at 2023-09-02
|
||||
@ -4354,7 +4352,6 @@ broken-packages:
|
||||
- path-sing # failure in job https://hydra.nixos.org/build/237234354 at 2023-10-21
|
||||
- PathTree # failure in job https://hydra.nixos.org/build/233216203 at 2023-09-02
|
||||
- patronscraper # failure in job https://hydra.nixos.org/build/233258571 at 2023-09-02
|
||||
- pattern-arrows # failure in job https://hydra.nixos.org/build/252718352 at 2024-03-16
|
||||
- pattern-trie # failure in job https://hydra.nixos.org/build/233237252 at 2023-09-02
|
||||
- paynow-zw # failure in job https://hydra.nixos.org/build/233221916 at 2023-09-02
|
||||
- paypal-adaptive-hoops # failure in job https://hydra.nixos.org/build/233244557 at 2023-09-02
|
||||
|
@ -420,6 +420,12 @@ package-maintainers:
|
||||
- irc-client
|
||||
- chatter
|
||||
- envy
|
||||
t4ccer:
|
||||
- aeson-better-errors
|
||||
- cheapskate
|
||||
- containers-unicode-symbols
|
||||
- numerals-base
|
||||
- pattern-arrows
|
||||
tbidne:
|
||||
- rest-rewrite
|
||||
terlar:
|
||||
|
@ -716,8 +716,6 @@ dont-distribute-packages:
|
||||
- borel
|
||||
- both
|
||||
- bound-gen
|
||||
- bower-json
|
||||
- bower-json_1_0_0_1
|
||||
- breakout
|
||||
- bricks
|
||||
- bricks-internal-test
|
||||
@ -824,7 +822,6 @@ dont-distribute-packages:
|
||||
- chassis
|
||||
- chatty
|
||||
- cheapskate-highlight
|
||||
- cheapskate-lucid
|
||||
- cheapskate-terminal
|
||||
- check-pvp
|
||||
- chevalier-common
|
||||
@ -2315,7 +2312,6 @@ dont-distribute-packages:
|
||||
- ideas-statistics
|
||||
- identicon-style-squares
|
||||
- idna
|
||||
- idris
|
||||
- ifscs
|
||||
- ige-mac-integration
|
||||
- igrf
|
||||
@ -2353,7 +2349,6 @@ dont-distribute-packages:
|
||||
- inferno-vc
|
||||
- infinity
|
||||
- inline-java
|
||||
- inliterate
|
||||
- inspector-wrecker
|
||||
- instant-aeson
|
||||
- instant-bytes
|
||||
@ -3040,8 +3035,6 @@ dont-distribute-packages:
|
||||
- outsort
|
||||
- overeasy
|
||||
- overload
|
||||
- pa-field-parser
|
||||
- pa-json
|
||||
- package-o-tron
|
||||
- padKONTROL
|
||||
- pairing
|
||||
@ -3269,7 +3262,6 @@ dont-distribute-packages:
|
||||
- protocol-buffers-descriptor
|
||||
- protocol-buffers-descriptor-fork
|
||||
- proton
|
||||
- psc-ide
|
||||
- psql
|
||||
- publicsuffixlist
|
||||
- puffytools
|
||||
@ -3279,10 +3271,7 @@ dont-distribute-packages:
|
||||
- puppetresources
|
||||
- pure-cdb
|
||||
- pure-priority-queue-tests
|
||||
- purenix
|
||||
- purescript
|
||||
- purescript-iso
|
||||
- purescript-tsd-gen
|
||||
- pursuit-client
|
||||
- push-notify
|
||||
- push-notify-apn
|
||||
@ -4402,7 +4391,6 @@ dont-distribute-packages:
|
||||
- yu-launch
|
||||
- yuuko
|
||||
- zasni-gerna
|
||||
- zephyr
|
||||
- zephyr-copilot
|
||||
- zerobin
|
||||
- zeromq3-conduit
|
||||
|
@ -25945,8 +25945,7 @@ self: {
|
||||
];
|
||||
description = "Better error messages when decoding JSON values";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
maintainers = [ lib.maintainers.t4ccer ];
|
||||
}) {};
|
||||
|
||||
"aeson-bson" = callPackage
|
||||
@ -53073,7 +53072,6 @@ self: {
|
||||
];
|
||||
description = "Read bower.json from Haskell";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"bowntz" = callPackage
|
||||
@ -62883,9 +62881,8 @@ self: {
|
||||
executableHaskellDepends = [ base blaze-html bytestring text ];
|
||||
description = "Experimental markdown processor";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "cheapskate";
|
||||
broken = true;
|
||||
maintainers = [ lib.maintainers.t4ccer ];
|
||||
}) {};
|
||||
|
||||
"cheapskate-highlight" = callPackage
|
||||
@ -62917,7 +62914,6 @@ self: {
|
||||
libraryHaskellDepends = [ base blaze-html cheapskate lucid ];
|
||||
description = "Use cheapskate with Lucid";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"cheapskate-terminal" = callPackage
|
||||
@ -73440,6 +73436,7 @@ self: {
|
||||
libraryHaskellDepends = [ base base-unicode-symbols containers ];
|
||||
description = "Unicode alternatives for common functions and operators";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.t4ccer ];
|
||||
}) {};
|
||||
|
||||
"containers-verified" = callPackage
|
||||
@ -167632,7 +167629,6 @@ self: {
|
||||
];
|
||||
description = "Functional Programming Language with Dependent Types";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {inherit (pkgs) gmp;};
|
||||
|
||||
"ieee" = callPackage
|
||||
@ -170537,7 +170533,6 @@ self: {
|
||||
testHaskellDepends = [ base text ];
|
||||
description = "Interactive literate programming";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "inlitpp";
|
||||
}) {};
|
||||
|
||||
@ -217754,6 +217749,7 @@ self: {
|
||||
];
|
||||
description = "Convert numbers to number words";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.t4ccer ];
|
||||
}) {};
|
||||
|
||||
"numeric-domains" = callPackage
|
||||
@ -223801,7 +223797,6 @@ self: {
|
||||
];
|
||||
description = "“Vertical” parsing of values";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"pa-json" = callPackage
|
||||
@ -223821,7 +223816,6 @@ self: {
|
||||
];
|
||||
description = "Our JSON parsers/encoders";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"pa-label" = callPackage
|
||||
@ -228371,8 +228365,7 @@ self: {
|
||||
libraryHaskellDepends = [ base mtl ];
|
||||
description = "Arrows for Pretty Printing";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
maintainers = [ lib.maintainers.t4ccer ];
|
||||
}) {};
|
||||
|
||||
"pattern-matcher" = callPackage
|
||||
@ -244359,7 +244352,6 @@ self: {
|
||||
];
|
||||
description = "Language support for the PureScript programming language";
|
||||
license = lib.licenses.mit;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"pseudo-boolean" = callPackage
|
||||
@ -245233,7 +245225,6 @@ self: {
|
||||
executableHaskellDepends = [ base ];
|
||||
description = "Nix backend for PureScript. Transpile PureScript code to Nix.";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "purenix";
|
||||
}) {};
|
||||
|
||||
@ -245324,7 +245315,6 @@ self: {
|
||||
doCheck = false;
|
||||
description = "PureScript Programming Language Compiler";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "purs";
|
||||
}) {};
|
||||
|
||||
@ -245456,7 +245446,6 @@ self: {
|
||||
];
|
||||
description = "TypeScript Declaration File (.d.ts) generator for PureScript";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "purs-tsd-gen";
|
||||
}) {};
|
||||
|
||||
@ -334349,7 +334338,6 @@ self: {
|
||||
testToolDepends = [ purescript ];
|
||||
description = "Zephyr, tree-shaking for the PureScript language";
|
||||
license = lib.licenses.mpl20;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "zephyr";
|
||||
}) {};
|
||||
|
||||
|
@ -0,0 +1,23 @@
|
||||
diff --git a/Cheapskate/Parse.hs b/Cheapskate/Parse.hs
|
||||
index b90d8e5..2925132 100644
|
||||
--- a/Cheapskate/Parse.hs
|
||||
+++ b/Cheapskate/Parse.hs
|
||||
@@ -1,4 +1,5 @@
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
+{-# LANGUAGE CPP #-}
|
||||
module Cheapskate.Parse (
|
||||
markdown
|
||||
) where
|
||||
@@ -21,6 +22,12 @@ import Control.Applicative
|
||||
import qualified Data.Map as M
|
||||
import Data.List (intercalate)
|
||||
|
||||
+#if MIN_VERSION_mtl(2, 3, 0)
|
||||
+import Control.Monad (guard, unless, replicateM)
|
||||
+#else
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
import Debug.Trace
|
||||
|
||||
-- | Parses the input as a markdown document. Note that 'Doc' is an instance
|
@ -0,0 +1,12 @@
|
||||
diff --git a/src/Control/PatternArrows.hs b/src/Control/PatternArrows.hs
|
||||
index d382c19..0b067dd 100644
|
||||
--- a/src/Control/PatternArrows.hs
|
||||
+++ b/src/Control/PatternArrows.hs
|
||||
@@ -23,6 +23,7 @@ import qualified Control.Category as C
|
||||
import Control.Category ((>>>))
|
||||
import qualified Control.Arrow as A
|
||||
import Control.Arrow ((***), (<+>))
|
||||
+import Data.Function (fix)
|
||||
|
||||
-- |
|
||||
-- A first-order pattern match
|
Loading…
Reference in New Issue
Block a user