Skip to content

Commit

Permalink
接頭辞を付けないことのできる改造版 proto3-suite を使っているときのための対応
Browse files Browse the repository at this point in the history
  • Loading branch information
@kakkun61
kakkun61 committed Aug 22, 2023
1 parent 121c926 commit 1a2131a
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 63 deletions.
12 changes: 12 additions & 0 deletions cabal.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@ source-repository-package
subdir: . core
-- HEAD of master at 2023-06-09

source-repository-package
type: git
location: https://github.com/ccycle/proto3-suite.git
tag: 9197b195442600578a919ccce8efd6d4a51d2dd9

source-repository-package
type: git
location: https://github.com/awakesecurity/proto3-wire.git
tag: ee6ca644eef86cc5f31da85fb48e10b20ab0e1a1
-- HEAD of master at 2023-08-10

allow-newer:
http-api-data:base
, postgresql-simple:base
Expand All @@ -48,3 +59,4 @@ allow-newer:

constraints:
postgresql-simple == 0.6.4
, any.proto3-suite +swagger2 -large-records
99 changes: 50 additions & 49 deletions cabal.project.freeze
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ constraints: any.Cabal ==3.4.0.0,
any.HTTP ==4000.4.1,
HTTP -conduit10 +network-uri -warn-as-error -warp-tests,
any.HUnit ==1.6.2.0,
any.OneTuple ==0.4.1.1,
any.OneTuple ==0.3.1,
any.Only ==0.1,
any.QuickCheck ==2.14.3,
QuickCheck -old-random +templatehaskell,
any.StateVar ==1.2.2,
any.adjunctions ==4.4.2,
any.aeson ==2.0.1.0,
aeson -bytestring-builder -cffi +ordered-keymap,
any.aeson-pretty ==0.8.9,
any.aeson ==2.0.3.0,
aeson -cffi +ordered-keymap,
any.aeson-pretty ==0.8.10,
aeson-pretty -lib-only,
any.alex ==3.3.0.0,
any.alex ==3.4.0.0,
any.ansi-terminal ==1.0,
ansi-terminal -example,
any.ansi-terminal-types ==0.11.5,
any.ansi-wl-pprint ==0.6.9,
any.ansi-wl-pprint ==1.0.2,
ansi-wl-pprint -example,
any.appar ==0.1.8,
any.array ==0.5.4.0,
Expand All @@ -32,6 +32,7 @@ constraints: any.Cabal ==3.4.0.0,
atomic-primops -debug,
any.attoparsec ==0.14.4,
attoparsec -developer,
any.attoparsec-aeson ==2.1.0.0,
any.attoparsec-iso8601 ==1.1.0.0,
any.auto-update ==0.1.6,
any.base ==4.15.0.0,
Expand All @@ -40,7 +41,7 @@ constraints: any.Cabal ==3.4.0.0,
any.base-orphans ==0.9.0,
any.base16-bytestring ==1.0.2.0,
any.base64-bytestring ==1.2.1.0,
any.basement ==0.0.15,
any.basement ==0.0.16,
any.bifunctors ==5.5.15,
bifunctors +semigroups +tagged,
any.binary ==0.8.8.0,
Expand All @@ -66,12 +67,10 @@ constraints: any.Cabal ==3.4.0.0,
cassava -bytestring--lt-0_10_4,
any.cereal ==0.5.8.3,
cereal -bytestring-builder,
any.charset ==0.3.9,
any.cipher-aes ==0.2.11,
cipher-aes +support_aesni,
any.clientsession ==0.9.1.2,
any.charset ==0.3.10,
any.clientsession ==0.9.2.0,
clientsession -test,
any.clock ==0.8.3,
any.clock ==0.8.4,
clock -llvm,
any.cmdargs ==0.10.22,
cmdargs +quotation -testprog,
Expand All @@ -85,22 +84,21 @@ constraints: any.Cabal ==3.4.0.0,
any.contravariant ==1.5.5,
contravariant +semigroups +statevar +tagged,
any.cookie ==0.4.6,
any.cprng-aes ==0.6.1,
any.criterion ==1.6.1.0,
any.criterion ==1.6.3.0,
criterion -embed-data-files -fast,
any.criterion-measurement ==0.2.1.0,
criterion-measurement -fast,
any.crypto-api ==0.13.3,
crypto-api -all_cpolys,
any.crypto-cipher-types ==0.0.9,
any.crypto-random ==0.0.9,
any.crypton ==0.31,
any.crypton ==0.33,
crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes,
any.crypton-connection ==0.3.1,
any.crypton-x509 ==1.7.6,
any.crypton-x509-store ==1.6.9,
any.crypton-x509-system ==1.6.7,
any.crypton-x509-validation ==1.6.12,
any.cryptonite ==0.30,
cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes,
any.css-text ==0.1.3.0,
any.data-array-byte ==0.1.0.1,
any.data-default ==0.7.1.1,
Expand All @@ -118,16 +116,16 @@ constraints: any.Cabal ==3.4.0.0,
any.dlist ==1.0,
dlist -werror,
any.easy-file ==0.2.5,
any.email-validate ==2.3.2.18,
any.email-validate ==2.3.2.19,
any.entropy ==0.4.1.10,
entropy -donotgetentropy,
any.errors ==2.3.0,
any.exceptions ==0.10.4,
any.fail ==4.9.0.0,
any.fast-logger ==3.2.1,
any.fast-logger ==3.2.2,
any.file-embed ==0.0.15.0,
any.filepath ==1.4.2.1,
any.foldl ==1.4.14,
any.foldl ==1.4.15,
any.free ==5.2,
any.generics-sop ==0.5.1.3,
any.ghc-bignum ==1.0,
Expand All @@ -150,30 +148,30 @@ constraints: any.Cabal ==3.4.0.0,
any.hourglass ==0.2.12,
any.hsc2hs ==0.68.9,
hsc2hs -in-ghc-tree,
any.hspec ==2.11.1,
any.hspec-core ==2.11.1,
any.hspec-discover ==2.11.1,
any.hspec-expectations ==0.8.3,
any.hspec ==2.11.4,
any.hspec-core ==2.11.4,
any.hspec-discover ==2.11.4,
any.hspec-expectations ==0.8.4,
any.http-api-data ==0.5.1,
http-api-data -use-text-show,
any.http-client ==0.7.13.1,
http-client +network-uri,
any.http-client-tls ==0.3.6.2,
any.http-conduit ==2.3.8.1,
any.http-conduit ==2.3.8.3,
http-conduit +aeson,
any.http-date ==0.0.11,
any.http-media ==0.8.0.0,
any.http-types ==0.12.3,
any.http2 ==4.1.3,
any.http2 ==4.1.4,
http2 -devel -h2spec,
any.indexed-profunctors ==0.1.1,
any.indexed-profunctors ==0.1.1.1,
any.indexed-traversable ==0.1.2.1,
any.indexed-traversable-instances ==0.1.1.2,
any.insert-ordered-containers ==0.2.5.2,
any.insert-ordered-containers ==0.2.5.3,
any.integer-gmp ==1.1,
any.integer-logarithms ==1.0.3.1,
integer-logarithms -check-bounds +integer-gmp,
any.invariant ==0.6.1,
any.invariant ==0.6.2,
any.iproute ==1.7.12,
any.js-chart ==2.9.4.1,
any.kan-extensions ==5.2.5,
Expand All @@ -188,7 +186,7 @@ constraints: any.Cabal ==3.4.0.0,
any.managed ==1.0.10,
any.math-functions ==0.3.4.2,
math-functions +system-erf +system-expm1,
any.megaparsec ==9.3.1,
any.megaparsec ==9.4.1,
megaparsec -dev,
any.memory ==0.17.0,
memory +support_bytestring +support_deepseq,
Expand All @@ -215,14 +213,14 @@ constraints: any.Cabal ==3.4.0.0,
any.network-uri ==2.6.4.2,
any.old-locale ==1.0.0.7,
any.old-time ==1.1.0.3,
any.optics-core ==0.4.1,
any.optics-core ==0.4.1.1,
optics-core -explicit-generic-labels,
any.optics-extra ==0.4.2.1,
any.optics-th ==0.4.1,
any.optional-args ==1.0.2,
any.optparse-applicative ==0.17.1.0,
any.optparse-applicative ==0.18.1.0,
optparse-applicative +process,
any.optparse-generic ==1.5.0,
any.optparse-generic ==1.5.1,
any.parallel ==3.2.2.0,
any.parameterized ==0.5.0.0,
any.parsec ==3.1.14.0,
Expand All @@ -235,7 +233,7 @@ constraints: any.Cabal ==3.4.0.0,
any.pcre-light ==0.4.1.0,
pcre-light -old_base -use-pkg-config,
any.pem ==0.2.4,
any.persistent ==2.14.5.0,
any.persistent ==2.14.5.1,
any.persistent-mysql ==2.13.1.4,
any.persistent-postgresql ==2.13.5.2,
any.persistent-qq ==2.12.0.5,
Expand All @@ -246,14 +244,18 @@ constraints: any.Cabal ==3.4.0.0,
any.pretty ==1.1.3.6,
any.pretty-hex ==1.1,
any.pretty-show ==1.10,
any.prettyprinter ==1.7.1,
prettyprinter -buildreadme +text,
any.prettyprinter-ansi-terminal ==1.1.3,
any.prettyprinter-compat-ansi-wl-pprint ==1.0.2,
any.primitive ==0.7.4.0,
any.process ==1.6.11.0,
any.profunctors ==5.6.2,
any.proto-lens ==0.7.1.3,
any.proto-lens-runtime ==0.7.0.4,
any.proto3-suite ==0.5.1,
proto3-suite -dhall +swagger -swagger-wrapper-format,
any.proto3-wire ==1.4.0,
any.proto3-suite ==0.6.0,
proto3-suite -dhall -large-records +swagger -swagger-wrapper-format,
any.proto3-wire ==1.4.1,
any.psqueues ==0.2.7.3,
any.quickcheck-instances ==0.3.29.1,
quickcheck-instances -bytestring-builder,
Expand All @@ -269,11 +271,10 @@ constraints: any.Cabal ==3.4.0.0,
any.resourcet ==1.3.0,
any.rts ==1.0,
any.safe ==0.3.19,
any.safe-exceptions ==0.1.7.3,
any.safe-exceptions ==0.1.7.4,
any.scanner ==0.3.1,
any.scientific ==0.3.7.0,
scientific -bytestring-builder -integer-simple,
any.securemem ==0.1.10,
any.semialign ==1.2.0.1,
semialign +semigroupoids,
any.semigroupoids ==5.3.7,
Expand All @@ -284,7 +285,7 @@ constraints: any.Cabal ==3.4.0.0,
any.shakespeare ==2.1.0,
shakespeare -test_coffee -test_export -test_roy,
any.silently ==1.2.5.3,
any.simple-sendfile ==0.2.31,
any.simple-sendfile ==0.2.32,
simple-sendfile +allow-bsd -fallback,
any.skein ==1.0.9.4,
skein -big-endian -force-endianness -reference,
Expand All @@ -302,9 +303,9 @@ constraints: any.Cabal ==3.4.0.0,
strict +assoc,
any.string-conversions ==0.4.0.1,
any.swagger2 ==2.7,
any.syb ==0.7.2.3,
any.syb ==0.7.2.4,
any.system-filepath ==0.4.14,
any.tagged ==0.8.7,
any.tagged ==0.8.8,
tagged +deepseq +transformers,
any.tagsoup ==0.14.8,
any.template-haskell ==2.17.0.0,
Expand All @@ -316,7 +317,7 @@ constraints: any.Cabal ==3.4.0.0,
any.th-abstraction ==0.4.5.0,
any.th-compat ==0.1.4,
any.th-expand-syns ==0.4.11.0,
any.th-lift ==0.8.3,
any.th-lift ==0.8.4,
any.th-lift-instances ==0.1.20,
any.th-orphans ==0.13.14,
any.th-reify-many ==0.1.10,
Expand All @@ -328,7 +329,7 @@ constraints: any.Cabal ==3.4.0.0,
any.time-compat ==1.9.6.1,
time-compat -old-locale,
any.time-manager ==0.0.0,
any.tls ==1.7.0,
any.tls ==1.7.1,
tls +compat -hans +network,
any.transformers ==0.5.6.2,
any.transformers-base ==0.4.6,
Expand All @@ -342,8 +343,8 @@ constraints: any.Cabal ==3.4.0.0,
any.unix ==2.7.2.2,
any.unix-compat ==0.7,
unix-compat -old-time,
any.unix-time ==0.4.9,
any.unliftio ==0.2.24.0,
any.unix-time ==0.4.10,
any.unliftio ==0.2.25.0,
any.unliftio-core ==0.2.1.0,
any.unordered-containers ==0.2.19.1,
unordered-containers -debug,
Expand All @@ -364,16 +365,16 @@ constraints: any.Cabal ==3.4.0.0,
any.wai-extra ==3.1.13.0,
wai-extra -build-example,
any.wai-logger ==2.4.0,
any.warp ==3.3.26,
any.warp ==3.3.28,
warp +allow-sendfilefd -network-bytestring -warp-debug +x509,
any.witherable ==0.4.2,
any.word-compat ==0.0.6,
any.word8 ==0.1.3,
any.xss-sanitize ==0.3.7.2,
any.yesod-core ==1.6.24.2,
any.yesod-core ==1.6.24.4,
any.yesod-form ==1.7.4,
yesod-form +network-uri,
any.yesod-persistent ==1.6.0.8,
any.zlib ==0.6.3.0,
zlib -bundled-c-zlib -non-blocking-ffi -pkg-config
index-state: hackage.haskell.org 2023-06-07T02:46:00Z
index-state: hackage.haskell.org 2023-08-09T22:19:16Z
5 changes: 4 additions & 1 deletion examples/grpc-echo/Setup.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Data.List (intercalate, intersperse, isPrefixOf, replicate, stripPrefix)
import Distribution.Simple (Args, UserHooks (preBuild), defaultMainWithHooks, simpleUserHooks)
import Distribution.Simple.Setup (BuildFlags)
import Distribution.Types.HookedBuildInfo (HookedBuildInfo, emptyHookedBuildInfo)
import Proto3.Suite.DotProto.Generate (CompileArgs (..), compileDotProtoFileOrDie)
import Proto3.Suite.DotProto.Generate (CompileArgs (..), IsPrefixed (IsPrefixed), RecordStyle (RegularRecords), StringType (StringType), compileDotProtoFileOrDie)
import System.IO (
Handle,
IOMode (ReadMode),
Expand Down Expand Up @@ -37,6 +37,9 @@ compileProto _ _ = do
, extraInstanceFiles = []
, inputProto = "echo.proto"
, outputDir = "gen"
, stringType = StringType "Data.Text.Lazy" "Text"
, recordStyle = RegularRecords
, isPrefixed = IsPrefixed True
}
compileDotProtoFileOrDie compileArgs
pure emptyHookedBuildInfo
1 change: 1 addition & 0 deletions instrumentation/grpc-haskell/hs-opentelemetry-instrumentation-grpc-haskell.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,5 @@ library
grpc-haskell,
grpc-haskell-core,
http-types,
proto3-suite,
text
Loading

0 comments on commit 1a2131a

Please sign in to comment.