From 0ff7b366104676279ebb0863efe67abbdc109247 Mon Sep 17 00:00:00 2001
From: intractable <intractable@gmail.com>
Date: Sat, 9 Sep 2017 11:32:52 -0500
Subject: [PATCH] `proto3-suite` => `281a533` (#33)

* `proto3-suite` => `8bd72bb`

* `proto3-suite` => `5885153`

* Update `stack.yaml`

* `proto3-suite` => `281a533`

* Update `stack.yaml`
---
 nix/aeson.nix        | 32 ++++++++++++++++++++++++++++++++
 nix/proto3-suite.nix | 32 ++++++++++++++++----------------
 release.nix          |  4 ++++
 stack.yaml           |  6 ++++--
 4 files changed, 56 insertions(+), 18 deletions(-)
 create mode 100644 nix/aeson.nix

diff --git a/nix/aeson.nix b/nix/aeson.nix
new file mode 100644
index 0000000..da66e75
--- /dev/null
+++ b/nix/aeson.nix
@@ -0,0 +1,32 @@
+{ mkDerivation, attoparsec, base, base-compat, base-orphans
+, base16-bytestring, bytestring, containers, deepseq, directory
+, dlist, filepath, generic-deriving, ghc-prim, hashable
+, hashable-time, HUnit, integer-logarithms, QuickCheck
+, quickcheck-instances, scientific, stdenv, tagged
+, template-haskell, test-framework, test-framework-hunit
+, test-framework-quickcheck2, text, time, time-locale-compat
+, unordered-containers, uuid-types, vector
+}:
+mkDerivation {
+  pname = "aeson";
+  version = "1.1.1.0";
+  sha256 = "1mkj4a09x9psmgq9sg5nz9va76756zfm97ds2gk2qpgxc7nr2dq8";
+  revision = "2";
+  editedCabalFile = "10bc20f8807990e71f5db74a1b7029f81f888c6f9d1c03e93883555fd1291e84";
+  libraryHaskellDepends = [
+    attoparsec base base-compat bytestring containers deepseq dlist
+    ghc-prim hashable scientific tagged template-haskell text time
+    time-locale-compat unordered-containers uuid-types vector
+  ];
+  testHaskellDepends = [
+    attoparsec base base-compat base-orphans base16-bytestring
+    bytestring containers directory dlist filepath generic-deriving
+    ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
+    quickcheck-instances scientific tagged template-haskell
+    test-framework test-framework-hunit test-framework-quickcheck2 text
+    time time-locale-compat unordered-containers uuid-types vector
+  ];
+  homepage = "https://github.com/bos/aeson";
+  description = "Fast JSON parsing and encoding";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/nix/proto3-suite.nix b/nix/proto3-suite.nix
index f493dd3..0415ba0 100644
--- a/nix/proto3-suite.nix
+++ b/nix/proto3-suite.nix
@@ -1,34 +1,34 @@
-{ mkDerivation, base, bytestring, cereal, containers, deepseq
-, doctest, fetchgit, foldl, haskell-src, lens, mtl
-, neat-interpolation, optparse-generic, parsec, parsers, pretty
-, pretty-show, proto3-wire, QuickCheck, range-set-list, safe
-, semigroups, stdenv, system-filepath, tasty, tasty-hunit
-, tasty-quickcheck, text, transformers, turtle, vector
+{ mkDerivation, aeson, attoparsec, base, base64-bytestring
+, bytestring, cereal, containers, deepseq, doctest, fetchgit, foldl
+, haskell-src, lens, mtl, neat-interpolation, optparse-generic
+, parsec, parsers, pretty, pretty-show, proto3-wire, QuickCheck
+, range-set-list, safe, semigroups, stdenv, system-filepath, tasty
+, tasty-hunit, tasty-quickcheck, text, transformers, turtle, vector
 }:
 mkDerivation {
   pname = "proto3-suite";
   version = "0.1.0.0";
   src = fetchgit {
-    url = "https://github.com/awakesecurity/proto3-suite";
-    sha256 = "1imhijvbliax8n2sz74jwwyb0m6zy8v1xkmixlm6vchwicn2ka3k";
-    rev = "d9d0282978a785385c47642a9a46037e4263a87d";
+    url = "https://github.com/awakesecurity/proto3-suite.git";
+    sha256 = "0fa5jdzzs45p54fxc8prpbrc1ckpa86lsp3lkjdzf5rbhlvpvim3";
+    rev = "281a533df6b1d1cfa369729f2a149374958e78c2";
   };
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
-    base bytestring cereal containers deepseq foldl haskell-src lens
-    mtl neat-interpolation parsec parsers pretty pretty-show
-    proto3-wire QuickCheck safe semigroups system-filepath text
-    transformers turtle vector
+    aeson attoparsec base base64-bytestring bytestring cereal
+    containers deepseq foldl haskell-src lens mtl neat-interpolation
+    parsec parsers pretty pretty-show proto3-wire QuickCheck safe
+    semigroups system-filepath text transformers turtle vector
   ];
   executableHaskellDepends = [
     base containers optparse-generic proto3-wire range-set-list
     system-filepath text turtle
   ];
   testHaskellDepends = [
-    base bytestring cereal doctest pretty-show proto3-wire QuickCheck
-    semigroups tasty tasty-hunit tasty-quickcheck text transformers
-    turtle vector
+    aeson attoparsec base base64-bytestring bytestring cereal doctest
+    pretty-show proto3-wire QuickCheck semigroups tasty tasty-hunit
+    tasty-quickcheck text transformers turtle vector
   ];
   description = "A low level library for writing out data in the Protocol Buffers wire format";
   license = stdenv.lib.licenses.asl20;
diff --git a/release.nix b/release.nix
index 0fb6475..5c56fda 100644
--- a/release.nix
+++ b/release.nix
@@ -175,6 +175,10 @@ let
 
       haskellPackages = pkgs.haskellPackages.override {
         overrides = haskellPackagesNew: haskellPackagesOld: rec {
+          aeson =
+            pkgs.haskell.lib.dontCheck
+              (haskellPackagesNew.callPackage ./nix/aeson.nix {});
+
           optparse-applicative =
             haskellPackagesNew.callPackage ./nix/optparse-applicative.nix { };
 
diff --git a/stack.yaml b/stack.yaml
index 0f1bbec..fd8bfd6 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -9,14 +9,16 @@ packages:
 - '.'
 - location:
     git: git@github.com:awakenetworks/proto3-suite.git
-    commit: d9d0282978a785385c47642a9a46037e4263a87d
+    commit: 281a533df6b1d1cfa369729f2a149374958e78c2
   extra-dep: true
 - location:
     git: git@github.com:awakenetworks/proto3-wire.git
     commit: 077b7e329fd7f43b0628c23b83c5e2e05334002e
   extra-dep: true
 # Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
-extra-deps: [managed-1.0.5]
+extra-deps: [ aeson-1.1.1.0
+            , managed-1.0.5
+            ]
 
 # Override default flag values for local packages and extra-deps
 flags: {}