From 952664641a38ee4da940c1bb8f1bf6c3e699137f Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 25 Feb 2022 13:16:36 -0400
Subject: [PATCH] turn of PackageImports in cabal file

This makes it easier to build eg benchmarks of individual modules.

May be that most of these PackageImports are not really necessary,
dunno.
---
 .ghci                        | 1 -
 Annex.hs                     | 2 +-
 Annex/View.hs                | 2 +-
 Assistant/Monad.hs           | 1 +
 Command/Info.hs              | 2 +-
 Command/TestRemote.hs        | 2 +-
 Remote/Helper/Encryptable.hs | 2 +-
 Utility/AuthToken.hs         | 2 ++
 Utility/Base64.hs            | 2 ++
 Utility/Hash.hs              | 2 +-
 Utility/WebApp.hs            | 2 +-
 git-annex.cabal              | 2 +-
 12 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.ghci b/.ghci
index 40a10bd335..931298e050 100644
--- a/.ghci
+++ b/.ghci
@@ -1,4 +1,3 @@
 :load Common
 :set -XLambdaCase
-:set -XPackageImports
 :set -fno-warn-tabs
diff --git a/Annex.hs b/Annex.hs
index 3948252443..0856e7fc05 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
 
-{-# LANGUAGE GeneralizedNewtypeDeriving, BangPatterns #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving, BangPatterns, PackageImports #-}
 
 module Annex (
 	Annex,
diff --git a/Annex/View.hs b/Annex/View.hs
index 0dc9ee033b..4e5905923b 100644
--- a/Annex/View.hs
+++ b/Annex/View.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
 
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings, PackageImports #-}
 
 module Annex.View where
 
diff --git a/Assistant/Monad.hs b/Assistant/Monad.hs
index dc62001e34..dcdbeaf4dd 100644
--- a/Assistant/Monad.hs
+++ b/Assistant/Monad.hs
@@ -6,6 +6,7 @@
  -}
 
 {-# LANGUAGE GeneralizedNewtypeDeriving, MultiParamTypeClasses #-}
+{-# LANGUAGE PackageImports #-}
 
 module Assistant.Monad (
 	Assistant,
diff --git a/Command/Info.hs b/Command/Info.hs
index f74ac5183c..d273c4a5b4 100644
--- a/Command/Info.hs
+++ b/Command/Info.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
 
-{-# LANGUAGE BangPatterns, DeriveDataTypeable #-}
+{-# LANGUAGE BangPatterns, DeriveDataTypeable, PackageImports #-}
 
 module Command.Info where
 
diff --git a/Command/TestRemote.hs b/Command/TestRemote.hs
index 9d7daa8297..ef90ff28b9 100644
--- a/Command/TestRemote.hs
+++ b/Command/TestRemote.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
 
-{-# LANGUAGE RankNTypes, DeriveFunctor #-}
+{-# LANGUAGE RankNTypes, DeriveFunctor, PackageImports #-}
 
 module Command.TestRemote where
 
diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs
index 2e880b09f6..57b79e81e8 100644
--- a/Remote/Helper/Encryptable.hs
+++ b/Remote/Helper/Encryptable.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
 
-{-# LANGUAGE FlexibleContexts, ScopedTypeVariables #-}
+{-# LANGUAGE FlexibleContexts, ScopedTypeVariables, PackageImports #-}
 
 module Remote.Helper.Encryptable (
 	EncryptionIsSetup,
diff --git a/Utility/AuthToken.hs b/Utility/AuthToken.hs
index 0f2b71e06b..f5e2bfdcbc 100644
--- a/Utility/AuthToken.hs
+++ b/Utility/AuthToken.hs
@@ -5,6 +5,8 @@
  - License: BSD-2-clause
  -}
 
+{-# LANGUAGE PackageImports #-}
+
 module Utility.AuthToken (
 	AuthToken,
 	toAuthToken,
diff --git a/Utility/Base64.hs b/Utility/Base64.hs
index deeaa3d95e..1a09cb310b 100644
--- a/Utility/Base64.hs
+++ b/Utility/Base64.hs
@@ -5,6 +5,8 @@
  - License: BSD-2-clause
  -}
 
+{-# LANGUAGE PackageImports #-}
+
 module Utility.Base64 where
 
 import Utility.FileSystemEncoding
diff --git a/Utility/Hash.hs b/Utility/Hash.hs
index 38e0b885e2..ccbf23be08 100644
--- a/Utility/Hash.hs
+++ b/Utility/Hash.hs
@@ -5,7 +5,7 @@
  - License: BSD-2-clause
  -}
 
-{-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE BangPatterns, PackageImports #-}
 
 module Utility.Hash (
 	sha1,
diff --git a/Utility/WebApp.hs b/Utility/WebApp.hs
index adf32e36d6..81bd2d97be 100644
--- a/Utility/WebApp.hs
+++ b/Utility/WebApp.hs
@@ -5,7 +5,7 @@
  - License: BSD-2-clause
  -}
 
-{-# LANGUAGE OverloadedStrings, CPP, RankNTypes #-}
+{-# LANGUAGE OverloadedStrings, CPP, RankNTypes, PackageImports #-}
 
 module Utility.WebApp (
 	browserProc,
diff --git a/git-annex.cabal b/git-annex.cabal
index 2bc014b98e..85a85175fa 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -383,7 +383,7 @@ Executable git-annex
   CC-Options: -Wall
   GHC-Options: -Wall -fno-warn-tabs  -Wincomplete-uni-patterns
   Default-Language: Haskell2010
-  Default-Extensions: PackageImports, LambdaCase
+  Default-Extensions: LambdaCase
   Other-Extensions: TemplateHaskell
   -- Some things don't work with the non-threaded RTS.
   GHC-Options: -threaded
-- 
2.30.2