From 2c96fbf27aeb249d420fd9b35a07bd043dcab5a0 Mon Sep 17 00:00:00 2001 From: slotThe Date: Mon, 30 Mar 2020 15:56:18 +0200 Subject: [PATCH] git-mediate: bump stackage to lts-15.4 --- srcpkgs/git-mediate/patches/ghc8.8.3.patch | 19 +++++++++++++++++++ srcpkgs/git-mediate/template | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/git-mediate/patches/ghc8.8.3.patch diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch new file mode 100644 index 0000000000..7928b61ef3 --- /dev/null +++ b/srcpkgs/git-mediate/patches/ghc8.8.3.patch @@ -0,0 +1,19 @@ +--- git-mediate.cabal 2001-09-09 03:46:40.000000000 +0200 ++++ git-mediate.cabal 2020-03-30 15:32:48.959537620 +0200 +@@ -72,7 +72,7 @@ + ghc-options: -O2 -Wall + -- other-extensions: + build-depends: base >=4.8 && <5 +- , base-compat >= 0.8.2 && < 0.11 ++ , base-compat >= 0.8.2 && < 0.12 + , mtl >=2.1 + , directory >=1.2 + , process >=1.2 +@@ -80,6 +80,6 @@ + , unix-compat >=0.4.2.0 + , Diff >=0.4 + , ansi-terminal >=0.6.2 +- , optparse-applicative >=0.11 && <0.15 ++ , optparse-applicative >=0.11 && <0.16 + hs-source-dirs: src + default-language: Haskell2010 diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template index 12890f97e0..5fb8eaa690 100644 --- a/srcpkgs/git-mediate/template +++ b/srcpkgs/git-mediate/template @@ -1,8 +1,9 @@ # Template file for 'git-mediate' pkgname=git-mediate version=1.0.8 -revision=2 +revision=3 build_style=haskell-stack +stackage="lts-15.4" depends="git" short_desc="Tool to help resolving git conflicts" maintainer="Peter Wang "