commit eaf992fa45136a6b695ae17128400b07d0899ee1 · pyrox.dev/nixpkgs

+6

pkgs/development/haskell-modules/configuration-common.nix

···

       1695
       1695
        
           (appendPatches [./patches/pattern-arrows-add-fix-import.patch])

     

       1696
       1696
        
         ];

     

       1697
       1697
        
       

     

       1698
       1698
       +
         # 2024-03-19: Fix for mtl >= 2.3

     

       1699
       1699
       +
         cheapskate = lib.pipe super.cheapskate [

     

       1700
       1700
       +
           doJailbreak

     

       1701
       1701
       +
           (appendPatches [./patches/cheapskate-mtl-2-3-support.patch])

     

       1702
       1702
       +
         ];

     

       1703
       1703
       +
       

     

       1698
       1704
        
         # 2020-06-24: Tests are broken in hackage distribution.

     

       1699
       1705
        
         # See: https://github.com/robstewart57/rdf4h/issues/39

     

       1700
       1706
        
         rdf4h = dontCheck super.rdf4h;

-1

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

···

       745
       745
        
         - chatty-text # failure in job https://hydra.nixos.org/build/233199498 at 2023-09-02

     

       746
       746
        
         - chatty-utils # failure in job https://hydra.nixos.org/build/252710715 at 2024-03-16

     

       747
       747
        
         - chatwork # failure in job https://hydra.nixos.org/build/233240489 at 2023-09-02

     

       748
       748
       -
         - cheapskate # failure in job https://hydra.nixos.org/build/233197892 at 2023-09-02

     

       749
       748
        
         - check-cfg-ambiguity # failure in job https://hydra.nixos.org/build/233251852 at 2023-09-02

     

       750
       749
        
         - checked # failure in job https://hydra.nixos.org/build/233223182 at 2023-09-02

     

       751
       750
        
         - Checked # failure in job https://hydra.nixos.org/build/233257598 at 2023-09-02

+23

pkgs/development/haskell-modules/patches/cheapskate-mtl-2-3-support.patch

···

       1
       1
       +
       diff --git a/Cheapskate/Parse.hs b/Cheapskate/Parse.hs

     

       2
       2
       +
       index b90d8e5..2925132 100644

     

       3
       3
       +
       --- a/Cheapskate/Parse.hs

     

       4
       4
       +
       +++ b/Cheapskate/Parse.hs

     

       5
       5
       +
       @@ -1,4 +1,5 @@

     

       6
       6
       +
        {-# LANGUAGE OverloadedStrings #-}

     

       7
       7
       +
       +{-# LANGUAGE CPP #-}

     

       8
       8
       +
        module Cheapskate.Parse (

     

       9
       9
       +
                 markdown

     

       10
       10
       +
               ) where

     

       11
       11
       +
       @@ -21,6 +22,12 @@ import Control.Applicative

     

       12
       12
       +
        import qualified Data.Map as M

     

       13
       13
       +
        import Data.List (intercalate)

     

       14
       14
       +
        

     

       15
       15
       +
       +#if MIN_VERSION_mtl(2, 3, 0)

     

       16
       16
       +
       +import Control.Monad (guard, unless, replicateM)

     

       17
       17
       +
       +#else

     

       18
       18
       +
       +#endif

     

       19
       19
       +
       +

     

       20
       20
       +
       +

     

       21
       21
       +
        import Debug.Trace

     

       22
       22
       +
        

     

       23
       23
       +
        -- | Parses the input as a markdown document.  Note that 'Doc' is an instance