git-mediate: bump stackage to lts-15.4
This commit is contained in:
parent
77268d0ad0
commit
2c96fbf27a
2 changed files with 21 additions and 1 deletions
19
srcpkgs/git-mediate/patches/ghc8.8.3.patch
Normal file
19
srcpkgs/git-mediate/patches/ghc8.8.3.patch
Normal file
|
@ -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
|
|
@ -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 <novalazy@gmail.com>"
|
||||
|
|
Loading…
Reference in a new issue