support building with unix-compat 0.7

It removed System.PosixCompat.User.

diff --git a/Build/DesktopFile.hs b/Build/DesktopFile.hs
index 5c1b72c02163b9c5f57298709addde54d3a72cd2..8d13294c0573b62b9e132a8bf2461ad6e876088c 100644 (file)
--- a/Build/DesktopFile.hs
+++ b/Build/DesktopFile.hs
@@ -24,7 +24,7 @@ import Assistant.Install.Menu
 
 import System.Environment
 #ifndef mingw32_HOST_OS 
-import System.PosixCompat.User
+import System.Posix.User
 import Data.Maybe
 import Control.Applicative
 import Prelude

diff --git a/CHANGELOG b/CHANGELOG
index 4500c650112af9beafb77168e5465451ef9ebf55..4c37c3715de9b86b043f75a5dce130a8e6fa8232 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -33,7 +33,8 @@ git-annex (10.20230627) UNRELEASED; urgency=medium
   * Setup.hs: Stop installing man pages, desktop files, and the
     git-annex-shell and git-remote-tor-annex symlinks.
     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
 

diff --git a/Utility/UserInfo.hs b/Utility/UserInfo.hs
index 593be4cc724e0752e1b26c5d86c47ebac95292f6..9bf83a1c13b6826bcc7a7b3be6e9bd9493d57549 100644 (file)
--- a/Utility/UserInfo.hs
+++ b/Utility/UserInfo.hs
@@ -19,9 +19,9 @@ import Utility.Exception
 #ifndef mingw32_HOST_OS
 import Utility.Data
 import Control.Applicative
+import System.Posix.User
 #endif
 
-import System.PosixCompat.User
 import Prelude
 
 {- Current user's home directory.

diff --git a/git-annex.cabal b/git-annex.cabal
index b0659496535ef2f1871bb8c7efa561e1096359e7..fa20535f6385757318d288a6186d71e003050167 100644 (file)
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -323,7 +323,7 @@ Executable git-annex
    case-insensitive,
    random,
    dlist,
-   unix-compat (>= 0.5 && < 0.7),
+   unix-compat (>= 0.5 && < 0.8),
    SafeSemaphore,
    async,
    directory (>= 1.2.7.0),