Merge pull request #3477 from input-output-hk/adiemand/CBR-207/introd…

…uce-katip-cold [CBR-207] introduce 'katip' - needed for PR #3481
input-output-hk · Aug 25, 2018 · 112db60 · 112db60
2 parents beae68f + cd6fec9
commit 112db60
Show file tree

Hide file tree

Showing 11 changed files with 1,535 additions and 21 deletions.
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -489,8 +489,8 @@ license = stdenv.lib.licenses.bsd3;
 mkDerivation {
 
 pname = "Chart-diagrams";
-version = "1.8.2";
-sha256 = "ca181dec04bac1029101dd75951f48710ebc42f5333e06c57943e3245bba9f41";
+version = "1.8.3";
+sha256 = "beed1e3d4ef96be26921d058bc8d3510641514eb3c4539258e8ecf1efabc3adc";
 enableSeparateDataOutput = true;
 libraryHaskellDepends = [
 base
@@ -17340,6 +17340,7 @@ license = stdenv.lib.licenses.mit;
 , hashable
 , hedgehog
 , hspec
+, katip
 , lens
 , log-warper
 , lrucache
@@ -17367,6 +17368,7 @@ license = stdenv.lib.licenses.mit;
 , universum
 , unliftio-core
 , unordered-containers
+, yaml
 }:
 mkDerivation {
 
@@ -17396,6 +17398,7 @@ file-embed
 filepath
 formatting
 hashable
+katip
 lens
 log-warper
 lrucache
@@ -17419,6 +17422,7 @@ transformers-lift
 universum
 unliftio-core
 unordered-containers
+yaml
 ];
 libraryToolDepends = [
 cpphs
@@ -17449,6 +17453,7 @@ testToolDepends = [
 cpphs
 ];
 doHaddock = false;
+homepage = "https://github.com/input-output-hk/cardano-sl";
 description = "Cardano SL - general utilities";
 license = stdenv.lib.licenses.mit;
 
@@ -25050,10 +25055,10 @@ license = stdenv.lib.licenses.bsd3;
 mkDerivation {
 
 pname = "diagrams-lib";
-version = "1.4.2";
-sha256 = "e9d41742ed3a92b9dff847c3936746e5a95cc4e187b7e4c35c3e3068c842afe5";
-revision = "1";
-editedCabalFile = "0vz16br2gn4agi35k92qw84cja2dqj63g7q3ak64jhc8r99bd4a1";
+version = "1.4.2.2";
+sha256 = "470bbb94e942c173afae9837723dc151b627cc15e81aebfa22c88622a60bd6e5";
+revision = "3";
+editedCabalFile = "033w27x3w0s567hsifb7nxc1msv9fvzz8idl88n8d5pifpgxg803";
 libraryHaskellDepends = [
 active
 adjunctions
@@ -25105,7 +25110,6 @@ license = stdenv.lib.licenses.bsd3;
 , diagrams-core
 , diagrams-lib
 , dlist
-, filepath
 , hashable
 , lens
 , monoid-extras
@@ -25118,18 +25122,17 @@ license = stdenv.lib.licenses.bsd3;
 mkDerivation {
 
 pname = "diagrams-postscript";
-version = "1.4";
-sha256 = "fe58f0010520716f66802adb0c1f70f48e77e9c4fcea5441e5343f4c1a5f8db4";
+version = "1.4.1";
+sha256 = "a758191d99c30bd663dc0df2dedef13cd735a33c143e77906aa88baceb282c9c";
 revision = "1";
-editedCabalFile = "0vmiv3b74nml0ahb7dicq0m0vz2lahzfapln9aby0jb2saa0sf58";
+editedCabalFile = "0z0rh7lwyr3vx6llq6q9s5f1vzqk4zxpcg5ibfn5jdp274kfd7r1";
 libraryHaskellDepends = [
 base
 containers
 data-default-class
 diagrams-core
 diagrams-lib
 dlist
-filepath
 hashable
 lens
 monoid-extras
@@ -25194,8 +25197,10 @@ license = stdenv.lib.licenses.bsd3;
 mkDerivation {
 
 pname = "diagrams-svg";
-version = "1.4.1.1";
-sha256 = "c80668c6ac1bf62b108016d36bfe3e603897ca8e331522b0e80b77152915daaa";
+version = "1.4.2";
+sha256 = "5455b68d92826a5405d51490976870cc0fa5b8b56aef0a8f56982b5f48efded2";
+revision = "1";
+editedCabalFile = "1mb2fdfvy0c1v7nahspq2cisfqrn37xjh4a6xhqr3b36pfz8rwnd";
 libraryHaskellDepends = [
 base
 base64-bytestring
@@ -29996,8 +30001,8 @@ license = stdenv.lib.licenses.bsd3;
 mkDerivation {
 
 pname = "fgl";
-version = "5.6.0.0";
-sha256 = "94722e1eb3dca66069e26a2d4b072c558bc896816ee016fc99521f3e16b9ccc4";
+version = "5.5.4.0";
+sha256 = "5176891dc0a898a87df53e1b27db5eba7474f08207405a1ea06c988c09a97211";
 libraryHaskellDepends = [
 array
 base
@@ -47802,6 +47807,81 @@ homepage = "https://github.com/fosskers/kanji";
 description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
 license = stdenv.lib.licenses.bsd3;
 
+}) {};
+"katip" = callPackage
+({
+  mkDerivation
+, aeson
+, async
+, auto-update
+, base
+, bytestring
+, containers
+, either
+, hostname
+, microlens
+, microlens-th
+, monad-control
+, mtl
+, old-locale
+, resourcet
+, safe-exceptions
+, scientific
+, semigroups
+, stdenv
+, stm
+, string-conv
+, template-haskell
+, text
+, time
+, transformers
+, transformers-base
+, transformers-compat
+, unix
+, unliftio-core
+, unordered-containers
+}:
+mkDerivation {
+
+pname = "katip";
+version = "0.5.5.1";
+sha256 = "0b0c5b66fda945ea56522724aadb25980d5d1cac83999b45c6a11b9ba59ce260";
+libraryHaskellDepends = [
+aeson
+async
+auto-update
+base
+bytestring
+containers
+either
+hostname
+microlens
+microlens-th
+monad-control
+mtl
+old-locale
+resourcet
+safe-exceptions
+scientific
+semigroups
+stm
+string-conv
+template-haskell
+text
+time
+transformers
+transformers-base
+transformers-compat
+unix
+unliftio-core
+unordered-containers
+];
+doHaddock = false;
+doCheck = false;
+homepage = "https://github.com/Soostone/katip";
+description = "A structured logging framework";
+license = stdenv.lib.licenses.bsd3;
+
 }) {};
 "katydid" = callPackage
 ({

diff --git a/stack.yaml b/stack.yaml
@@ -243,6 +243,7 @@ extra-deps:
 # Good bug fixes in here.
 - criterion-1.4.0.0
 
+- katip-0.5.5.1
 # Fix for a space leak: https://github.com/chrisdone/formatting/pull/44
 - formatting-6.3.6
 
@@ -255,15 +256,16 @@ extra-deps:
 - hspec-discover-2.5.1
 
 # Graphics stuff not found on stackage.
-- Chart-diagrams-1.8.2
+- Chart-diagrams-1.8.3
 - graphviz-2999.19.0.0
 - diagrams-core-1.4.1.1
-- diagrams-lib-1.4.2
-- diagrams-postscript-1.4
-- diagrams-svg-1.4.1.1
+- diagrams-lib-1.4.2.2
+- diagrams-postscript-1.4.1
+- diagrams-svg-1.4.2
 - diagrams-solve-0.1.1
 - SVGFonts-1.6.0.3
 - dual-tree-0.2.1
+- fgl-5.5.4.0
 
 # Support for wallet's Txmeta tracking
 - sqlite-simple-errors-0.6.1.0