git-mediate: update to 1.0.8.1

This commit is contained in:
slotThe 2021-03-25 16:07:47 +01:00 committed by q66
parent 4a111d35d0
commit b5b19bfcb8
2 changed files with 4 additions and 23 deletions

View file

@ -1,19 +0,0 @@
--- a/git-mediate.cabal 2001-09-09 03:46:40.000000000 +0200
+++ b/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

View file

@ -1,15 +1,15 @@
# Template file for 'git-mediate'
pkgname=git-mediate
version=1.0.8
revision=4
version=1.0.8.1
revision=1
build_style=haskell-stack
stackage="lts-16.13"
stackage="lts-17.5"
depends="git"
short_desc="Tool to help resolving git conflicts"
maintainer="Peter Wang <novalazy@gmail.com>"
license="GPL-2.0-only"
homepage="https://github.com/Peaker/git-mediate"
distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
checksum=ee44841d37ded70cbcd8edd1e233a344d0118295e0bd2f0c6983ed00f619c467
nocross=yes
nopie_files="/usr/bin/git-mediate"