diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f0b8c3d6316..197f2d7cb75 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -33676,8 +33676,8 @@ self: { }: mkDerivation { pname = "battleplace"; - version = "0.1.0.2"; - sha256 = "0gkchw2dqg3cps5xf88qmmn9mzd7zpws1ngsr3k9lh7krah8a7fc"; + version = "0.1.0.3"; + sha256 = "0kvw69br5nrx4nnrp0r00wr55w15wq5kh68df2r89yrd8l5vp02x"; libraryHaskellDepends = [ aeson base bytestring cereal data-default hashable memory servant text vector @@ -61729,6 +61729,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "df1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , QuickCheck, tasty, tasty-quickcheck, text, time + }: + mkDerivation { + pname = "df1"; + version = "0.1"; + sha256 = "0crcwg63d1m47qj44774ydk9v5sssg08vwbjgh1lg8qvqss7qk8l"; + libraryHaskellDepends = [ + attoparsec base bytestring containers text time + ]; + testHaskellDepends = [ + attoparsec base bytestring QuickCheck tasty tasty-quickcheck text + time + ]; + homepage = "https://github.com/k0001/di"; + description = "Type, render and parse the df1 hierarchical structured log format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dfrac" = callPackage ({ mkDerivation, base, scientific }: mkDerivation { @@ -62053,19 +62073,86 @@ self: { }) {}; "di" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, stm, tasty - , tasty-hunit, tasty-quickcheck, time, transformers + ({ mkDerivation, base, df1, di-core, di-df1, di-handle, di-monad + , exceptions }: mkDerivation { pname = "di"; - version = "0.3"; - sha256 = "1kwkr2lb4vii530sijlrll9nj1k93pixcqk4bn96877bzf5963wj"; - libraryHaskellDepends = [ base stm time transformers ]; - testHaskellDepends = [ - base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck + version = "1.0"; + sha256 = "1bsgq1x4xc1nhfx2wkzmhy3hfy11xkdic35x0lxdc282k2iw7f4i"; + libraryHaskellDepends = [ + base df1 di-core di-df1 di-handle di-monad exceptions ]; homepage = "https://github.com/k0001/di"; - description = "Easy, powerful, structured and typeful logging without monad towers"; + description = "Typeful hierarchical structured logging using di, mtl and df1"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "di-core" = callPackage + ({ mkDerivation, base, containers, exceptions, QuickCheck, stm + , tasty, tasty-hunit, tasty-quickcheck, time + }: + mkDerivation { + pname = "di-core"; + version = "1.0"; + sha256 = "0slggv1c2q8amznf0j38x12v0f4lhg7z7mr0qaayj6v6pkpp5s6j"; + libraryHaskellDepends = [ base containers exceptions stm time ]; + testHaskellDepends = [ + base exceptions QuickCheck stm tasty tasty-hunit tasty-quickcheck + time + ]; + homepage = "https://github.com/k0001/di"; + description = "Typeful hierarchical structured logging without monad towers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "di-df1" = callPackage + ({ mkDerivation, base, bytestring, df1, di-core, di-handle + , di-monad, QuickCheck, stm, tasty, tasty-quickcheck, text, time + }: + mkDerivation { + pname = "di-df1"; + version = "1.0"; + sha256 = "07lz6vb4dxa6j3xxlwxv23gps5xv4rimz571h2n95hhldx8n9jnp"; + libraryHaskellDepends = [ + base df1 di-core di-handle di-monad stm + ]; + testHaskellDepends = [ + base bytestring df1 di-core QuickCheck tasty tasty-quickcheck text + time + ]; + homepage = "https://github.com/k0001/di"; + description = "Write logs in the df1 format using the di logging framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "di-handle" = callPackage + ({ mkDerivation, base, bytestring, di-core, exceptions, unix }: + mkDerivation { + pname = "di-handle"; + version = "1.0"; + sha256 = "1v4jn1dvvfa6nbqx34hhjg47lbjafkmdps8aalq3n5sah99iy26d"; + libraryHaskellDepends = [ + base bytestring di-core exceptions unix + ]; + homepage = "https://github.com/k0001/di"; + description = "IO support for file handles in di-core"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "di-monad" = callPackage + ({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes + , stm, transformers + }: + mkDerivation { + pname = "di-monad"; + version = "1.0"; + sha256 = "1kb2dx4whbl0lp0yb5y7m66ma0qywprzy5zs3msxiqfdbc3ghqvx"; + libraryHaskellDepends = [ + base containers di-core exceptions mtl pipes stm transformers + ]; + homepage = "https://github.com/k0001/di"; + description = "mtl flavoured typeful hierarchical structured logging for di-core"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -84093,8 +84180,8 @@ self: { }) {inherit (pkgs) gdk_pixbuf;}; "gi-gdkx11" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gdk-x11 - , gi-gdk, gi-gio, gi-gobject, gi-xlib, haskell-gi, haskell-gi-base + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk + , gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers }: mkDerivation { @@ -84106,13 +84193,13 @@ self: { base bytestring containers gi-gdk gi-gio gi-gobject gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ gdk-x11 ]; + libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gdk-x11 = null;}; + }) {gtk3 = pkgs.gnome3.gtk;}; "gi-ggit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -84159,18 +84246,18 @@ self: { }) {inherit (pkgs) glib;}; "gi-girepository" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject - , gobjectIntrospection, haskell-gi, haskell-gi-base + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-girepository"; - version = "1.0.15"; - sha256 = "1g9bvf850zsbqi4dw8i1nbclqwi599zvwny4fsl0hp8lqb9w7ps6"; + version = "1.0.16"; + sha256 = "1kb7vyqks6br8z2bjp9wzj0dvh76s35dbx93iijgl138270ikww6"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-gobject haskell-gi haskell-gi-base - haskell-gi-overloading text transformers + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gobjectIntrospection ]; doHaddock = false; @@ -84343,8 +84430,8 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.15"; - sha256 = "1k35x6cc1kiyhwq978dlckib2sfz7k3w2gxfqsha591a0661k10d"; + version = "1.0.16"; + sha256 = "0g6z15di4lk3l6hxpl6yqffw23kya3r2khxs4ah6vmkdn42wcalw"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase @@ -84687,8 +84774,8 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.18"; - sha256 = "0qxqsg9p2380z6cyvky8g0a90v1zyf90ff9mmislnzm89fmc8013"; + version = "4.0.19"; + sha256 = "1hnxp1vk2qhi7shr4qd7khi2nq0vpn58f1g6j7dkl0h23266fwz2"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib @@ -84711,8 +84798,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.16"; - sha256 = "010svwg3p3sdd209l8cnwhsm2dp9n6qf0shzqjdx5l1pkjv32zqm"; + version = "4.0.17"; + sha256 = "0lpz5a9395bqfmxbhfjfbqi4832a68ybbr1y0c475r8ya6pnx4cq"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-gobject gi-gtk @@ -109614,8 +109701,8 @@ self: { pname = "hquantlib"; version = "0.0.4.0"; sha256 = "0x24qkbpclir0ik52hyxw3ahnqk1nqscxpx1ahnxs4w1bv7bkcmp"; - revision = "1"; - editedCabalFile = "02wp531cckdgj11sjamyafnij0cri7svrg4ddbvak9yki0xpm286"; + revision = "2"; + editedCabalFile = "1wx32kkv1as3rras5b1y3v77abx0sqsam6ssa5s7vm83pncx38y4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126702,24 +126789,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "katydid_0_2_0_1" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, directory - , filepath, HUnit, hxt, json, mtl, parsec, regex-tdfa, tasty - , tasty-hunit, text + "katydid_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , directory, either, extra, filepath, HUnit, hxt, ilist, json, mtl + , parsec, primes, regex-tdfa, tasty, tasty-hunit, text }: mkDerivation { pname = "katydid"; - version = "0.2.0.1"; - sha256 = "1m3rclgrjc7f1rirn39w55rw4vlr769kvm0byw53kg2ib95l2nlg"; + version = "0.3.0.0"; + sha256 = "1r95yxhrsw0ghv55xlq987yzhly69ihiy4bz6k3k41mfj8d7kj8v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers deepseq hxt json mtl parsec regex-tdfa + base bytestring containers deepseq either extra hxt ilist json mtl + parsec regex-tdfa text ]; executableHaskellDepends = [ base mtl ]; testHaskellDepends = [ - base containers directory filepath HUnit hxt json mtl parsec tasty - tasty-hunit + base containers directory filepath HUnit hxt ilist json mtl parsec + primes tasty tasty-hunit text ]; benchmarkHaskellDepends = [ base criterion deepseq directory filepath hxt mtl text @@ -131551,12 +131639,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lens-labels_0_2_0_0" = callPackage + "lens-labels_0_2_0_1" = callPackage ({ mkDerivation, base, ghc-prim, profunctors, tagged }: mkDerivation { pname = "lens-labels"; - version = "0.2.0.0"; - sha256 = "137axpd2j7q4k34mav0338spk985ksh760nfv3vsm59aq9ab76xf"; + version = "0.2.0.1"; + sha256 = "1nn0qp0xl65wc5axy68jlmif1k97af8v5r09sf02fw3iww7ym7wj"; libraryHaskellDepends = [ base ghc-prim profunctors tagged ]; homepage = "https://github.com/google/proto-lens#readme"; description = "Integration of lenses with OverloadedLabels"; @@ -168755,15 +168843,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens_0_3_0_0" = callPackage + "proto-lens_0_3_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default-class, deepseq, lens-family, lens-labels, parsec , pretty, text, transformers, void }: mkDerivation { pname = "proto-lens"; - version = "0.3.0.0"; - sha256 = "0skbqawzz58ilpvkdcx1hmpaj67pyjz449qmdrp2scdpdcc1nica"; + version = "0.3.1.0"; + sha256 = "1awlp7101vhqf2hhz3h93mf38lyyfx5ay3gvrdna0k3msykimgw7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class deepseq @@ -168791,14 +168879,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens-arbitrary_0_1_2_0" = callPackage + "proto-lens-arbitrary_0_1_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, lens-family , proto-lens, QuickCheck, text }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.2.0"; - sha256 = "1xkvv822qsi1h99f7xpbprq4j9yf5ykz6bd5lj5jn8626vfq0n67"; + version = "0.1.2.1"; + sha256 = "08qwn60pih64lk6xnqwzx3q1qja46pvaw6539r1m4kbw3wyh2kl2"; libraryHaskellDepends = [ base bytestring containers lens-family proto-lens QuickCheck text ]; @@ -168815,8 +168903,8 @@ self: { }: mkDerivation { pname = "proto-lens-combinators"; - version = "0.1.0.9"; - sha256 = "1kkns9p2ipq4b3jy1l4lbh9h1m3vvg1l5r6ncqs0ydc2rqy1iasf"; + version = "0.1.0.10"; + sha256 = "0yv6wrg3wsp6617mw02n3d9gmlb9nyvfabffrznpvlaywwk8cnir"; setupHaskellDepends = [ base Cabal proto-lens-protoc ]; libraryHaskellDepends = [ base data-default-class lens-family proto-lens-protoc transformers @@ -168861,14 +168949,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proto-lens-optparse_0_1_1_1" = callPackage + ({ mkDerivation, base, optparse-applicative, proto-lens, text }: + mkDerivation { + pname = "proto-lens-optparse"; + version = "0.1.1.1"; + sha256 = "1zi6kv6af39bbbcf2v7d1l2fc2f3m6r1i2yvv4ddm6w0i7vhd1qw"; + libraryHaskellDepends = [ + base optparse-applicative proto-lens text + ]; + homepage = "https://github.com/google/proto-lens#readme"; + description = "Adapting proto-lens to optparse-applicative ReadMs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-protobuf-types" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens , proto-lens-protoc, text }: mkDerivation { pname = "proto-lens-protobuf-types"; - version = "0.3.0.0"; - sha256 = "1r9pbpapgi8bq938m1fliwbv8cxr18v3a3hbziq33psvas48kwa4"; + version = "0.3.0.1"; + sha256 = "0630yl73s11dnfripbz5pa25mzpsnjzd278qcm5yiy6zmcz0a6ca"; setupHaskellDepends = [ base Cabal proto-lens-protoc ]; libraryHaskellDepends = [ base lens-family proto-lens proto-lens-protoc text @@ -168887,8 +168990,8 @@ self: { }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.3.0.0"; - sha256 = "0fh6q3alm8pw32zsg6yrf8b3gf2ww5yqsjax2hmij3y20fl26s79"; + version = "0.3.1.0"; + sha256 = "0hihwynqlxhbc7280v7syag0p5php4gdvchbpzvwl54hvcjakgvx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182598,6 +182701,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scientific_0_3_6_0" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , deepseq, hashable, integer-gmp, integer-logarithms, primitive + , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text + }: + mkDerivation { + pname = "scientific"; + version = "0.3.6.0"; + sha256 = "1rdwqw2xi1c6305vbxa0sfyl18rjgir7flbdz2pbdvaj3nw44lr4"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq hashable integer-gmp + integer-logarithms primitive text + ]; + testHaskellDepends = [ + base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml + tasty-hunit tasty-quickcheck tasty-smallcheck text + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/basvandijk/scientific"; + description = "Numbers represented using scientific notation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scion" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset @@ -219066,8 +219194,8 @@ self: { pname = "vector-space-points"; version = "0.2.1.2"; sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy"; - revision = "3"; - editedCabalFile = "07jrxmjw7yzrgkncam4axy3b3j5iha1d632kyd24n805b6p7vym3"; + revision = "4"; + editedCabalFile = "1bw8l4nlxsx2nlam9kry60k75vszfx9zxr8zj0mcb3r0r7s178mx"; libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3;