From 6d10fecff48ed6068b03659d88ffca7c89e79c62 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Dec 2019 11:43:15 -0400 Subject: [PATCH] adjust filepath-bytestring deps cabal needs to support the old one for debian currently, but stack can require the newer one --- git-annex.cabal | 4 ++-- stack.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git-annex.cabal b/git-annex.cabal index a32c400bac..cf298961c2 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -296,7 +296,7 @@ source-repository head custom-setup Setup-Depends: base (>= 4.11.1.0), hslogger, split, unix-compat, process, filepath, exceptions, bytestring, directory, IfElse, data-default, - filepath-bytestring (>= 1.4.2.1.1), + filepath-bytestring (>= 1.4.2.1.0), utf8-string, transformers, Cabal Executable git-annex @@ -321,7 +321,7 @@ Executable git-annex directory (>= 1.2), disk-free-space, filepath, - filepath-bytestring, + filepath-bytestring (>= 1.4.2.1.0), IfElse, hslogger, monad-logger, diff --git a/stack.yaml b/stack.yaml index dde1d76583..887fd68529 100644 --- a/stack.yaml +++ b/stack.yaml @@ -24,7 +24,7 @@ extra-deps: - sandi-0.5 - http-client-0.5.14 - silently-1.2.5.1 -- filepath-bytestring-1.4.2.1.0 +- filepath-bytestring-1.4.2.1.1 explicit-setup-deps: git-annex: true resolver: lts-13.29