diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,10 @@ # Changelog for pantry +## v0.11.2 + +* Expose `Tree`, `TreeEntry`, `FileType` and `renderTree`, as these are used by + the `casa-server` package's test suite. + ## v0.11.1 * Drop support for GHC versions before GHC 7.10. diff --git a/pantry.cabal b/pantry.cabal --- a/pantry.cabal +++ b/pantry.cabal @@ -1,355 +1,355 @@ cabal-version: 2.0 - --- This file has been generated from package.yaml by hpack version 0.38.1. --- --- see: https://github.com/sol/hpack - -name: pantry -version: 0.11.1 -synopsis: Content addressable Haskell package management -description: Please see the README on GitHub at -category: Development -homepage: https://github.com/commercialhaskell/pantry#readme -bug-reports: https://github.com/commercialhaskell/pantry/issues -author: Michael Snoyman -maintainer: michael@snoyman.com -copyright: 2018-2022 FP Complete -license: BSD3 -license-file: LICENSE -build-type: Simple -extra-source-files: - CONTRIBUTING.md - README.md - ChangeLog.md - attic/hpack-0.1.2.3.tar.gz - attic/package-0.1.2.3.tar.gz - attic/symlink-to-dir.tar.gz - -source-repository head - type: git - location: https://github.com/commercialhaskell/pantry - -flag test-pretty-exceptions - description: Build an executable to test pretty exceptions - manual: False - default: False - -library - exposed-modules: - Pantry - Pantry.SQLite - Pantry.Internal.Stackage - other-modules: - Hackage.Security.Client.Repository.HttpLib.HttpClient - Pantry.Archive - Pantry.HTTP - Pantry.Hackage - Pantry.Repo - Pantry.Storage - Pantry.Casa - Pantry.Tree - reexported-modules: - Pantry.SHA256 - hs-source-dirs: - src/ - ghc-options: -fwrite-ide-info -hiedir=.hie -Wall - build-depends: - Cabal >=3 && <3.17 - , aeson - , aeson-warning-parser >=0.1.1 - , ansi-terminal - , base >=4.13 && <5 - , bytestring - , casa-client >=0.0.2 - , casa-types - , companion - , conduit - , conduit-extra - , containers - , crypton - , crypton-conduit - , digest - , filelock - , generic-deriving - , hackage-security - , hpack >=0.35.3 - , http-client - , http-client-tls >=0.3.6.2 - , http-conduit - , http-download >=0.2.1.0 - , http-types - , internal - , memory - , mtl - , network-uri - , path - , path-io - , persistent - , persistent-sqlite >=2.9.3 - , persistent-template - , primitive - , resourcet - , rio - , rio-orphans - , rio-prettyprint >=0.1.7.0 - , static-bytes >=0.1.1 - , tar-conduit >=0.4.1 - , text - , text-metrics - , time - , transformers - , unix-compat - , unliftio - , unordered-containers - , vector - , yaml - , zip-archive - default-language: Haskell2010 - if impl(ghc >= 9.4.5) && os(windows) - build-depends: - network >=3.1.2.9 - if os(windows) - other-modules: - System.IsWindows - hs-source-dirs: - src/windows/ - else - other-modules: - System.IsWindows - hs-source-dirs: - src/unix/ - -library internal - exposed-modules: - Pantry.HPack - Pantry.Internal - Pantry.SHA256 - Pantry.Types - other-modules: - Paths_pantry - autogen-modules: - Paths_pantry - hs-source-dirs: - int/ - ghc-options: -fwrite-ide-info -hiedir=.hie -Wall - build-depends: - Cabal >=3 && <3.17 - , aeson - , aeson-warning-parser >=0.1.1 - , ansi-terminal - , base >=4.13 && <5 - , bytestring - , casa-client >=0.0.2 - , casa-types - , companion - , conduit - , conduit-extra - , containers - , crypton - , crypton-conduit - , digest - , filelock - , generic-deriving - , hackage-security - , hpack >=0.35.3 - , http-client - , http-client-tls >=0.3.6.2 - , http-conduit - , http-download >=0.2.1.0 - , http-types - , memory - , mtl - , network-uri - , path - , path-io - , persistent - , persistent-sqlite >=2.9.3 - , persistent-template - , primitive - , resourcet - , rio - , rio-orphans - , rio-prettyprint >=0.1.7.0 - , static-bytes >=0.1.1 - , tar-conduit >=0.4.1 - , text - , text-metrics - , time - , transformers - , unix-compat - , unliftio - , unordered-containers - , vector - , yaml - , zip-archive - default-language: Haskell2010 - if impl(ghc >= 9.4.5) && os(windows) - build-depends: - network >=3.1.2.9 - -executable test-pretty-exceptions - main-is: Main.hs - other-modules: - Paths_pantry - autogen-modules: - Paths_pantry - hs-source-dirs: - app/test-pretty-exceptions - ghc-options: -fwrite-ide-info -hiedir=.hie -Wall - build-depends: - Cabal >=3 && <3.17 - , aeson - , aeson-warning-parser >=0.1.1 - , ansi-terminal - , base >=4.13 && <5 - , bytestring - , casa-client >=0.0.2 - , casa-types - , companion - , conduit - , conduit-extra - , containers - , crypton - , crypton-conduit - , digest - , filelock - , generic-deriving - , hackage-security - , hpack >=0.35.3 - , http-client - , http-client-tls >=0.3.6.2 - , http-conduit - , http-download >=0.2.1.0 - , http-types - , memory - , mtl - , network-uri - , optparse-applicative - , pantry - , path - , path-io - , persistent - , persistent-sqlite >=2.9.3 - , persistent-template - , primitive - , resourcet - , rio - , rio-orphans - , rio-prettyprint >=0.1.7.0 - , static-bytes >=0.1.1 - , tar-conduit >=0.4.1 - , text - , text-metrics - , time - , transformers - , unix-compat - , unliftio - , unordered-containers - , vector - , yaml - , zip-archive - default-language: Haskell2010 - if impl(ghc >= 9.4.5) && os(windows) - build-depends: - network >=3.1.2.9 - if !flag(test-pretty-exceptions) - buildable: False - if os(windows) - other-modules: - PathAbsExamples - System.Terminal - hs-source-dirs: - app/test-pretty-exceptions/windows/ - build-depends: - Win32 - , process - else - other-modules: - PathAbsExamples - System.Terminal - hs-source-dirs: - app/test-pretty-exceptions/unix/ - -test-suite spec - type: exitcode-stdio-1.0 - main-is: Spec.hs - other-modules: - Pantry.ArchiveSpec - Pantry.BuildPlanSpec - Pantry.CabalSpec - Pantry.CasaSpec - Pantry.FileSpec - Pantry.GlobalHintsSpec - Pantry.HackageSpec - Pantry.InternalSpec - Pantry.TreeSpec - Pantry.TypesSpec - Paths_pantry - autogen-modules: - Paths_pantry - hs-source-dirs: - test - ghc-options: -fwrite-ide-info -hiedir=.hie -Wall - build-tool-depends: - hspec-discover:hspec-discover - build-depends: - Cabal >=3 && <3.17 - , QuickCheck - , aeson - , aeson-warning-parser >=0.1.1 - , ansi-terminal - , base >=4.13 && <5 - , bytestring - , casa-client >=0.0.2 - , casa-types - , companion - , conduit - , conduit-extra - , containers - , crypton - , crypton-conduit - , digest - , exceptions - , filelock - , generic-deriving - , hackage-security - , hedgehog - , hpack >=0.35.3 - , hspec - , http-client - , http-client-tls >=0.3.6.2 - , http-conduit - , http-download >=0.2.1.0 - , http-types - , internal - , memory - , mtl - , network-uri - , pantry - , path - , path-io - , persistent - , persistent-sqlite >=2.9.3 - , persistent-template - , primitive - , raw-strings-qq - , resourcet - , rio - , rio-orphans - , rio-prettyprint >=0.1.7.0 - , static-bytes >=0.1.1 - , tar-conduit >=0.4.1 - , text - , text-metrics - , time - , transformers - , unix-compat - , unliftio - , unordered-containers - , vector - , yaml - , zip-archive - default-language: Haskell2010 - if impl(ghc >= 9.4.5) && os(windows) - build-depends: - network >=3.1.2.9 + +-- This file has been generated from package.yaml by hpack version 0.38.2. +-- +-- see: https://github.com/sol/hpack + +name: pantry +version: 0.11.2 +synopsis: Content addressable Haskell package management +description: Please see the README on GitHub at +category: Development +homepage: https://github.com/commercialhaskell/pantry#readme +bug-reports: https://github.com/commercialhaskell/pantry/issues +author: Michael Snoyman +maintainer: michael@snoyman.com +copyright: 2018-2022 FP Complete +license: BSD3 +license-file: LICENSE +build-type: Simple +extra-source-files: + CONTRIBUTING.md + README.md + ChangeLog.md + attic/hpack-0.1.2.3.tar.gz + attic/package-0.1.2.3.tar.gz + attic/symlink-to-dir.tar.gz + +source-repository head + type: git + location: https://github.com/commercialhaskell/pantry + +flag test-pretty-exceptions + description: Build an executable to test pretty exceptions + manual: False + default: False + +library + exposed-modules: + Pantry + Pantry.SQLite + Pantry.Internal.Stackage + other-modules: + Hackage.Security.Client.Repository.HttpLib.HttpClient + Pantry.Archive + Pantry.HTTP + Pantry.Hackage + Pantry.Repo + Pantry.Storage + Pantry.Casa + Pantry.Tree + reexported-modules: + Pantry.SHA256 + hs-source-dirs: + src/ + ghc-options: -fwrite-ide-info -hiedir=.hie -Wall + build-depends: + Cabal >=3 && <3.17 + , aeson + , aeson-warning-parser >=0.1.1 + , ansi-terminal + , base >=4.13 && <5 + , bytestring + , casa-client >=0.0.2 + , casa-types + , companion + , conduit + , conduit-extra + , containers + , crypton + , crypton-conduit + , digest + , filelock + , generic-deriving + , hackage-security + , hpack >=0.35.3 + , http-client + , http-client-tls >=0.3.6.2 + , http-conduit + , http-download >=0.2.1.0 + , http-types + , internal + , memory + , mtl + , network-uri + , path + , path-io + , persistent + , persistent-sqlite >=2.9.3 + , persistent-template + , primitive + , resourcet + , rio + , rio-orphans + , rio-prettyprint >=0.1.7.0 + , static-bytes >=0.1.1 + , tar-conduit >=0.4.1 + , text + , text-metrics + , time + , transformers + , unix-compat + , unliftio + , unordered-containers + , vector + , yaml + , zip-archive + default-language: Haskell2010 + if impl(ghc >= 9.4.5) && os(windows) + build-depends: + network >=3.1.2.9 + if os(windows) + other-modules: + System.IsWindows + hs-source-dirs: + src/windows/ + else + other-modules: + System.IsWindows + hs-source-dirs: + src/unix/ + +library internal + exposed-modules: + Pantry.HPack + Pantry.Internal + Pantry.SHA256 + Pantry.Types + other-modules: + Paths_pantry + autogen-modules: + Paths_pantry + hs-source-dirs: + int/ + ghc-options: -fwrite-ide-info -hiedir=.hie -Wall + build-depends: + Cabal >=3 && <3.17 + , aeson + , aeson-warning-parser >=0.1.1 + , ansi-terminal + , base >=4.13 && <5 + , bytestring + , casa-client >=0.0.2 + , casa-types + , companion + , conduit + , conduit-extra + , containers + , crypton + , crypton-conduit + , digest + , filelock + , generic-deriving + , hackage-security + , hpack >=0.35.3 + , http-client + , http-client-tls >=0.3.6.2 + , http-conduit + , http-download >=0.2.1.0 + , http-types + , memory + , mtl + , network-uri + , path + , path-io + , persistent + , persistent-sqlite >=2.9.3 + , persistent-template + , primitive + , resourcet + , rio + , rio-orphans + , rio-prettyprint >=0.1.7.0 + , static-bytes >=0.1.1 + , tar-conduit >=0.4.1 + , text + , text-metrics + , time + , transformers + , unix-compat + , unliftio + , unordered-containers + , vector + , yaml + , zip-archive + default-language: Haskell2010 + if impl(ghc >= 9.4.5) && os(windows) + build-depends: + network >=3.1.2.9 + +executable test-pretty-exceptions + main-is: Main.hs + other-modules: + Paths_pantry + autogen-modules: + Paths_pantry + hs-source-dirs: + app/test-pretty-exceptions + ghc-options: -fwrite-ide-info -hiedir=.hie -Wall + build-depends: + Cabal >=3 && <3.17 + , aeson + , aeson-warning-parser >=0.1.1 + , ansi-terminal + , base >=4.13 && <5 + , bytestring + , casa-client >=0.0.2 + , casa-types + , companion + , conduit + , conduit-extra + , containers + , crypton + , crypton-conduit + , digest + , filelock + , generic-deriving + , hackage-security + , hpack >=0.35.3 + , http-client + , http-client-tls >=0.3.6.2 + , http-conduit + , http-download >=0.2.1.0 + , http-types + , memory + , mtl + , network-uri + , optparse-applicative + , pantry + , path + , path-io + , persistent + , persistent-sqlite >=2.9.3 + , persistent-template + , primitive + , resourcet + , rio + , rio-orphans + , rio-prettyprint >=0.1.7.0 + , static-bytes >=0.1.1 + , tar-conduit >=0.4.1 + , text + , text-metrics + , time + , transformers + , unix-compat + , unliftio + , unordered-containers + , vector + , yaml + , zip-archive + default-language: Haskell2010 + if impl(ghc >= 9.4.5) && os(windows) + build-depends: + network >=3.1.2.9 + if !flag(test-pretty-exceptions) + buildable: False + if os(windows) + other-modules: + PathAbsExamples + System.Terminal + hs-source-dirs: + app/test-pretty-exceptions/windows/ + build-depends: + Win32 + , process + else + other-modules: + PathAbsExamples + System.Terminal + hs-source-dirs: + app/test-pretty-exceptions/unix/ + +test-suite spec + type: exitcode-stdio-1.0 + main-is: Spec.hs + other-modules: + Pantry.ArchiveSpec + Pantry.BuildPlanSpec + Pantry.CabalSpec + Pantry.CasaSpec + Pantry.FileSpec + Pantry.GlobalHintsSpec + Pantry.HackageSpec + Pantry.InternalSpec + Pantry.TreeSpec + Pantry.TypesSpec + Paths_pantry + autogen-modules: + Paths_pantry + hs-source-dirs: + test + ghc-options: -fwrite-ide-info -hiedir=.hie -Wall + build-tool-depends: + hspec-discover:hspec-discover + build-depends: + Cabal >=3 && <3.17 + , QuickCheck + , aeson + , aeson-warning-parser >=0.1.1 + , ansi-terminal + , base >=4.13 && <5 + , bytestring + , casa-client >=0.0.2 + , casa-types + , companion + , conduit + , conduit-extra + , containers + , crypton + , crypton-conduit + , digest + , exceptions + , filelock + , generic-deriving + , hackage-security + , hedgehog + , hpack >=0.35.3 + , hspec + , http-client + , http-client-tls >=0.3.6.2 + , http-conduit + , http-download >=0.2.1.0 + , http-types + , internal + , memory + , mtl + , network-uri + , pantry + , path + , path-io + , persistent + , persistent-sqlite >=2.9.3 + , persistent-template + , primitive + , raw-strings-qq + , resourcet + , rio + , rio-orphans + , rio-prettyprint >=0.1.7.0 + , static-bytes >=0.1.1 + , tar-conduit >=0.4.1 + , text + , text-metrics + , time + , transformers + , unix-compat + , unliftio + , unordered-containers + , vector + , yaml + , zip-archive + default-language: Haskell2010 + if impl(ghc >= 9.4.5) && os(windows) + build-depends: + network >=3.1.2.9 diff --git a/src/Pantry.hs b/src/Pantry.hs --- a/src/Pantry.hs +++ b/src/Pantry.hs @@ -68,6 +68,10 @@ , RawPackageMetadata (..) , PackageMetadata (..) , Package (..) + , Tree (..) + , TreeEntry (..) + , FileType (..) + , renderTree -- ** Hackage , CabalFileInfo (..) @@ -260,7 +264,7 @@ import Pantry.Types as P ( Archive (..), ArchiveLocation (..), BlobKey (..) , CabalFileInfo (..), CabalString (..), FileSize (..) - , FuzzyResults (..), GlobalHintsLocation (..) + , FileType (..), FuzzyResults (..), GlobalHintsLocation (..) , HackageSecurityConfig (..), HasPantryConfig (..) , HpackExecutable (..), Mismatch (..), ModuleName , Package (..), PackageCabal (..), PackageIdentifier (..) @@ -288,7 +292,7 @@ , parsePackageNameThrowing, parseRawPackageLocationImmutables , parseRawSnapshotLocation, parseSnapName, parseTreeM , parseVersion, parseVersionThrowing, parseWantedCompiler - , pirForHash, resolvePaths, snapshotLocation + , pirForHash, renderTree, resolvePaths, snapshotLocation , toCabalStringMap, toRawPL, toRawPLI, toRawPM, toRawSL , toRawSnapshotLayer, unCabalStringMap, unSafeFilePath , versionString, warnMissingCabalFile diff --git a/src/Pantry/Internal/Stackage.hs b/src/Pantry/Internal/Stackage.hs --- a/src/Pantry/Internal/Stackage.hs +++ b/src/Pantry/Internal/Stackage.hs @@ -1,6 +1,6 @@ -- | All types and functions exported from this module are for advanced usage --- only. They are needed for stackage-server integration with pantry and some --- are needed for stack testing. +-- only. They are needed for @stackage-server@ integration with @pantry@ and +-- some are needed for @stack@ testing. module Pantry.Internal.Stackage ( module X ) where