mirror of
https://github.com/unclechu/gRPC-haskell.git
synced 2024-11-23 03:29:42 +01:00
Fix sdist tarballs (#88)
A bunch of files have been missing from the tarballs created by `cabal sdist`. I’ve changed the nix config to check for this and also found some examples that I forgot to update in a previous PR (sorry about that).
This commit is contained in:
parent
5ceeae74cc
commit
11681ec6b9
5 changed files with 16 additions and 9 deletions
|
@ -10,6 +10,9 @@ copyright: Copyright 2016 Awake Networks
|
||||||
category: Network
|
category: Network
|
||||||
build-type: Simple
|
build-type: Simple
|
||||||
cabal-version: >=1.10
|
cabal-version: >=1.10
|
||||||
|
extra-source-files: include/grpc_haskell.h
|
||||||
|
tests/ssl/localhost.crt
|
||||||
|
tests/ssl/localhost.key
|
||||||
|
|
||||||
Flag Debug
|
Flag Debug
|
||||||
Description: Adds debug logging.
|
Description: Adds debug logging.
|
||||||
|
|
4
examples/echo/echo-hs/Echo.hs
generated
4
examples/echo/echo-hs/Echo.hs
generated
|
@ -116,7 +116,7 @@ instance HsJSONPB.ToSchema EchoRequest where
|
||||||
HsJSONPB._namedSchemaSchema =
|
HsJSONPB._namedSchemaSchema =
|
||||||
Hs.mempty{HsJSONPB._schemaParamSchema =
|
Hs.mempty{HsJSONPB._schemaParamSchema =
|
||||||
Hs.mempty{HsJSONPB._paramSchemaType =
|
Hs.mempty{HsJSONPB._paramSchemaType =
|
||||||
HsJSONPB.SwaggerObject},
|
Hs.Just HsJSONPB.SwaggerObject},
|
||||||
HsJSONPB._schemaProperties =
|
HsJSONPB._schemaProperties =
|
||||||
HsJSONPB.insOrdFromList
|
HsJSONPB.insOrdFromList
|
||||||
[("message", echoRequestMessage)]}})
|
[("message", echoRequestMessage)]}})
|
||||||
|
@ -171,7 +171,7 @@ instance HsJSONPB.ToSchema EchoResponse where
|
||||||
HsJSONPB._namedSchemaSchema =
|
HsJSONPB._namedSchemaSchema =
|
||||||
Hs.mempty{HsJSONPB._schemaParamSchema =
|
Hs.mempty{HsJSONPB._schemaParamSchema =
|
||||||
Hs.mempty{HsJSONPB._paramSchemaType =
|
Hs.mempty{HsJSONPB._paramSchemaType =
|
||||||
HsJSONPB.SwaggerObject},
|
Hs.Just HsJSONPB.SwaggerObject},
|
||||||
HsJSONPB._schemaProperties =
|
HsJSONPB._schemaProperties =
|
||||||
HsJSONPB.insOrdFromList
|
HsJSONPB.insOrdFromList
|
||||||
[("message", echoResponseMessage)]}})
|
[("message", echoResponseMessage)]}})
|
||||||
|
|
4
examples/tutorial/Arithmetic.hs
generated
4
examples/tutorial/Arithmetic.hs
generated
|
@ -149,7 +149,7 @@ instance HsJSONPB.ToSchema TwoInts where
|
||||||
HsJSONPB._namedSchemaSchema =
|
HsJSONPB._namedSchemaSchema =
|
||||||
Hs.mempty{HsJSONPB._schemaParamSchema =
|
Hs.mempty{HsJSONPB._schemaParamSchema =
|
||||||
Hs.mempty{HsJSONPB._paramSchemaType =
|
Hs.mempty{HsJSONPB._paramSchemaType =
|
||||||
HsJSONPB.SwaggerObject},
|
Hs.Just HsJSONPB.SwaggerObject},
|
||||||
HsJSONPB._schemaProperties =
|
HsJSONPB._schemaProperties =
|
||||||
HsJSONPB.insOrdFromList
|
HsJSONPB.insOrdFromList
|
||||||
[("x", twoIntsX), ("y", twoIntsY)]}})
|
[("x", twoIntsX), ("y", twoIntsY)]}})
|
||||||
|
@ -202,7 +202,7 @@ instance HsJSONPB.ToSchema OneInt where
|
||||||
HsJSONPB._namedSchemaSchema =
|
HsJSONPB._namedSchemaSchema =
|
||||||
Hs.mempty{HsJSONPB._schemaParamSchema =
|
Hs.mempty{HsJSONPB._schemaParamSchema =
|
||||||
Hs.mempty{HsJSONPB._paramSchemaType =
|
Hs.mempty{HsJSONPB._paramSchemaType =
|
||||||
HsJSONPB.SwaggerObject},
|
Hs.Just HsJSONPB.SwaggerObject},
|
||||||
HsJSONPB._schemaProperties =
|
HsJSONPB._schemaProperties =
|
||||||
HsJSONPB.insOrdFromList
|
HsJSONPB.insOrdFromList
|
||||||
[("result", oneIntResult)]}})
|
[("result", oneIntResult)]}})
|
||||||
|
|
|
@ -10,6 +10,10 @@ copyright: Copyright 2016 Awake Networks
|
||||||
category: Network
|
category: Network
|
||||||
build-type: Simple
|
build-type: Simple
|
||||||
cabal-version: >=1.10
|
cabal-version: >=1.10
|
||||||
|
extra-source-files: tests/*.hs
|
||||||
|
tests/*.proto
|
||||||
|
tests/*.py
|
||||||
|
tests/*.sh
|
||||||
|
|
||||||
Flag Debug
|
Flag Debug
|
||||||
Description: Adds debug logging.
|
Description: Adds debug logging.
|
||||||
|
|
10
release.nix
10
release.nix
|
@ -204,21 +204,21 @@ let
|
||||||
(haskellPackagesNew.callPackage ./nix/proto3-suite.nix {});
|
(haskellPackagesNew.callPackage ./nix/proto3-suite.nix {});
|
||||||
|
|
||||||
grpc-haskell-core =
|
grpc-haskell-core =
|
||||||
usesGRPC
|
pkgs.haskell.lib.buildFromSdist (usesGRPC
|
||||||
(pkgs.haskell.lib.overrideCabal
|
(pkgs.haskell.lib.overrideCabal
|
||||||
(haskellPackagesNew.callPackage ./core { })
|
(haskellPackagesNew.callPackage ./core { })
|
||||||
(_: { buildDepends = [ haskellPackagesNew.c2hs ]; }));
|
(_: { buildDepends = [ haskellPackagesNew.c2hs ]; })));
|
||||||
|
|
||||||
grpc-haskell-no-tests =
|
grpc-haskell-no-tests =
|
||||||
usesGRPC
|
pkgs.haskell.lib.buildFromSdist (usesGRPC
|
||||||
(pkgs.haskell.lib.dontCheck
|
(pkgs.haskell.lib.dontCheck
|
||||||
(haskellPackagesNew.callPackage ./default.nix { })
|
(haskellPackagesNew.callPackage ./default.nix { })
|
||||||
);
|
));
|
||||||
|
|
||||||
grpc-haskell =
|
grpc-haskell =
|
||||||
usesGRPC
|
usesGRPC
|
||||||
(pkgs.haskell.lib.overrideCabal
|
(pkgs.haskell.lib.overrideCabal
|
||||||
(haskellPackagesNew.callPackage ./default.nix { })
|
(pkgs.haskell.lib.buildFromSdist ((haskellPackagesNew.callPackage ./default.nix { })))
|
||||||
(oldDerivation:
|
(oldDerivation:
|
||||||
let
|
let
|
||||||
ghc =
|
ghc =
|
||||||
|
|
Loading…
Reference in a new issue