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

Fix gRPC-haskell Jenkins build (#64)

Browse source 
We now have Jenkins enabled for `gRPC-haskell` which verifies that
`nix-build release.nix` passes for each pull request.

`master` currently doesn't build, and this is the first pull request to fix the
build by adding the recently introduced `sorted-list` dependency to the `nix`
build.  This was done by running `cabal2nix . > default.nix` and also adding a
newer version of `sorted-list` to the `release.nix` file.  `nixos-16.03`
uses an older version of `sorted-list` which doesn't have an `IsList` instance for
`SortedList`.
This commit is contained in:
Gabriel Gonzalez 2016-08-03 11:47:52 -07:00
parent f3ecb06194
commit f9f59f2362
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
default.nix
View file

@ -1,7 +1,7 @@
{ mkDerivation, async, base, bytestring, c2hs, clock, containers { mkDerivation, async, base, bytestring, c2hs, clock, containers
, grpc, managed, pipes, proto3-wire, protobuf-wire, random, safe , grpc, managed, pipes, proto3-wire, protobuf-wire, random, safe
, stdenv, stm, tasty, tasty-hunit, text, time, transformers, turtle , sorted-list, stdenv, stm, tasty, tasty-hunit, tasty-quickcheck
, unix, vector , text, time, transformers, turtle, unix, vector
}: }:
mkDerivation { mkDerivation {
pname = "grpc-haskell"; pname = "grpc-haskell";
@ -11,7 +11,8 @@ mkDerivation {
isExecutable = true; isExecutable = true;
libraryHaskellDepends = [ libraryHaskellDepends = [
async base bytestring clock containers managed pipes proto3-wire async base bytestring clock containers managed pipes proto3-wire
protobuf-wire safe stm tasty tasty-hunit transformers vector protobuf-wire safe sorted-list stm tasty tasty-hunit transformers
vector
]; ];
librarySystemDepends = [ grpc ]; librarySystemDepends = [ grpc ];
libraryToolDepends = [ c2hs ]; libraryToolDepends = [ c2hs ];
@ -21,7 +22,8 @@ mkDerivation {
]; ];
testHaskellDepends = [ testHaskellDepends = [
async base bytestring clock containers managed pipes protobuf-wire async base bytestring clock containers managed pipes protobuf-wire
safe tasty tasty-hunit text time transformers turtle unix safe tasty tasty-hunit tasty-quickcheck text time transformers
turtle unix
]; ];
homepage = "http://github.com/aloiscochard/grpc-haskell"; homepage = "http://github.com/aloiscochard/grpc-haskell";
description = "Haskell implementation of gRPC layered on shared C library"; description = "Haskell implementation of gRPC layered on shared C library";

12
release.nix
View file

@ -74,6 +74,18 @@ let
grpc-haskell = grpc-haskell =
haskellPackagesNew.callPackage ./default.nix { }; haskellPackagesNew.callPackage ./default.nix { };
sorted-list = haskellPackagesNew.callPackage
({ mkDerivation, base, deepseq }:
mkDerivation {
pname = "sorted-list";
version = "0.2.0.0";
sha256 = "cc52c787b056f4d3a9ecc59f06701695602558a4233042ff8f613cdd4985d138";
libraryHaskellDepends = [ base deepseq ];
homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
description = "Type-enforced sorted lists and related functions";
license = pkgs.stdenv.lib.licenses.bsd3;
}) {};
}; };
}; };
}; };