pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch

   1 From 67bb87ceff53f0178c988dd4e15eeb2daee92b84 Mon Sep 17 00:00:00 2001
   2 From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
   3 Date: Tue, 20 Feb 2018 17:46:24 +0100
   4 Subject: [PATCH] Relax upper version bounds on dependencies
   5
   6 ---
   7  Setup.hs       | 20 ++++++++++++++++----
   8  encoding.cabal |  4 ++--
   9  stack.yaml     |  4 ++--
  10  3 files changed, 20 insertions(+), 8 deletions(-)
  11
  12 diff --git a/Setup.hs b/Setup.hs
  13 index de719e6..fe5b84c 100644
  14 --- a/Setup.hs
  15 +++ b/Setup.hs
  16 @@ -1,13 +1,25 @@
  17 +{-# LANGUAGE CPP #-}
  18 +
  19  module Main where
  20
  21  import Distribution.Simple
  22  import Data.Encoding.Preprocessor.Mapping
  23  import Data.Encoding.Preprocessor.XMLMappingBuilder
  24
  25 +#if MIN_VERSION_Cabal(2,0,0)
  26 +main = defaultMainWithHooks (simpleUserHooks
  27 +                             {hookedPreProcessors = ( ("mapping" , \_ _ _ -> mappingPreprocessor)
  28 +                                                    : ("mapping2", \_ _ _ -> mappingPreprocessor)
  29 +                                                    : ("xml"     , \_ _ _ -> xmlPreprocessor)
  30 +                                                    : (hookedPreProcessors simpleUserHooks)
  31 +                                                    )
  32 +                             })
  33 +#else
  34  main = defaultMainWithHooks (simpleUserHooks
  35 -                             {hookedPreProcessors = (("mapping",\_ _ -> mappingPreprocessor)
  36 -                                                     :("mapping2",\_ _ -> mappingPreprocessor)
  37 -                                                     :("xml",\_ _ -> xmlPreprocessor)
  38 -                                                     :(hookedPreProcessors simpleUserHooks)
  39 +                             {hookedPreProcessors = ( ("mapping" , \_ _ -> mappingPreprocessor)
  40 +                                                    : ("mapping2", \_ _ -> mappingPreprocessor)
  41 +                                                    : ("xml"     , \_ _ -> xmlPreprocessor)
  42 +                                                    : (hookedPreProcessors simpleUserHooks)
  43                                                      )
  44                               })
  45 +#endif
  46 diff --git a/encoding.cabal b/encoding.cabal
  47 index ec20617..f221715 100644
  48 --- a/encoding.cabal
  49 +++ b/encoding.cabal
  50 @@ -36,7 +36,7 @@ Source-Repository this
  51
  52  Custom-Setup
  53    Setup-Depends: base >=3 && <5,
  54 -                 Cabal >=1.24 && <1.25,
  55 +                 Cabal >=1.24 && <2.1,
  56                   containers,
  57                   filepath,
  58                   ghc-prim,
  59 @@ -51,7 +51,7 @@ Library
  60                   extensible-exceptions >=0.1 && <0.2,
  61                   ghc-prim >=0.3 && <0.6,
  62                   mtl >=2.0 && <2.3,
  63 -                 regex-compat >=0.71 && <0.95
  64 +                 regex-compat >=0.71 && <0.96
  65
  66    Extensions: CPP
  67