support building with unix-compat 0.7

It removed System.PosixCompat.User.
This commit is contained in:
Joey Hess 2023-08-01 15:17:43 -04:00
parent 1bc7792101
commit fb640bc2f4
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 5 additions and 4 deletions

View file

@ -24,7 +24,7 @@ import Assistant.Install.Menu
import System.Environment import System.Environment
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
import System.PosixCompat.User import System.Posix.User
import Data.Maybe import Data.Maybe
import Control.Applicative import Control.Applicative
import Prelude import Prelude

View file

@ -33,7 +33,8 @@ git-annex (10.20230627) UNRELEASED; urgency=medium
* Setup.hs: Stop installing man pages, desktop files, and the * Setup.hs: Stop installing man pages, desktop files, and the
git-annex-shell and git-remote-tor-annex symlinks. git-annex-shell and git-remote-tor-annex symlinks.
Anything still relying on that, eg via cabal v1-install will need to Anything still relying on that, eg via cabal v1-install will need to
change to using make install-home. change to using make install-home.a
* git-annex.cabal: Support building with unix-compat 0.7
-- Joey Hess <id@joeyh.name> Mon, 26 Jun 2023 13:10:40 -0400 -- Joey Hess <id@joeyh.name> Mon, 26 Jun 2023 13:10:40 -0400

View file

@ -19,9 +19,9 @@ import Utility.Exception
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
import Utility.Data import Utility.Data
import Control.Applicative import Control.Applicative
import System.Posix.User
#endif #endif
import System.PosixCompat.User
import Prelude import Prelude
{- Current user's home directory. {- Current user's home directory.

View file

@ -323,7 +323,7 @@ Executable git-annex
case-insensitive, case-insensitive,
random, random,
dlist, dlist,
unix-compat (>= 0.5 && < 0.7), unix-compat (>= 0.5 && < 0.8),
SafeSemaphore, SafeSemaphore,
async, async,
directory (>= 1.2.7.0), directory (>= 1.2.7.0),