From f9f59f23626b08a0b7d1c39f8beea0370696fa5d Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <gabriel@awakenetworks.com>
Date: Wed, 3 Aug 2016 11:47:52 -0700
Subject: [PATCH] Fix `gRPC-haskell` Jenkins build (#64)

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`.
---
 default.nix | 10 ++++++----
 release.nix | 12 ++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index 0c9cc46..9043cbe 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, async, base, bytestring, c2hs, clock, containers
 , grpc, managed, pipes, proto3-wire, protobuf-wire, random, safe
-, stdenv, stm, tasty, tasty-hunit, text, time, transformers, turtle
-, unix, vector
+, sorted-list, stdenv, stm, tasty, tasty-hunit, tasty-quickcheck
+, text, time, transformers, turtle, unix, vector
 }:
 mkDerivation {
   pname = "grpc-haskell";
@@ -11,7 +11,8 @@ mkDerivation {
   isExecutable = true;
   libraryHaskellDepends = [
     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 ];
   libraryToolDepends = [ c2hs ];
@@ -21,7 +22,8 @@ mkDerivation {
   ];
   testHaskellDepends = [
     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";
   description = "Haskell implementation of gRPC layered on shared C library";
diff --git a/release.nix b/release.nix
index 9da533d..a76e8b8 100644
--- a/release.nix
+++ b/release.nix
@@ -74,6 +74,18 @@ let
 
           grpc-haskell =
             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;
+             }) {};
         };
       };
     };