eeva
/
gRPC-haskell
mirror of https://github.com/unclechu/gRPC-haskell.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Moritz Kiefer 2019-08-28 09:28:26 +02:00 committed by GitHub
parent 5ceeae74cc
commit 11681ec6b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/grpc-haskell-core.cabal
View File

@ -10,6 +10,9 @@ copyright: Copyright 2016 Awake Networks
category: Network
build-type: Simple
cabal-version: >=1.10
extra-source-files: include/grpc_haskell.h
tests/ssl/localhost.crt
tests/ssl/localhost.key
Flag Debug
Description: Adds debug logging.

4
examples/echo/echo-hs/Echo.hs generated
View File

@ -116,7 +116,7 @@ instance HsJSONPB.ToSchema EchoRequest where
HsJSONPB._namedSchemaSchema =
Hs.mempty{HsJSONPB._schemaParamSchema =
Hs.mempty{HsJSONPB._paramSchemaType =
HsJSONPB.SwaggerObject},
Hs.Just HsJSONPB.SwaggerObject},
HsJSONPB._schemaProperties =
HsJSONPB.insOrdFromList
[("message", echoRequestMessage)]}})
@ -171,7 +171,7 @@ instance HsJSONPB.ToSchema EchoResponse where
HsJSONPB._namedSchemaSchema =
Hs.mempty{HsJSONPB._schemaParamSchema =
Hs.mempty{HsJSONPB._paramSchemaType =
HsJSONPB.SwaggerObject},
Hs.Just HsJSONPB.SwaggerObject},
HsJSONPB._schemaProperties =
HsJSONPB.insOrdFromList
[("message", echoResponseMessage)]}})

4
examples/tutorial/Arithmetic.hs generated
View File

@ -149,7 +149,7 @@ instance HsJSONPB.ToSchema TwoInts where
HsJSONPB._namedSchemaSchema =
Hs.mempty{HsJSONPB._schemaParamSchema =
Hs.mempty{HsJSONPB._paramSchemaType =
HsJSONPB.SwaggerObject},
Hs.Just HsJSONPB.SwaggerObject},
HsJSONPB._schemaProperties =
HsJSONPB.insOrdFromList
[("x", twoIntsX), ("y", twoIntsY)]}})
@ -202,7 +202,7 @@ instance HsJSONPB.ToSchema OneInt where
HsJSONPB._namedSchemaSchema =
Hs.mempty{HsJSONPB._schemaParamSchema =
Hs.mempty{HsJSONPB._paramSchemaType =
HsJSONPB.SwaggerObject},
Hs.Just HsJSONPB.SwaggerObject},
HsJSONPB._schemaProperties =
HsJSONPB.insOrdFromList
[("result", oneIntResult)]}})

4
grpc-haskell.cabal
View File

@ -10,6 +10,10 @@ copyright: Copyright 2016 Awake Networks
category: Network
build-type: Simple
cabal-version: >=1.10
extra-source-files: tests/*.hs
tests/*.proto
tests/*.py
tests/*.sh
Flag Debug
Description: Adds debug logging.

10
release.nix
View File

@ -204,21 +204,21 @@ let
(haskellPackagesNew.callPackage ./nix/proto3-suite.nix {});
grpc-haskell-core =
usesGRPC
pkgs.haskell.lib.buildFromSdist (usesGRPC
(pkgs.haskell.lib.overrideCabal
(haskellPackagesNew.callPackage ./core { })
(_: { buildDepends = [ haskellPackagesNew.c2hs ]; }));
(_: { buildDepends = [ haskellPackagesNew.c2hs ]; })));
grpc-haskell-no-tests =
usesGRPC
pkgs.haskell.lib.buildFromSdist (usesGRPC
(pkgs.haskell.lib.dontCheck
(haskellPackagesNew.callPackage ./default.nix { })
);
));
grpc-haskell =
usesGRPC
(pkgs.haskell.lib.overrideCabal
(haskellPackagesNew.callPackage ./default.nix { })
(pkgs.haskell.lib.buildFromSdist ((haskellPackagesNew.callPackage ./default.nix { })))
(oldDerivation:
let
ghc =