From 3efacb8d9a52bfb6aa418fb3242db8b29ca8aacf Mon Sep 17 00:00:00 2001 From: Marco Zocca Date: Tue, 31 Oct 2023 12:03:05 +0100 Subject: [PATCH] vendor in xmlbf and xmlbf-xeno --- ms-azure-api/ms-azure-api.cabal | 8 ++++++-- .../src/MSAzureAPI/StorageServices/FileService.hs | 9 +++++---- ms-azure-api/stack.yaml | 1 - stack.yaml | 2 -- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ms-azure-api/ms-azure-api.cabal b/ms-azure-api/ms-azure-api.cabal index d831c2c..fdc4e0c 100644 --- a/ms-azure-api/ms-azure-api.cabal +++ b/ms-azure-api/ms-azure-api.cabal @@ -28,12 +28,16 @@ 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 @@ -41,13 +45,13 @@ library , 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 index e93b477..b5d5591 100644 --- 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 index fee9a1a..5c46028 100644 --- 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 index 5ca274f..91e80d6 100644 --- 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