From fb640bc2f49c18c0d34ec7664e88bb6d07a8f0ea Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 1 Aug 2023 15:17:43 -0400 Subject: [PATCH] support building with unix-compat 0.7 It removed System.PosixCompat.User. --- Build/DesktopFile.hs | 2 +- CHANGELOG | 3 ++- Utility/UserInfo.hs | 2 +- git-annex.cabal | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Build/DesktopFile.hs b/Build/DesktopFile.hs index 5c1b72c021..8d13294c05 100644 --- 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 4500c65011..4c37c3715d 100644 --- 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 Mon, 26 Jun 2023 13:10:40 -0400 diff --git a/Utility/UserInfo.hs b/Utility/UserInfo.hs index 593be4cc72..9bf83a1c13 100644 --- 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 b065949653..fa20535f63 100644 --- 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), -- 2.30.2