Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit 112db60

Browse files
authored
Merge pull request #3477 from input-output-hk/adiemand/CBR-207/introduce-katip-cold
[CBR-207] introduce 'katip' - needed for PR #3481
2 parents beae68f + cd6fec9 commit 112db60

File tree

11 files changed

+1535
-21
lines changed

11 files changed

+1535
-21
lines changed

pkgs/default.nix

Lines changed: 95 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -489,8 +489,8 @@ license = stdenv.lib.licenses.bsd3;
489489
mkDerivation {
490490

491491
pname = "Chart-diagrams";
492-
version = "1.8.2";
493-
sha256 = "ca181dec04bac1029101dd75951f48710ebc42f5333e06c57943e3245bba9f41";
492+
version = "1.8.3";
493+
sha256 = "beed1e3d4ef96be26921d058bc8d3510641514eb3c4539258e8ecf1efabc3adc";
494494
enableSeparateDataOutput = true;
495495
libraryHaskellDepends = [
496496
base
@@ -17340,6 +17340,7 @@ license = stdenv.lib.licenses.mit;
1734017340
, hashable
1734117341
, hedgehog
1734217342
, hspec
17343+
, katip
1734317344
, lens
1734417345
, log-warper
1734517346
, lrucache
@@ -17367,6 +17368,7 @@ license = stdenv.lib.licenses.mit;
1736717368
, universum
1736817369
, unliftio-core
1736917370
, unordered-containers
17371+
, yaml
1737017372
}:
1737117373
mkDerivation {
1737217374

@@ -17396,6 +17398,7 @@ file-embed
1739617398
filepath
1739717399
formatting
1739817400
hashable
17401+
katip
1739917402
lens
1740017403
log-warper
1740117404
lrucache
@@ -17419,6 +17422,7 @@ transformers-lift
1741917422
universum
1742017423
unliftio-core
1742117424
unordered-containers
17425+
yaml
1742217426
];
1742317427
libraryToolDepends = [
1742417428
cpphs
@@ -17449,6 +17453,7 @@ testToolDepends = [
1744917453
cpphs
1745017454
];
1745117455
doHaddock = false;
17456+
homepage = "https://github.com/input-output-hk/cardano-sl";
1745217457
description = "Cardano SL - general utilities";
1745317458
license = stdenv.lib.licenses.mit;
1745417459

@@ -25050,10 +25055,10 @@ license = stdenv.lib.licenses.bsd3;
2505025055
mkDerivation {
2505125056

2505225057
pname = "diagrams-lib";
25053-
version = "1.4.2";
25054-
sha256 = "e9d41742ed3a92b9dff847c3936746e5a95cc4e187b7e4c35c3e3068c842afe5";
25055-
revision = "1";
25056-
editedCabalFile = "0vz16br2gn4agi35k92qw84cja2dqj63g7q3ak64jhc8r99bd4a1";
25058+
version = "1.4.2.2";
25059+
sha256 = "470bbb94e942c173afae9837723dc151b627cc15e81aebfa22c88622a60bd6e5";
25060+
revision = "3";
25061+
editedCabalFile = "033w27x3w0s567hsifb7nxc1msv9fvzz8idl88n8d5pifpgxg803";
2505725062
libraryHaskellDepends = [
2505825063
active
2505925064
adjunctions
@@ -25105,7 +25110,6 @@ license = stdenv.lib.licenses.bsd3;
2510525110
, diagrams-core
2510625111
, diagrams-lib
2510725112
, dlist
25108-
, filepath
2510925113
, hashable
2511025114
, lens
2511125115
, monoid-extras
@@ -25118,18 +25122,17 @@ license = stdenv.lib.licenses.bsd3;
2511825122
mkDerivation {
2511925123

2512025124
pname = "diagrams-postscript";
25121-
version = "1.4";
25122-
sha256 = "fe58f0010520716f66802adb0c1f70f48e77e9c4fcea5441e5343f4c1a5f8db4";
25125+
version = "1.4.1";
25126+
sha256 = "a758191d99c30bd663dc0df2dedef13cd735a33c143e77906aa88baceb282c9c";
2512325127
revision = "1";
25124-
editedCabalFile = "0vmiv3b74nml0ahb7dicq0m0vz2lahzfapln9aby0jb2saa0sf58";
25128+
editedCabalFile = "0z0rh7lwyr3vx6llq6q9s5f1vzqk4zxpcg5ibfn5jdp274kfd7r1";
2512525129
libraryHaskellDepends = [
2512625130
base
2512725131
containers
2512825132
data-default-class
2512925133
diagrams-core
2513025134
diagrams-lib
2513125135
dlist
25132-
filepath
2513325136
hashable
2513425137
lens
2513525138
monoid-extras
@@ -25194,8 +25197,10 @@ license = stdenv.lib.licenses.bsd3;
2519425197
mkDerivation {
2519525198

2519625199
pname = "diagrams-svg";
25197-
version = "1.4.1.1";
25198-
sha256 = "c80668c6ac1bf62b108016d36bfe3e603897ca8e331522b0e80b77152915daaa";
25200+
version = "1.4.2";
25201+
sha256 = "5455b68d92826a5405d51490976870cc0fa5b8b56aef0a8f56982b5f48efded2";
25202+
revision = "1";
25203+
editedCabalFile = "1mb2fdfvy0c1v7nahspq2cisfqrn37xjh4a6xhqr3b36pfz8rwnd";
2519925204
libraryHaskellDepends = [
2520025205
base
2520125206
base64-bytestring
@@ -29996,8 +30001,8 @@ license = stdenv.lib.licenses.bsd3;
2999630001
mkDerivation {
2999730002

2999830003
pname = "fgl";
29999-
version = "5.6.0.0";
30000-
sha256 = "94722e1eb3dca66069e26a2d4b072c558bc896816ee016fc99521f3e16b9ccc4";
30004+
version = "5.5.4.0";
30005+
sha256 = "5176891dc0a898a87df53e1b27db5eba7474f08207405a1ea06c988c09a97211";
3000130006
libraryHaskellDepends = [
3000230007
array
3000330008
base
@@ -47802,6 +47807,81 @@ homepage = "https://github.com/fosskers/kanji";
4780247807
description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
4780347808
license = stdenv.lib.licenses.bsd3;
4780447809

47810+
}) {};
47811+
"katip" = callPackage
47812+
({
47813+
mkDerivation
47814+
, aeson
47815+
, async
47816+
, auto-update
47817+
, base
47818+
, bytestring
47819+
, containers
47820+
, either
47821+
, hostname
47822+
, microlens
47823+
, microlens-th
47824+
, monad-control
47825+
, mtl
47826+
, old-locale
47827+
, resourcet
47828+
, safe-exceptions
47829+
, scientific
47830+
, semigroups
47831+
, stdenv
47832+
, stm
47833+
, string-conv
47834+
, template-haskell
47835+
, text
47836+
, time
47837+
, transformers
47838+
, transformers-base
47839+
, transformers-compat
47840+
, unix
47841+
, unliftio-core
47842+
, unordered-containers
47843+
}:
47844+
mkDerivation {
47845+
47846+
pname = "katip";
47847+
version = "0.5.5.1";
47848+
sha256 = "0b0c5b66fda945ea56522724aadb25980d5d1cac83999b45c6a11b9ba59ce260";
47849+
libraryHaskellDepends = [
47850+
aeson
47851+
async
47852+
auto-update
47853+
base
47854+
bytestring
47855+
containers
47856+
either
47857+
hostname
47858+
microlens
47859+
microlens-th
47860+
monad-control
47861+
mtl
47862+
old-locale
47863+
resourcet
47864+
safe-exceptions
47865+
scientific
47866+
semigroups
47867+
stm
47868+
string-conv
47869+
template-haskell
47870+
text
47871+
time
47872+
transformers
47873+
transformers-base
47874+
transformers-compat
47875+
unix
47876+
unliftio-core
47877+
unordered-containers
47878+
];
47879+
doHaddock = false;
47880+
doCheck = false;
47881+
homepage = "https://github.com/Soostone/katip";
47882+
description = "A structured logging framework";
47883+
license = stdenv.lib.licenses.bsd3;
47884+
4780547885
}) {};
4780647886
"katydid" = callPackage
4780747887
({

stack.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ extra-deps:
243243
# Good bug fixes in here.
244244
- criterion-1.4.0.0
245245

246+
- katip-0.5.5.1
246247
# Fix for a space leak: https://github.com/chrisdone/formatting/pull/44
247248
- formatting-6.3.6
248249

@@ -255,15 +256,16 @@ extra-deps:
255256
- hspec-discover-2.5.1
256257

257258
# Graphics stuff not found on stackage.
258-
- Chart-diagrams-1.8.2
259+
- Chart-diagrams-1.8.3
259260
- graphviz-2999.19.0.0
260261
- diagrams-core-1.4.1.1
261-
- diagrams-lib-1.4.2
262-
- diagrams-postscript-1.4
263-
- diagrams-svg-1.4.1.1
262+
- diagrams-lib-1.4.2.2
263+
- diagrams-postscript-1.4.1
264+
- diagrams-svg-1.4.2
264265
- diagrams-solve-0.1.1
265266
- SVGFonts-1.6.0.3
266267
- dual-tree-0.2.1
268+
- fgl-5.5.4.0
267269

268270
# Support for wallet's Txmeta tracking
269271
- sqlite-simple-errors-0.6.1.0

0 commit comments

Comments
 (0)