diff --git a/CHANGELOG b/CHANGELOG index 8bc5aae986..fa6b91a417 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -37,6 +37,7 @@ git-annex (10.20220223) UNRELEASED; urgency=medium * test: Added --jobs option. * Removed vendored copy of http-client-restricted, and removed the HttpClientRestricted build flag that avoided that dependency. + * Removed the NetworkBSD build flag. -- Joey Hess Wed, 23 Feb 2022 14:14:09 -0400 diff --git a/git-annex.cabal b/git-annex.cabal index 9d32ee349b..e3b6552ccd 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -284,10 +284,6 @@ Flag DebugLocks Flag Dbus Description: Enable dbus support -Flag NetworkBSD - Description: Build with network-3.0 which split out network-bsd - Default: True - Flag GitLfs Description: Build with git-lfs library (rather than vendored copy) Default: True @@ -377,7 +373,9 @@ Executable git-annex tasty-rerun, ansi-terminal >= 0.9, aws (>= 0.20), - DAV (>= 1.0) + DAV (>= 1.0), + network (>= 3.0.0.0), + network-bsd CC-Options: -Wall GHC-Options: -Wall -fno-warn-tabs -Wincomplete-uni-patterns Default-Language: Haskell2010 @@ -411,11 +409,6 @@ Executable git-annex else Build-Depends: unix (>= 2.7.2) - if flag(NetworkBSD) - Build-Depends: network-bsd, network (>= 3.0.0.0) - else - Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0) - if flag(GitLfs) Build-Depends: git-lfs (>= 1.2.0) CPP-Options: -DWITH_GIT_LFS diff --git a/stack.yaml b/stack.yaml index a37078e5ec..9b067c82f7 100644 --- a/stack.yaml +++ b/stack.yaml @@ -9,7 +9,6 @@ flags: dbus: false debuglocks: false benchmark: true - networkbsd: true gitlfs: true packages: - '.' diff --git a/standalone/linux/stack-i386ancient.yaml b/standalone/linux/stack-i386ancient.yaml index e8f2acecb8..3712ce6829 100644 --- a/standalone/linux/stack-i386ancient.yaml +++ b/standalone/linux/stack-i386ancient.yaml @@ -9,7 +9,6 @@ flags: dbus: false debuglocks: false benchmark: false - networkbsd: true gitlfs: true packages: - '.'