vendor in xmlbf and xmlbf-xeno

unfoldml · Oct 31, 2023 · 3efacb8 · 3efacb8
1 parent a023eb7
commit 3efacb8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/ms-azure-api/ms-azure-api.cabal b/ms-azure-api/ms-azure-api.cabal
@@ -28,26 +28,30 @@ library
                        MSAzureAPI.StorageServices
                        MSAzureAPI.StorageServices.FileService
   other-modules:       MSAzureAPI.Internal.Common
+                       Xmlbf
+                       Xmlbf.Xeno
   build-depends:       aeson
                      , base >= 4.7 && < 5
                      , bytestring
                      , conduit
                      , containers
+                     , deepseq
                      , exceptions >= 0.10.4
+                     , html-entities >= 1.1
                      , http-client
                      , http-client-tls >= 0.3.6.1
                      , http-types
                      , modern-uri
                      , ms-auth >= 0.5
                      , req
                      , scientific
+                     , selective
                      , text
                      , time >= 1.8
                      , transformers >= 0.5
                      , unliftio
+                     , unordered-containers >= 0.2
                      , xeno
-                     , xmlbf < 0.7
-                     , xmlbf-xeno
   ghc-options:         -Wall
                        -Wcompat
                        -Wno-unused-imports

diff --git a/ms-azure-api/src/MSAzureAPI/StorageServices/FileService.hs b/ms-azure-api/src/MSAzureAPI/StorageServices/FileService.hs
@@ -47,14 +47,15 @@ import Data.Time.LocalTime (getZonedTime)
 -- xeno
 import qualified Xeno.DOM.Robust as X (Node, Content(..), name, contents, children)
 -- xmlbf-xeno
-import qualified Xmlbf.Xeno as XB (fromRawXml)
--- xmlbf
-import qualified Xmlbf as XB (Parser, runParser, pElement, pText)
 
-import MSAzureAPI.Internal.Common (run, APIPlane(..), (==:), get, getBs, post, getLbs, tryReq)
 
 
 
+import MSAzureAPI.Internal.Common (run, APIPlane(..), (==:), get, getBs, post, getLbs, tryReq)
+import qualified Xmlbf as XB (Parser, runParser, pElement, pText)
+import qualified Xmlbf.Xeno as XB (fromRawXml)
+
+
 
 
 {- | Headers:

diff --git a/ms-azure-api/stack.yaml b/ms-azure-api/stack.yaml
@@ -17,7 +17,6 @@ packages:
 extra-deps:
 - dotenv-micro-0.1.0.1@sha256:7cc4d8ad8452b2b8fd1e4c0b1d3ee69ceebb73c98f1697d1dd647a1e820afdf5,1520
 - validation-micro-1.0.0.0@sha256:fc195f4ddca51bd5f0521e2fd9c3ad448a5066ec24c49a3401f7c477ca6ea807,2541
-- xmlbf-0.6.2@sha256:942a17883eb54125d02109665e011f485dafe08235383d4e00cd0957aef3b9bf,1535
 
 
 # Override default flag values for local packages and extra-deps

diff --git a/stack.yaml b/stack.yaml
@@ -16,8 +16,6 @@ extra-deps:
 - validation-micro-1.0.0.0
 - dotenv-micro-0.1.0.1
 
-allow-newer: true
-
 # extra-deps:
 # - acme-missiles-0.3
 # - git: https://github.com/commercialhaskell/stack.git