eeva/gRPC-haskell
1
0
Fork 0
mirror of https://github.com/unclechu/gRPC-haskell.git synced 2024-11-30 06:59:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'gabriel/17_09' into gabriel/wip

Browse source
This commit is contained in:
Gabriel Gonzalez 2018-01-26 10:33:47 -08:00
commit 46fe8490b8
4 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/tests/LowLevelTests.hs
View file

@ -22,6 +22,7 @@ import Data.List (find)
import qualified Data.Map.Strict as M import qualified Data.Map.Strict as M
import qualified Data.Set as S import qualified Data.Set as S
import GHC.Exts (fromList, toList) import GHC.Exts (fromList, toList)
import Network.GRPC.Unsafe.ChannelArgs (Arg(..))
import Network.GRPC.LowLevel import Network.GRPC.LowLevel
import qualified Network.GRPC.LowLevel.Call.Unregistered as U import qualified Network.GRPC.LowLevel.Call.Unregistered as U
import qualified Network.GRPC.LowLevel.Client.Unregistered as U import qualified Network.GRPC.LowLevel.Client.Unregistered as U

23
nix/grpc.nix
View file

@ -1,4 +1,5 @@
{ pkgs, stdenv, lib, fetchgit, autoconf, automake, libtool, which, zlib, openssl { darwin, stdenv, lib, fetchgit, autoconf, automake, libtool, which, zlib
, openssl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,9 +11,19 @@ stdenv.mkDerivation rec {
url = "https://github.com/grpc/grpc.git"; url = "https://github.com/grpc/grpc.git";
sha256 = "19ldbjlnbc287hkaylsigm8w9fai2bjdbfxk6315kl75cq54iprr"; sha256 = "19ldbjlnbc287hkaylsigm8w9fai2bjdbfxk6315kl75cq54iprr";
}; };
# `grpc`'s `Makefile` does some magic to detect the correct `ld` and `strip`
# to use along with their flags, too. If Nix supplies `$LD` and `$STRIP` then
# this auto-detection fails and the build fails, which is why we unset the
# environment variables here and let the `Makefile` set them.
preBuild = ''
unset LD
unset STRIP
'';
preInstall = "export prefix"; preInstall = "export prefix";
buildInputs =
(if stdenv.isDarwin then [ pkgs.darwin.cctools ] else []) ++ [ buildInputs = [
autoconf autoconf
automake automake
libtool libtool
@ -20,4 +31,10 @@ stdenv.mkDerivation rec {
zlib zlib
openssl openssl
]; ];
# Some versions of `ar` (such as the one provided by OS X) require an explicit
# `-r` flag, whereas other versions assume `-r` is the default if no mode is
# specified. For example, OS X requires the `-r` flag, so as a precaution we
# always specify the flag.
AROPTS = "-r";
} }

4
nixpkgs.nix
View file

@ -7,6 +7,6 @@
# The SHA256 will be printed as the last line of stdout. # The SHA256 will be printed as the last line of stdout.
import ./fetch-nixpkgs.nix { import ./fetch-nixpkgs.nix {
rev = "1849e695b00a54cda86cb75202240d949c10c7ce"; rev = "74286ec9e76be7cd00c4247b9acb430c4bd9f1ce";
sha256 = "1riv7n11rqbfdnikr2wm263fcppzh0760kqhwn5gscl89qmliw2y"; sha256 = "0njb3qd2wxj7gil8y61lwh7zacmvr6zklv67w5zmvifi1fvalvdg";
} }

2
release.nix
View file

@ -277,7 +277,7 @@ let
}); });
swagger2 = swagger2 =
pkgs.haskell.lib.dontHaddock (haskellPackagesNew.callPackage ./nix/swagger2.nix { }); pkgs.haskell.lib.dontCheck (pkgs.haskell.lib.dontHaddock (haskellPackagesNew.callPackage ./nix/swagger2.nix { }));
turtle = turtle =
haskellPackagesNew.callPackage ./nix/turtle.nix { }; haskellPackagesNew.callPackage ./nix/turtle.nix { };