Merge pull request #134 from commercialhaskell/fix133

Fix #133 indexRelFile is function of cabalCacheLayout
commercialhaskell · Mar 23, 2024 · 2d98029 · 2d98029
2 parents 4f13ecd + 9427e8e
commit 2d98029
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,9 @@
 # Changelog for pantry
 
+## v0.9.3.3
+
+* Name of tar file of local cache of package index is not hard coded.
+
 ## v0.9.3.2
 
 * Support `ansi-terminal-1.0.2`.

diff --git a/package.yaml b/package.yaml
@@ -1,5 +1,5 @@
 name: pantry
-version: 0.9.3.2
+version: 0.9.3.3
 synopsis: Content addressable Haskell package management
 description: Please see the README on GitHub at <https://github.com/commercialhaskell/pantry#readme>
 category: Development

diff --git a/pantry.cabal b/pantry.cabal
diff --git a/src/Pantry/Hackage.hs b/src/Pantry/Hackage.hs
@@ -98,8 +98,14 @@ hackageRelDir = either impureThrow id $ parseRelDir "hackage"
 hackageDirL :: HasPantryConfig env => SimpleGetter env (Path Abs Dir)
 hackageDirL = pantryConfigL.to ((</> hackageRelDir) . pcRootDir)
 
+-- | The name of the tar file that is part of the local cache of the package
+-- index is determined by this package's use of 'HS.cabalCacheLayout' as the
+-- layout of the local cache.
 indexRelFile :: Path Rel File
-indexRelFile = either impureThrow id $ parseRelFile "00-index.tar"
+indexRelFile = either impureThrow id $ parseRelFile indexTar
+ where
+  indexTar' = HS.cacheLayoutIndexTar HS.cabalCacheLayout
+  indexTar = HS.toUnrootedFilePath $ HS.unrootPath indexTar'
 
 -- | Where does pantry download its 01-index.tar file from Hackage?
 --