From 959d30a593c9d522be4abdea037907bbf3ad4db1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Sep 2020 17:40:36 +0200 Subject: [PATCH 01/16] LTS Haskell 16.13 --- .../configuration-hackage2nix.yaml | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c62e3a160e80..721874e20ca8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 16.12 + # LTS Haskell 16.13 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -489,7 +489,7 @@ default-package-overrides: - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - - conduit ==1.3.2 + - conduit ==1.3.2.1 - conduit-algorithms ==0.0.11.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 @@ -504,7 +504,7 @@ default-package-overrides: - config-ini ==0.2.4.0 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - - configurator-pg ==0.2.3 + - configurator-pg ==0.2.4 - connection ==0.3.1 - connection-pool ==0.2.2 - console-style ==0.0.2.1 @@ -733,7 +733,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.8 - - esqueleto ==3.3.3.2 + - esqueleto ==3.3.3.3 - essence-of-live-coding ==0.1.0.3 - essence-of-live-coding-gloss ==0.1.0.3 - essence-of-live-coding-pulse ==0.1.0.3 @@ -1092,14 +1092,14 @@ default-package-overrides: - hslua-module-doclayout ==0.1.0 - hslua-module-system ==0.2.2 - hslua-module-text ==0.2.1 - - HsOpenSSL ==0.11.4.18 + - HsOpenSSL ==0.11.4.19 - hsp ==0.10.0 - - hspec ==2.7.2 + - hspec ==2.7.4 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.5.1 - - hspec-core ==2.7.2 - - hspec-discover ==2.7.2 + - hspec-core ==2.7.4 + - hspec-discover ==2.7.4 - hspec-expectations ==0.8.2 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.5 @@ -1385,13 +1385,13 @@ default-package-overrides: - mainland-pretty ==0.7.0.1 - main-tester ==0.2.0.1 - makefile ==1.1.0.0 - - managed ==1.0.7 + - managed ==1.0.8 - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.5.3.2 + - massiv ==0.5.4.0 - massiv-io ==0.2.1.0 - - massiv-test ==0.1.3.1 + - massiv-test ==0.1.4 - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.1 @@ -1433,7 +1433,7 @@ default-package-overrides: - midi ==0.2.2.2 - mighty-metropolis ==2.0.0 - mime-mail ==0.5.0 - - mime-mail-ses ==0.4.2 + - mime-mail-ses ==0.4.3 - mime-types ==0.1.0.9 - mini-egison ==1.0.0 - minimal-configuration ==0.1.4 @@ -1963,7 +1963,7 @@ default-package-overrides: - servant-checked-exceptions-core ==2.2.0.0 - servant-client ==0.16.0.1 - servant-client-core ==0.16 - - servant-conduit ==0.15 + - servant-conduit ==0.15.1 - servant-docs ==0.11.4 - servant-docs-simple ==0.2.0.1 - servant-elm ==0.7.2 @@ -1972,9 +1972,9 @@ default-package-overrides: - servant-js ==0.9.4.2 - servant-JuicyPixels ==0.3.0.5 - servant-lucid ==0.9 - - servant-machines ==0.15 + - servant-machines ==0.15.1 - servant-mock ==0.8.5 - - servant-pipes ==0.15.1 + - servant-pipes ==0.15.2 - servant-purescript ==0.10.0.0 - servant-rawm ==0.3.2.0 - servant-server ==0.16.2 @@ -2118,7 +2118,7 @@ default-package-overrides: - stringsearch ==0.3.6.6 - string-transform ==1.1.1 - stripe-concepts ==1.0.2.4 - - stripe-signature ==1.0.0.4 + - stripe-signature ==1.0.0.6 - strive ==5.0.12 - structs ==0.1.3 - structured ==0.1 @@ -2145,7 +2145,7 @@ default-package-overrides: - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - system-info ==0.5.1 - - tabular ==0.2.2.7 + - tabular ==0.2.2.8 - taffybar ==3.2.2 - tagchup ==0.4.1.1 - tagged ==0.8.6 @@ -2182,7 +2182,7 @@ default-package-overrides: - TCache ==0.12.1 - tce-conf ==1.3 - tdigest ==0.2.1 - - template-haskell-compat-v0208 ==0.1.4 + - template-haskell-compat-v0208 ==0.1.5 - temporary ==1.3 - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 @@ -2474,7 +2474,7 @@ default-package-overrides: - xdg-basedir ==0.2.2 - xdg-desktop-entry ==0.1.1.1 - xdg-userdirs ==0.1.0.2 - - xeno ==0.4.1 + - xeno ==0.4.2 - xls ==0.1.3 - xlsx ==0.8.1 - xlsx-tabular ==0.2.2.1 From 22e7919daed3c7b54f2d2c0378fcf391bfe1c3fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Sep 2020 20:22:25 +0200 Subject: [PATCH 02/16] hackage2nix: update list of broken builds to fix evaluation errors --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 721874e20ca8..bcbf09a4070d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3971,6 +3971,7 @@ broken-packages: - compdata-automata - compdata-dags - compdata-param + - compdoc - competition - compilation - complexity @@ -3978,6 +3979,7 @@ broken-packages: - composite-aeson - composite-aeson-path - composite-aeson-refined + - composite-aeson-throw - composite-binary - composite-ekg - composite-opaleye From cacf9f443dd392a65a3eff86e859c10037b29d01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 5 Sep 2020 02:30:31 +0200 Subject: [PATCH 03/16] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-15-g1073700 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/f2803db3a90d2455b218da46a17267097f1faa8a. --- .../haskell-modules/hackage-packages.nix | 1567 ++++++++++------- 1 file changed, 912 insertions(+), 655 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 513ef0fc21cb..a6f5ba494c88 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -791,7 +791,7 @@ self: { broken = true; }) {}; - "Agda" = callPackage + "Agda_2_6_1" = callPackage ({ mkDerivation, aeson, alex, array, async, base, binary , blaze-html, boxes, bytestring, Cabal, containers, data-hash , deepseq, directory, edit-distance, emacs, equivalence, exceptions @@ -825,6 +825,40 @@ self: { maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {inherit (pkgs) emacs;}; + "Agda" = callPackage + ({ mkDerivation, aeson, alex, array, async, base, binary + , blaze-html, boxes, bytestring, Cabal, containers, data-hash + , deepseq, directory, edit-distance, emacs, equivalence, exceptions + , filepath, geniplate-mirror, ghc-compact, gitrev, happy, hashable + , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process + , regex-tdfa, split, stm, strict, template-haskell, text, time + , transformers, unordered-containers, uri-encode, zlib + }: + mkDerivation { + pname = "Agda"; + version = "2.6.1.1"; + sha256 = "0d4j3n96wyc2crz238q49sb31ll6dfddllb82ry0jnsk8f0ypx2p"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ + aeson array async base binary blaze-html boxes bytestring + containers data-hash deepseq directory edit-distance equivalence + exceptions filepath geniplate-mirror ghc-compact gitrev hashable + hashtables haskeline ieee754 mtl murmur-hash pretty process + regex-tdfa split stm strict template-haskell text time transformers + unordered-containers uri-encode zlib + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base directory filepath process ]; + executableToolDepends = [ emacs ]; + description = "A dependently typed functional programming language and proof assistant"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ abbradar ]; + }) {inherit (pkgs) emacs;}; + "Agda-executable" = callPackage ({ mkDerivation, Agda, base }: mkDerivation { @@ -6151,6 +6185,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "FloatingHex_0_5" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "FloatingHex"; + version = "0.5"; + sha256 = "0c38062vnjmy3fc5nxwg7sgbfabikaakgdsl34ka229s6w7pm8x3"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Read and write hexadecimal floating point numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Focus" = callPackage ({ mkDerivation, base, MissingH, split }: mkDerivation { @@ -10768,20 +10814,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.4.18"; - sha256 = "1nz4d6pwcnv775ncyg85ckx8kkzj2y3h17i40jc0yna8ai7driyx"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring network time ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = stdenv.lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_4_19" = callPackage ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; @@ -10793,7 +10825,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -13201,8 +13232,8 @@ self: { }: mkDerivation { pname = "Map"; - version = "0.1.3.2"; - sha256 = "03bc7mswiw5n76g34pll6dgz7f46l9gafl1bfanv74p21xjr829g"; + version = "0.1.3.3"; + sha256 = "060b50hjl79ikzff1i65xakq8vkqr6pssc5kvw5j6vrd46y4ami4"; libraryHaskellDepends = [ base containers either-both filtrable util ]; @@ -16287,6 +16318,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) python3;}; + "PyF_0_9_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , filepath, hashable, haskell-src-exts, haskell-src-meta, hspec + , HUnit, megaparsec, mtl, process, template-haskell, temporary + , text + }: + mkDerivation { + pname = "PyF"; + version = "0.9.0.2"; + sha256 = "186kxid40nsxhc4yas6a1jk6ndsycsfrc5k9pfvyhgw720rx2p2c"; + libraryHaskellDepends = [ + base containers haskell-src-exts haskell-src-meta megaparsec mtl + template-haskell text + ]; + testHaskellDepends = [ + base bytestring deepseq directory filepath hashable hspec HUnit + process template-haskell temporary text + ]; + description = "Quasiquotations for a python like interpolated string formater"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "QIO" = callPackage ({ mkDerivation, base, containers, mtl, old-time, random }: mkDerivation { @@ -17271,16 +17325,23 @@ self: { }) {}; "RtMidi" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, alsaLib, base, tasty, tasty-hunit, unliftio-core + }: mkDerivation { pname = "RtMidi"; - version = "0.1.1.0"; - sha256 = "09vs2y6zry4xak0gc6pc6xqinr9sv9z53hdiydxpn6ixam9s0g5r"; - libraryHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "110fdfa47lmgvk1xjgl71hicbnv6j3ihw2r4i3nig28ciliyc2v2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base unliftio-core ]; + librarySystemDepends = [ alsaLib ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {inherit (pkgs) alsaLib;}; "RxHaskell" = callPackage ({ mkDerivation, base, containers, stm, transformers }: @@ -24998,8 +25059,8 @@ self: { }: mkDerivation { pname = "aeson-value-parser"; - version = "0.19"; - sha256 = "1v8s1f0zxhvf0r0cr800x363361g7il2wmbah04kr1vl376ydcjy"; + version = "0.19.2.1"; + sha256 = "1hv1h0kckjy98l1vd21z1mr6cyg23xzilzs8ppri8b6k731w1bwx"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable megaparsec mtl scientific text text-builder transformers unordered-containers vector @@ -33479,6 +33540,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "assert-failure_0_1_2_5" = callPackage + ({ mkDerivation, base, pretty-show, text }: + mkDerivation { + pname = "assert-failure"; + version = "0.1.2.5"; + sha256 = "0k8a7g82dsj50djpy2kvhnfljb3y9w9dx9mpymvn6hxd6rir4bpm"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base pretty-show text ]; + description = "Syntactic sugar improving 'assert' and 'error'"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "assertions" = callPackage ({ mkDerivation, ansi-terminal, base, containers, interpolate , process @@ -34999,6 +35073,8 @@ self: { pname = "aura"; version = "3.1.8"; sha256 = "19zm9bwpixqdg4a5mcrv2c8fyhygjzawjrwv1jwwhcczqsrjwvrw"; + revision = "1"; + editedCabalFile = "0yi5hhsjv77v9gqsj6ix6nb042nywkwdwkjljpzbvl7pvsv4asr3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41034,8 +41110,8 @@ self: { ({ mkDerivation, base, bindings-DSL, portaudio, vector }: mkDerivation { pname = "bindings-portaudio"; - version = "0.2.1"; - sha256 = "1i2r01jhf8k7820zzwqbss0z3kxd15pvdz7ss8s9gczv88nwxvxk"; + version = "0.3"; + sha256 = "0s8qmkx7psg6b5dbjdb90lz91rkbhfagss1c6idlhqvjjnipps90"; libraryHaskellDepends = [ base bindings-DSL vector ]; libraryPkgconfigDepends = [ portaudio ]; description = "Low-level bindings to portaudio library"; @@ -42383,8 +42459,8 @@ self: { }: mkDerivation { pname = "bitstream"; - version = "0.3.0.0"; - sha256 = "12cyvrd7za5zh1idi5q4w0qbv0l4kjlsjascz6z4w2877zji7bvh"; + version = "0.3.0.1"; + sha256 = "0hkgjmhw7gc6m3yyva097q0z7f1wixlmm1ja0gpg9qkgzx6piyf0"; libraryHaskellDepends = [ base base-unicode-symbols bytestring vector ]; @@ -47668,6 +47744,17 @@ self: { broken = true; }) {}; + "cabal-auto-expose" = callPackage + ({ mkDerivation, base, Cabal, directory, extra, filepath }: + mkDerivation { + pname = "cabal-auto-expose"; + version = "0.1.0.0"; + sha256 = "1dynrsp1j2y1ylmqc3fkz5nfa5slljxgg0x322j64rljgjqglfy2"; + libraryHaskellDepends = [ base Cabal directory extra filepath ]; + description = "Build time library that autodetects exposed modules"; + license = stdenv.lib.licenses.mit; + }) {}; + "cabal-bounds" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-lenses , cmdargs, directory, filepath, Glob, lens, lens-aeson, process @@ -48387,10 +48474,8 @@ self: { }: mkDerivation { pname = "cabal-plan"; - version = "0.7.0.0"; - sha256 = "1wv375dq50fibzg6xa9vrr8q4lhaqcl254b9a2vc42rrjvhxxmzc"; - revision = "2"; - editedCabalFile = "1c3w9d75kqxhyafjyl8fyzbrp80idvhd693rsd08gws8blkk1vzr"; + version = "0.7.1.0"; + sha256 = "01hd6wl80j6njlg3h4rxsf5izyx49bs6v1j5756g2pyxc9h4hrs4"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -49021,6 +49106,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "caching" = callPackage + ({ mkDerivation, base, dlist, hashable, mtl, psqueues, ref-tf + , transformers + }: + mkDerivation { + pname = "caching"; + version = "0"; + sha256 = "0rd8ipnycf1vcxxic99d2swcpcdhaljwvbbr4vlagchl3vifxr56"; + libraryHaskellDepends = [ + base dlist hashable mtl psqueues ref-tf transformers + ]; + testHaskellDepends = [ + base dlist hashable mtl psqueues ref-tf transformers + ]; + description = "Cache combinators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cachix" = callPackage ({ mkDerivation, async, base, base64-bytestring, boost, bytestring , cachix-api, conduit, conduit-extra, containers, cookie @@ -49981,6 +50084,8 @@ self: { pname = "capnp"; version = "0.6.0.0"; sha256 = "1w5cp3jp0dm8vf3zmkfpvpz7jl3pamlnxsl75ds3f4xxyx907qcg"; + revision = "1"; + editedCabalFile = "158y76rna3z40fwi661fyvmxyfdgs34zi3bxfqc79nc01l7ri8iw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50976,6 +51081,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cassava-megaparsec_2_0_2" = callPackage + ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec + , megaparsec, unordered-containers, vector + }: + mkDerivation { + pname = "cassava-megaparsec"; + version = "2.0.2"; + sha256 = "03x1462agrfdagklp8c89b8p4z2hd8nbf6d3895sz770zjkawda7"; + libraryHaskellDepends = [ + base bytestring cassava megaparsec unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring cassava hspec hspec-megaparsec vector + ]; + description = "Megaparsec parser of CSV files that plays nicely with Cassava"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cassava-records" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cassava, containers , foldl, HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -58416,6 +58540,25 @@ self: { broken = true; }) {}; + "compdoc" = callPackage + ({ mkDerivation, aeson, base, composite-aeson + , composite-aeson-throw, composite-base, pandoc, pandoc-throw, path + , rio, vinyl + }: + mkDerivation { + pname = "compdoc"; + version = "0.1.0.0"; + sha256 = "0m7xrl1ki3agp69yczgy396xlb84kggslmqnjglziyg6sziv58ak"; + libraryHaskellDepends = [ + aeson base composite-aeson composite-aeson-throw composite-base + pandoc pandoc-throw path rio vinyl + ]; + description = "Parse a Pandoc to a composite value"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "compendium-client" = callPackage ({ mkDerivation, aeson, base, http-client, language-protobuf , megaparsec, servant, servant-client, text @@ -58687,6 +58830,23 @@ self: { broken = true; }) {}; + "composite-aeson-throw" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, base, composite-aeson + , exceptions + }: + mkDerivation { + pname = "composite-aeson-throw"; + version = "0.1.0.0"; + sha256 = "0724mf1visv7ay306qngsz41blb28ykw074r6wfki17mfss1kh8y"; + libraryHaskellDepends = [ + aeson aeson-better-errors base composite-aeson exceptions + ]; + description = "MonadThrow behaviour for composite-aeson"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "composite-base" = callPackage ({ mkDerivation, base, deepseq, exceptions, hspec, lens , monad-control, mtl, profunctors, QuickCheck, template-haskell @@ -58797,6 +58957,28 @@ self: { broken = true; }) {}; + "composite-tuple" = callPackage + ({ mkDerivation, base, composite-base }: + mkDerivation { + pname = "composite-tuple"; + version = "0.1.0.0"; + sha256 = "1c3xljlwisx3b9p5nz8jny7svsjjzazpvywwksxqccfv1vipi50z"; + libraryHaskellDepends = [ base composite-base ]; + description = "Tuple functions for composite records"; + license = stdenv.lib.licenses.mit; + }) {}; + + "composite-xstep" = callPackage + ({ mkDerivation, base, composite-base, vinyl }: + mkDerivation { + pname = "composite-xstep"; + version = "0.1.0.0"; + sha256 = "18q75ynlywr6yap6nn11x5kzxncn0b6ghmvbg642617pznznpfm9"; + libraryHaskellDepends = [ base composite-base vinyl ]; + description = "ReaderT transformer pattern for higher kinded composite data"; + license = stdenv.lib.licenses.mit; + }) {}; + "composition" = callPackage ({ mkDerivation }: mkDerivation { @@ -59743,34 +59925,6 @@ self: { }) {}; "conduit" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, gauge, hspec, kan-extensions - , mono-traversable, mtl, mwc-random, primitive, QuickCheck - , resourcet, safe, silently, split, text, transformers, unix - , unliftio, unliftio-core, vector - }: - mkDerivation { - pname = "conduit"; - version = "1.3.2"; - sha256 = "0vmcyi3f280b6ll6pcyma4aqrl6m69n6y6x7wplxgsmxz5q7kng3"; - libraryHaskellDepends = [ - base bytestring directory exceptions filepath mono-traversable mtl - primitive resourcet text transformers unix unliftio-core vector - ]; - testHaskellDepends = [ - base bytestring containers directory exceptions filepath hspec - mono-traversable mtl QuickCheck resourcet safe silently split text - transformers unliftio vector - ]; - benchmarkHaskellDepends = [ - base containers deepseq gauge hspec kan-extensions mwc-random - transformers vector - ]; - description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit_1_3_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, gauge, hspec, kan-extensions , mono-traversable, mtl, mwc-random, primitive, QuickCheck @@ -59796,7 +59950,6 @@ self: { ]; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-algorithms" = callPackage @@ -60851,8 +61004,8 @@ self: { }: mkDerivation { pname = "configurator-pg"; - version = "0.2.3"; - sha256 = "0vbs52za4smxy8nag08ag2c9mjbpiw1a7ai5vd8is7db9732skfa"; + version = "0.2.4"; + sha256 = "07zhvfky3p4wv6hc48hclmgkz465wpbqwx4yfljby82hgnrkdarh"; libraryHaskellDepends = [ base containers megaparsec protolude scientific text ]; @@ -61335,8 +61488,10 @@ self: { }: mkDerivation { pname = "constraints-deriving"; - version = "1.1.1.0"; - sha256 = "1phgcib4bxbci2n4kh3r1iyp31bbzs6qpnvmxf373hglwyvj9pjy"; + version = "1.1.1.1"; + sha256 = "06crlqgr5dswjpb9k0d5wizfl8anyrnapqfvp10amq3lgfg3sriz"; + revision = "1"; + editedCabalFile = "1fqk2bd5n52yvqx54ck2ypq9a79m8ihp7057j22rglg3b363k8j0"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -61487,8 +61642,8 @@ self: { pname = "consumers"; version = "2.2.0.2"; sha256 = "0nml5hn6n95ngy1qvj6w4rkwa8r6qax0nc2vgimk68bawv4z97qd"; - revision = "1"; - editedCabalFile = "150f62zfb5kpa8iwp08fq9gdmv142swfldkjrrjyx0jpvf6qcjxc"; + revision = "2"; + editedCabalFile = "0fa67waf0af62kpljdksm00lvh29vm1rddfpjvy5c7lcy2a9ll97"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -63710,6 +63865,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "crackNum_2_4" = callPackage + ({ mkDerivation, array, base, FloatingHex }: + mkDerivation { + pname = "crackNum"; + version = "2.4"; + sha256 = "1fa9rlknmilc8rnm7yvmjrbc9jydpvk30gj7lq79nqbifig6229a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base FloatingHex ]; + executableHaskellDepends = [ array base FloatingHex ]; + description = "Crack various integer, floating-point data formats"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "craft" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-combinators, conduit-extra @@ -68976,8 +69146,8 @@ self: { ({ mkDerivation, base, containers, hspec, template-haskell }: mkDerivation { pname = "data-validation"; - version = "0.1.0.1"; - sha256 = "0bc3i4pnz1v516cmsnay1hpmh9r7zglwyv2ai1ncxy2k4l78pih0"; + version = "0.1.0.2"; + sha256 = "15mc3m48jnn5fjr3bm02j9raxclqwd8qnb0bx0w2jz5y3asnfx5f"; libraryHaskellDepends = [ base containers template-haskell ]; testHaskellDepends = [ base containers hspec template-haskell ]; description = "A library for creating type safe validations"; @@ -71684,6 +71854,8 @@ self: { pname = "derive-storable-plugin"; version = "0.2.3.0"; sha256 = "0yr9s33drw5l4ckqipqpmgrsrnm18yr4742mmyjqm3x7wai7d99q"; + revision = "1"; + editedCabalFile = "0wrynvd305bk3mvm9rbs9vrfb65yhiy2s83r8hs690r1vsw4mdkj"; libraryHaskellDepends = [ base derive-storable ghc ghci ]; testHaskellDepends = [ base derive-storable ghc ghci hspec QuickCheck @@ -72338,7 +72510,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_34_0" = callPackage + "dhall_1_35_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory @@ -72348,18 +72520,17 @@ self: { , mmorph, mockery, mtl, network-uri, optparse-applicative , parser-combinators, parsers, pretty-simple, prettyprinter , prettyprinter-ansi-terminal, profunctors, QuickCheck - , quickcheck-instances, repline, scientific, semigroups, serialise + , quickcheck-instances, repline, scientific, serialise , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, template-haskell, text, text-manipulate - , th-lift-instances, transformers, transformers-compat, turtle - , unordered-containers, uri-encode, vector + , tasty-quickcheck, tasty-silver, template-haskell, text + , text-manipulate, th-lift-instances, transformers + , transformers-compat, turtle, unordered-containers, uri-encode + , vector }: mkDerivation { pname = "dhall"; - version = "1.34.0"; - sha256 = "0rqvzvcqbhs9gvga7api6jjblnypm4a33z8kxi578ps63mhn3g0d"; - revision = "2"; - editedCabalFile = "1gvfcizp3blqas5ccgnqmahwq26xwd23kqh1vc9712agq7384z98"; + version = "1.35.0"; + sha256 = "19h0afgxqq9da1apx4xx9p4p0f2r6miivc4l1dkhbbvfk2r5wkw3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -72380,13 +72551,12 @@ self: { base bytestring cborg containers data-fix deepseq directory doctest either filepath foldl generic-random lens-family-core megaparsec mockery prettyprinter QuickCheck quickcheck-instances scientific - semigroups serialise special-values spoon tasty - tasty-expected-failure tasty-hunit tasty-quickcheck - template-haskell text transformers turtle unordered-containers - vector + serialise special-values spoon tasty tasty-expected-failure + tasty-hunit tasty-quickcheck tasty-silver template-haskell text + transformers turtle unordered-containers vector ]; benchmarkHaskellDepends = [ - base bytestring containers directory gauge serialise text + base bytestring containers directory gauge text ]; doCheck = false; description = "A configuration language guaranteed to terminate"; @@ -72417,14 +72587,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_32" = callPackage + "dhall-bash_1_0_33" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.32"; - sha256 = "0y4pjrknbq48j1cnj25zf31k02j5ivjm3h6ffizr3vgr24whfxih"; + version = "1.0.33"; + sha256 = "0b920cscim2mqcav0yy4s00gcgjqfybvbmfvnnbvarxswknw8z1v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72459,25 +72629,23 @@ self: { }) {}; "dhall-docs" = callPackage - ({ mkDerivation, base, bytestring, containers, dhall, directory - , doctest, file-embed, filepath, foldl, HaXml, lens-family-core - , lucid, megaparsec, mmark, mtl, optparse-applicative, path - , path-io, pretty, prettyprinter, tar, tasty, tasty-hunit - , tasty-silver, text, turtle + ({ mkDerivation, base, bytestring, containers, cryptonite, dhall + , directory, doctest, file-embed, filepath, foldl, HaXml + , lens-family-core, lucid, megaparsec, memory, mmark, mtl + , optparse-applicative, path, path-io, pretty, prettyprinter, tasty + , tasty-hunit, tasty-silver, text, transformers, turtle }: mkDerivation { pname = "dhall-docs"; - version = "1.0.0"; - sha256 = "0kfn3nr0g4x5bpdrkg5lh8qma2536k3gx7bvrsrkn53lyyxnbnvi"; - revision = "1"; - editedCabalFile = "1g4mmf6276rndzq95s41qmj7vfmpabmnnv4v077vgrsravqqyrlb"; + version = "1.0.1"; + sha256 = "0632l4h72zrddknhha8lz53ynzbdrhb11mvj09qfmr4b1rd01amz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers dhall directory file-embed filepath - lens-family-core lucid megaparsec mmark mtl optparse-applicative - path path-io prettyprinter tar text + base bytestring containers cryptonite dhall directory file-embed + filepath lens-family-core lucid megaparsec memory mmark mtl + optparse-applicative path path-io prettyprinter text transformers ]; executableHaskellDepends = [ base dhall ]; testHaskellDepends = [ @@ -72556,7 +72724,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_7_1" = callPackage + "dhall-json_1_7_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal , base, bytestring, containers, dhall, exceptions, filepath , lens-family-core, optparse-applicative, prettyprinter @@ -72565,10 +72733,8 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.7.1"; - sha256 = "158c9vhxa124r1xqn365wvwqhby5rngkip08ghy8rnjs5ijcxzgf"; - revision = "3"; - editedCabalFile = "1xxc1nsg86y2qzl4ln4jhlqw118bijyakr0mnyz801ap1ffgqfmb"; + version = "1.7.2"; + sha256 = "189mpnh2fnm1gwc1lvqa3wy9wk2wh8jj3216dvidik545008yvcj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72636,7 +72802,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dhall-lsp-server_1_0_9" = callPackage + "dhall-lsp-server_1_0_10" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , data-default, dhall, dhall-json, directory, doctest, filepath , haskell-lsp, haskell-lsp-types, hslogger, lens, lens-family-core @@ -72646,10 +72812,8 @@ self: { }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.9"; - sha256 = "0zf53pc8rxapmdm9fvp04gfnw2910yv1gm5sm5v5wb606njzk0xn"; - revision = "1"; - editedCabalFile = "1ml2yhwwbwwdv13266fgjk39pk04hg0ak82y08aixcryaldfhgwi"; + version = "1.0.10"; + sha256 = "0z6b3yq8fijxycabwrbqn2z94lb2ak2fmajlxgawyd1723cl2wsb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72674,8 +72838,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.1.16"; - sha256 = "1p9aizzf7zx92ns292zyzvg01r85dpl3wa61nh6g3q16qjs35bcx"; + version = "1.1.17"; + sha256 = "1c696f0if218pbmir4rmkb6shcgk9acw5g1iwcb2mslshmncbyfd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72697,10 +72861,8 @@ self: { }: mkDerivation { pname = "dhall-nixpkgs"; - version = "1.0.0"; - sha256 = "1bymafh0p0avfsdpcijj76075pgkn81sf6f3y17m7p0lmp8hhh75"; - revision = "1"; - editedCabalFile = "0zg6rcjs96xh060k56p0y2rvwkb17pqd8qa52b2yalx5b7k70gys"; + version = "1.0.1"; + sha256 = "1dw3bygs3da7yfcm5h376ppswv3dcny42yqjy7fabyzw72d4586z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -72793,7 +72955,7 @@ self: { broken = true; }) {}; - "dhall-yaml_1_2_1" = callPackage + "dhall-yaml_1_2_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall , dhall-json, exceptions, HsYAML, HsYAML-aeson , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -72801,10 +72963,8 @@ self: { }: mkDerivation { pname = "dhall-yaml"; - version = "1.2.1"; - sha256 = "18p8a92wiz2zi4q7v5fjvdallxrl21scmwwv706g3mm5dgfgcs5a"; - revision = "2"; - editedCabalFile = "0ni3jamaz552nd0lp142ga42cmh956jq0zv34jzqfzfz7d3i5yw6"; + version = "1.2.2"; + sha256 = "1mswyac77p0zpjdfr86x4ddwlnvqz0ibf98hr8q0zm1a9ibds982"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74441,6 +74601,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diohsc" = callPackage + ({ mkDerivation, asn1-types, base, bytestring, containers + , cryptonite, data-default-class, data-hash, directory + , drunken-bishop, exceptions, filepath, haskeline, hourglass, iconv + , mime, mtl, network, network-uri, parsec, pem, process + , regex-compat, safe, temporary, terminal-size, text, tls + , transformers, unix, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "diohsc"; + version = "0.1.1"; + sha256 = "129ray1dp18f24zfxm8qj5rmafcpz0gyfp4nhf5y0yjh41jffixf"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + asn1-types base bytestring containers cryptonite data-default-class + data-hash directory drunken-bishop exceptions filepath haskeline + hourglass iconv mime mtl network network-uri parsec pem process + regex-compat safe temporary terminal-size text tls transformers + unix x509 x509-store x509-validation + ]; + description = "Gemini client"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "diophantine" = callPackage ({ mkDerivation, array, base, happy }: mkDerivation { @@ -76423,21 +76608,21 @@ self: { }) {}; "dobutokO-poetry" = callPackage - ({ mkDerivation, base, dobutokO-poetry-general, mmsyn2, mmsyn3 - , mmsyn5, mmsyn6ukr, mmsyn7s, uniqueness-periods, vector + ({ mkDerivation, base, dobutokO-poetry-general, mmsyn3, mmsyn6ukr + , mmsyn7s, uniqueness-periods, vector }: mkDerivation { pname = "dobutokO-poetry"; - version = "0.16.3.0"; - sha256 = "151ncvk2jz2nlgr52485p6mdqix7qlld96kzi9y3hxag2kpb0723"; + version = "0.17.0.0"; + sha256 = "0swngd363lgyya80jvsyqj5a3mp8lkiirnbvy6kxdrharcqj2ahd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base dobutokO-poetry-general mmsyn2 mmsyn3 mmsyn5 mmsyn6ukr mmsyn7s + base dobutokO-poetry-general mmsyn3 mmsyn6ukr mmsyn7s uniqueness-periods vector ]; executableHaskellDepends = [ - base dobutokO-poetry-general mmsyn2 mmsyn3 mmsyn5 mmsyn6ukr mmsyn7s + base dobutokO-poetry-general mmsyn3 mmsyn6ukr mmsyn7s uniqueness-periods vector ]; description = "Helps to order the 7 or less Ukrainian words to obtain somewhat suitable for poetry or music text"; @@ -77346,6 +77531,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dotenv_0_8_0_7" = callPackage + ({ mkDerivation, base, base-compat, containers, directory + , exceptions, hspec, hspec-megaparsec, megaparsec + , optparse-applicative, process, text, transformers, yaml + }: + mkDerivation { + pname = "dotenv"; + version = "0.8.0.7"; + sha256 = "11x7aiflf45rdbbzk33pg8v2x5a4bnbhi6845bi3wpgq7y27210v"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base base-compat containers directory exceptions megaparsec process + text transformers yaml + ]; + executableHaskellDepends = [ + base base-compat megaparsec optparse-applicative process text + transformers yaml + ]; + testHaskellDepends = [ + base base-compat containers directory exceptions hspec + hspec-megaparsec megaparsec process text transformers yaml + ]; + description = "Loads environment variables from dotenv files"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dotfs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-src, HFuse, HUnit, parsec, process, QuickCheck @@ -83569,34 +83783,6 @@ self: { }) {}; "esqueleto" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql - , mysql-simple, persistent, persistent-mysql, persistent-postgresql - , persistent-sqlite, persistent-template, postgresql-libpq - , postgresql-simple, resourcet, tagged, text, time, transformers - , unliftio, unordered-containers, vector - }: - mkDerivation { - pname = "esqueleto"; - version = "3.3.3.2"; - sha256 = "0488vrv85gzv190j4npyjll5v1fchqlxlg5346j4p90zb9vl2pzl"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - monad-logger persistent resourcet tagged text time transformers - unliftio unordered-containers - ]; - testHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - exceptions hspec monad-logger mtl mysql mysql-simple persistent - persistent-mysql persistent-postgresql persistent-sqlite - persistent-template postgresql-libpq postgresql-simple resourcet - tagged text time transformers unliftio unordered-containers vector - ]; - description = "Type-safe EDSL for SQL queries on persistent backends"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "esqueleto_3_3_3_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -83622,7 +83808,6 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ess" = callPackage @@ -83660,15 +83845,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding_0_2_3" = callPackage + "essence-of-live-coding_0_2_4" = callPackage ({ mkDerivation, base, containers, foreign-store, mtl, QuickCheck , syb, test-framework, test-framework-quickcheck2, time , transformers, vector-sized }: mkDerivation { pname = "essence-of-live-coding"; - version = "0.2.3"; - sha256 = "19sc5wgby356bm5rh7sr41ydhw3v1pqbz76xyf7081kg77qcbc0m"; + version = "0.2.4"; + sha256 = "04rbbq58ska6qldah0d7s8kdn5hkxka7bap7ca1wksbwbkph6qj1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83699,14 +83884,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-gloss_0_2_3" = callPackage + "essence-of-live-coding-gloss_0_2_4" = callPackage ({ mkDerivation, base, essence-of-live-coding, foreign-store, gloss , syb, transformers }: mkDerivation { pname = "essence-of-live-coding-gloss"; - version = "0.2.3"; - sha256 = "0msc2pfg7096azk4ggb267cfm2vh02kcksgdmzl46rc5if98xmi7"; + version = "0.2.4"; + sha256 = "11hnzax39g7yaqwaaxi3niipamd65mcrdi431fxrspkhgcm1nx2y"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store gloss syb transformers ]; @@ -83721,8 +83906,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-gloss-example"; - version = "0.2.3"; - sha256 = "08hzfi3mspxlkbhh8mr1q330yp94s6s9w55pla7x10qj8vda4shc"; + version = "0.2.4"; + sha256 = "1npn9973jm8y21gh0cfdiqldmx5s7jb1iw6ka734mpjnx2nr9jzw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83750,14 +83935,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-pulse_0_2_3" = callPackage + "essence-of-live-coding-pulse_0_2_4" = callPackage ({ mkDerivation, base, essence-of-live-coding, foreign-store , pulse-simple, transformers }: mkDerivation { pname = "essence-of-live-coding-pulse"; - version = "0.2.3"; - sha256 = "1mxgicmy5xmmad0r0b3dn18ab9dn8r3rqglqxa6v75kl8lswm0c8"; + version = "0.2.4"; + sha256 = "0lhnq85bi22mwnw4fcg9hzr18mdifxlr833pwsc7ch401y2mf1kz"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store pulse-simple transformers ]; @@ -83772,8 +83957,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-pulse-example"; - version = "0.2.3"; - sha256 = "0da3l6z0lnjlq62vx18s2jyvrydffxvcjhv2ydlwczrcy0wggdln"; + version = "0.2.4"; + sha256 = "0jjafsrjpcprfcly4z4ld98y25lx3gc1faqbd6ms56kyrhs3q1p3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83802,14 +83987,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-quickcheck_0_2_3" = callPackage + "essence-of-live-coding-quickcheck_0_2_4" = callPackage ({ mkDerivation, base, boltzmann-samplers, essence-of-live-coding , QuickCheck, syb, transformers }: mkDerivation { pname = "essence-of-live-coding-quickcheck"; - version = "0.2.3"; - sha256 = "0shbpc1ivqr3m9p76kf1vj7g1rqy3magxyh58w1mxymf4c61a9gr"; + version = "0.2.4"; + sha256 = "1ic2wvk4fc7jb6dkfy6fypmyw7hfbn79m51gn4z4c35ddhsfpngd"; libraryHaskellDepends = [ base boltzmann-samplers essence-of-live-coding QuickCheck syb transformers @@ -83825,8 +84010,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-warp"; - version = "0.2.3"; - sha256 = "1rpp6xm3s3fji1pcdajc06iw0zhk3mbd245h6a0z6ygf8id7sh50"; + version = "0.2.4"; + sha256 = "1p6wcpkx19kspssw34ymp9gsfczzr5b11qghp2ha5gkrp6dw6z9w"; libraryHaskellDepends = [ base essence-of-live-coding http-types wai warp ]; @@ -85604,6 +85789,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "exotic-list-monads" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover + , QuickCheck + }: + mkDerivation { + pname = "exotic-list-monads"; + version = "1.0.0"; + sha256 = "0gi8bkfyw3w53hf6m0g9r0pw68pqh82n8x4zvs8y4wzjiwdipqw3"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec hspec-core QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Non-standard monads on lists and non-empty lists"; + license = stdenv.lib.licenses.mit; + }) {}; + "exp-cache" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq , hashable, HUnit, psqueues, QuickCheck, random, tasty, tasty-hunit @@ -86814,8 +87014,8 @@ self: { }: mkDerivation { pname = "fakefs"; - version = "0.3.0.1"; - sha256 = "1vilfl6vgxcywg81xfy6w6lir6r5pky7f2p7mf196kjby630av05"; + version = "0.3.0.2"; + sha256 = "16hgahq0j7ry1wdzv9syxk652x3wfhw8svpf1szmql2a32b9928b"; libraryHaskellDepends = [ base containers exceptions mtl ]; testHaskellDepends = [ base containers exceptions hspec QuickCheck @@ -86824,6 +87024,18 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "fakepull" = callPackage + ({ mkDerivation, base, exceptions, hspec, mtl, QuickCheck }: + mkDerivation { + pname = "fakepull"; + version = "0.3.0.2"; + sha256 = "1dmpq3wm3qsq4bg6d3zs79pbcp3v0pk72fizdviw6dl8hqmpgphl"; + libraryHaskellDepends = [ base exceptions mtl ]; + testHaskellDepends = [ base exceptions hspec mtl QuickCheck ]; + description = "Monad to pull from fake stream-like objects"; + license = stdenv.lib.licenses.asl20; + }) {}; + "faker" = callPackage ({ mkDerivation, base, gimlh, random, split }: mkDerivation { @@ -86975,18 +87187,17 @@ self: { "fast-builder" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, process, QuickCheck, scientific, stm - , template-haskell, text, true-name, unordered-containers, vector + , template-haskell, text, unordered-containers, vector }: mkDerivation { pname = "fast-builder"; - version = "0.1.2.0"; - sha256 = "1aa3v14nlcq4ql3f07lan9kg21dqp009yzgb96bxznyigxwf67rp"; + version = "0.1.2.1"; + sha256 = "0j11ahdmbni56car4zblwz9yz1qkrr6qbmpbah4fgpiyq6177cn9"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring process QuickCheck stm ]; benchmarkHaskellDepends = [ aeson base bytestring containers criterion deepseq ghc-prim - scientific template-haskell text true-name unordered-containers - vector + scientific template-haskell text unordered-containers vector ]; description = "Fast ByteString Builder"; license = stdenv.lib.licenses.publicDomain; @@ -93010,8 +93221,8 @@ self: { }: mkDerivation { pname = "free-algebras"; - version = "0.0.8.2"; - sha256 = "0mq9wwsylbmkiwwpvb1frym6nif587920rxkgq1gacwmh6dssymz"; + version = "0.1.0.0"; + sha256 = "0s5gj52b3s1hg92cs12qk7y2zgsl546livdzps2qm4fmjc394qj3"; libraryHaskellDepends = [ base containers data-fix dlist free groups kan-extensions mtl transformers @@ -99407,8 +99618,8 @@ self: { }: mkDerivation { pname = "ghc-tags-core"; - version = "0.2.3.0"; - sha256 = "0hpk3131dq07m92h6ppacgbj4ar475zrlsj2vhqgpmdh3z9lnd9c"; + version = "0.2.4.0"; + sha256 = "1h2khrvykywdddnhpy6yg2adfjlzdy6i6zib8km5j2zakmhq9s9j"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath-bytestring ghc mtl pipes pipes-attoparsec pipes-bytestring text transformers @@ -99437,8 +99648,8 @@ self: { }: mkDerivation { pname = "ghc-tags-plugin"; - version = "0.2.3.0"; - sha256 = "19bkn5lp1n993jxn4mhmnyw36d1vjwbvhlr1r6ywnanis9vgrbzg"; + version = "0.2.4.0"; + sha256 = "1cpfh3cvad2avissri0cs7ghamg2q3nyifyzlj3dndmzbpjrvxy7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101905,8 +102116,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20200810"; - sha256 = "1wy6ckcf5f6m94gakg1504h1zryail3mmj85sglq03s45vawjcg6"; + version = "8.20200908"; + sha256 = "1113inl10f4m0699ba2zglaqlfqvwhqjkqg6r6m1d5rqv5brswb1"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -101962,8 +102173,8 @@ self: { }: mkDerivation { pname = "git-brunch"; - version = "1.4.0.0"; - sha256 = "1dv0hzdfmzm2c3mfmf73lb085279hnfx41ly5393l0vj1v2ln6a4"; + version = "1.4.1.0"; + sha256 = "0jq2i115djl5skkjzxxqdkp2rnw6871xn4aj4ryx9mgfnsd6dfgi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -113377,8 +113588,8 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.9.1.0"; - sha256 = "1gksjmrz1rbkfm2cw1hfz74ws0hyxv3491fw6j2j5f1gjp46fwf7"; + version = "0.10.1.0"; + sha256 = "09kaxb2930synwwcwgk1xhbdmsd3zzr69i0ss4swasw4zlx8n0sh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; @@ -115455,6 +115666,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashtables_1_2_4_1" = callPackage + ({ mkDerivation, base, ghc-prim, hashable, HUnit, mwc-random + , primitive, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector + }: + mkDerivation { + pname = "hashtables"; + version = "1.2.4.1"; + sha256 = "0vgggm7bqq55zmqj6qji89bfj3k1rdkikkfhyg81vsqf0f3bzhqa"; + libraryHaskellDepends = [ + base ghc-prim hashable primitive vector + ]; + testHaskellDepends = [ + base ghc-prim hashable HUnit mwc-random primitive QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + vector + ]; + description = "Mutable hash tables in the ST monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashtables-plus" = callPackage ({ mkDerivation, base, criterion-plus, deepseq, hashable , hashtables, lens, loch-th, mtl, mwc-random, placeholders @@ -116337,12 +116570,12 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "haskell-gi-base_0_24_2" = callPackage + "haskell-gi-base_0_24_3" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.24.2"; - sha256 = "0qjbbfxlx4gqnyfnjpr4ray7fih8alsa2bxb5imkckhrzfx4xmq0"; + version = "0.24.3"; + sha256 = "007qy63s9d6rdhybnd7cfb5jsx0kzg7lbgximxkh5rd66bjbk9pc"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -123759,10 +123992,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "hex"; - version = "0.1.2"; - sha256 = "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj"; - revision = "1"; - editedCabalFile = "0khmrdni6njr4wxgz15yz77l8ar4qm2jj6v0lvfnwqdms4s6i80y"; + version = "0.2.0"; + sha256 = "1mc66758254d93m7vab7q6lhn7qphzxd6wyc3v6yq1diy0gji4va"; libraryHaskellDepends = [ base bytestring ]; description = "Convert strings into hexadecimal and back"; license = stdenv.lib.licenses.bsd3; @@ -125065,6 +125296,8 @@ self: { pname = "hie-bios"; version = "0.7.1"; sha256 = "00gkr4dbbs70vnd6y90iirss88j8ax714l9jmwdfkmslwd4m2ml8"; + revision = "1"; + editedCabalFile = "1whhyczfr1d03gmsi7pw31321km53y0hjdhjyy2bxhk3z9ch6ji5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126795,8 +127028,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.19"; - sha256 = "0kbvdpplc7h2xi1kzyk78wnmdxa32psn8swgk1apyzz36m03pax1"; + version = "1.19.1"; + sha256 = "0wfsyf2q1kf90mj3lxs0m5ghj153axmpkc8xfy12vkz5imnyphfm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126893,8 +127126,8 @@ self: { }: mkDerivation { pname = "hledger-flow"; - version = "0.14.1.0"; - sha256 = "0xw2dqlvfi898d89f3srszylx9p3pasg3mmj6qqnwr5ng612pf4b"; + version = "0.14.2.0"; + sha256 = "17a21rf2gj9hp7q0q7gg4znwa2j8xgrlxaq15akjn20sqp8l23ni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126992,8 +127225,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.19"; - sha256 = "0asg5zxi664p1csjs70c40jnrq8z4fhawbjm0v6sl8sbx7pn1rj1"; + version = "1.19.1"; + sha256 = "0py11011r358nmnvwwkc8mlx6mpy36jm8sqlr4i8ihx3x0zjdgya"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -127069,8 +127302,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.19"; - sha256 = "1xi67k28b63cbg38771dqncwdh6qrcnb0gr31r5hwkglznk3ajss"; + version = "1.19.1"; + sha256 = "17iz82jr89qxfd7j6q16w2jjr38mb7d94p3rbp0ks01bf4rlq5fl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -127109,7 +127342,7 @@ self: { , case-insensitive, clientsession, cmdargs, conduit, conduit-extra , containers, data-default, Decimal, directory, extra, filepath , hjsmin, hledger, hledger-lib, http-client, http-conduit - , http-types, megaparsec, mtl, network, semigroups, shakespeare + , http-types, megaparsec, mtl, network, shakespeare , template-haskell, text, time, transformers, unix-compat , unordered-containers, utf8-string, wai, wai-cors, wai-extra , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form @@ -127117,8 +127350,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.19"; - sha256 = "1nmacg23smaagfwzr7qwnlwiswdr4gb8zkscgxkiyfl5z97gy58y"; + version = "1.19.1"; + sha256 = "03wak0dgxhf7y2mc2az4xcypgz1z1lf65vn6kj98z063pmlwp1b0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127126,8 +127359,8 @@ self: { clientsession cmdargs conduit conduit-extra containers data-default Decimal directory extra filepath hjsmin hledger hledger-lib http-client http-conduit http-types megaparsec mtl network - semigroups shakespeare template-haskell text time transformers - unix-compat unordered-containers utf8-string wai wai-cors wai-extra + shakespeare template-haskell text time transformers unix-compat + unordered-containers utf8-string wai wai-cors wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form yesod-static ]; @@ -130673,8 +130906,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.9.0.0"; - sha256 = "17w916p4gfzflgvd35d5nxzfch82bwyranvlv28j2qz3dvk15ymn"; + version = "1.9.0.1"; + sha256 = "1s5bd631nzc2kw22ngzf30pywgb7yc33m93dxcr2xa2wx0za3fv2"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ aeson async base bytestring containers exceptions lifted-base @@ -130704,6 +130937,8 @@ self: { pname = "hpqtypes-extras"; version = "1.10.2.1"; sha256 = "06vx7llfyidldp5ar80a3dkw14xv19v1s8kc7kf6vs1gb3vx8r5n"; + revision = "1"; + editedCabalFile = "0vn0396jhxnrnp8724kpl7yjy4aywa2nm1vb7znz0fmzr0vp54yi"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions fields-json hpqtypes lifted-base log-base monad-control mtl safe @@ -133871,6 +134106,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-module-doclayout_0_2_0" = callPackage + ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit + , tasty-lua, text + }: + mkDerivation { + pname = "hslua-module-doclayout"; + version = "0.2.0"; + sha256 = "1ilkyv0wscz2kv0jkn45qc8ng5l1hvvbkwh972zvisys1m3hri4y"; + libraryHaskellDepends = [ base doclayout hslua text ]; + testHaskellDepends = [ + base doclayout hslua tasty tasty-hunit tasty-lua + ]; + description = "Lua module wrapping Text.DocLayout."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hslua-module-system" = callPackage ({ mkDerivation, base, containers, directory, exceptions, hslua , tasty, tasty-hunit, tasty-lua, temporary, text @@ -133957,10 +134209,9 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; - inherit (pkgs) jasper; inherit (pkgs) lcms; - inherit (pkgs) libjpeg; inherit (pkgs) libpng; - inherit (pkgs) libxml2; tiff = null; wmflite = null; - inherit (pkgs) zlib;}; + jasper = null; inherit (pkgs) lcms; inherit (pkgs) libjpeg; + inherit (pkgs) libpng; inherit (pkgs) libxml2; tiff = null; + wmflite = null; inherit (pkgs) zlib;}; "hsmisc" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, old-locale, parsec @@ -134274,21 +134525,6 @@ self: { }) {}; "hspec" = callPackage - ({ mkDerivation, base, hspec-core, hspec-discover - , hspec-expectations, QuickCheck - }: - mkDerivation { - pname = "hspec"; - version = "2.7.2"; - sha256 = "0zb9b85vx7wyx8zcrkqwlwp9qmsg3f5qnd43ps6xfrsn1l2vszm9"; - libraryHaskellDepends = [ - base hspec-core hspec-discover hspec-expectations QuickCheck - ]; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec_2_7_4" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: @@ -134301,7 +134537,6 @@ self: { ]; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-attoparsec" = callPackage @@ -134360,33 +134595,6 @@ self: { }) {}; "hspec-core" = callPackage - ({ mkDerivation, ansi-terminal, array, base, call-stack, clock - , deepseq, directory, filepath, hspec-expectations, hspec-meta - , HUnit, process, QuickCheck, quickcheck-io, random, setenv - , silently, stm, temporary, tf-random, transformers - }: - mkDerivation { - pname = "hspec-core"; - version = "2.7.2"; - sha256 = "0vzsxwgg3rfp6mxq85sb1v2wd77f2lwdg9zm5f1mqm02avfglfnk"; - libraryHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv stm tf-random transformers - ]; - testHaskellDepends = [ - ansi-terminal array base call-stack clock deepseq directory - filepath hspec-expectations hspec-meta HUnit process QuickCheck - quickcheck-io random setenv silently stm temporary tf-random - transformers - ]; - testToolDepends = [ hspec-meta ]; - testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-core_2_7_4" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -134411,7 +134619,6 @@ self: { testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-dirstream" = callPackage @@ -134433,25 +134640,6 @@ self: { }) {}; "hspec-discover" = callPackage - ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck - }: - mkDerivation { - pname = "hspec-discover"; - version = "2.7.2"; - sha256 = "0n3lvdznmrgrhd11969xn4ci31439y6fpr9xkzsabij87rw091l8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base directory filepath hspec-meta QuickCheck - ]; - testToolDepends = [ hspec-meta ]; - description = "Automatically discover and run Hspec tests"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-discover_2_7_4" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { @@ -134468,7 +134656,6 @@ self: { testToolDepends = [ hspec-meta ]; description = "Automatically discover and run Hspec tests"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-expectations" = callPackage @@ -136566,8 +136753,8 @@ self: { pname = "htoml-megaparsec"; version = "2.1.0.3"; sha256 = "1fpvfrib4igcmwhfms1spxr2b78srhrh4hrflrlgdgdn9x1m5w1x"; - revision = "2"; - editedCabalFile = "0vlyr965g1x5hk2mxlp8w4vv9ijq1gbm3i76slkl2aa38bf2i4ki"; + revision = "3"; + editedCabalFile = "074r8wr9xar40ybm6wqg2s0k32kiapbjm8k3djp4lz6gjxyw7nc8"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector @@ -143892,6 +144079,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inflections_0_4_0_6" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec + , hspec-megaparsec, megaparsec, QuickCheck, text + , unordered-containers + }: + mkDerivation { + pname = "inflections"; + version = "0.4.0.6"; + sha256 = "1054v250p86gb1kvbrp60fzwds8v8nsqap1970j7hgk5hjwq1xj1"; + libraryHaskellDepends = [ + base exceptions megaparsec text unordered-containers + ]; + testHaskellDepends = [ + base containers hspec hspec-megaparsec megaparsec QuickCheck text + ]; + description = "Inflections library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inflist" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -145702,6 +145909,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "io-manager_0_1_0_3" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "io-manager"; + version = "0.1.0.3"; + sha256 = "04584flxw3qwzdnas8nbxp6riw6jfvhgy0kkkzjkxg53y1d8ri3s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers ]; + executableHaskellDepends = [ base containers ]; + description = "Skeleton library around the IO monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "io-memoize" = callPackage ({ mkDerivation, async, base }: mkDerivation { @@ -145780,6 +146002,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "io-streams_1_5_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , deepseq, directory, filepath, HUnit, mtl, network, primitive + , process, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers, vector + , zlib, zlib-bindings + }: + mkDerivation { + pname = "io-streams"; + version = "1.5.2.0"; + sha256 = "1hbabrk5145d77qi23688piaf1wc93n8vaj846n0s3zk953z1lk3"; + configureFlags = [ "-fnointeractivetests" ]; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-builder network primitive + process text time transformers vector zlib-bindings + ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder deepseq directory + filepath HUnit mtl network primitive process QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + time transformers vector zlib zlib-bindings + ]; + description = "Simple, composable, and easy-to-use stream I/O"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "io-streams-haproxy" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams , network, test-framework, test-framework-hunit, transformers @@ -147642,8 +147891,8 @@ self: { }: mkDerivation { pname = "ixset-typed-conversions"; - version = "0.1.1.0"; - sha256 = "13nwxwxgsw7kj9kig643c48fadm6y9fjr0rsaggplqy903l4w5ks"; + version = "0.1.1.1"; + sha256 = "1fs0yys0hv9a2d8cxk94c89qp3843qqhjd47qvs50mxj1l22mc57"; libraryHaskellDepends = [ base exceptions free hashable ixset-typed unordered-containers zipper-extra @@ -152873,6 +153122,8 @@ self: { pname = "kubernetes-client"; version = "0.2.0.0"; sha256 = "07vvp8yb7jx5cgn3siykkh7jdkkcxapclyp09q4n975fzd01waww"; + revision = "1"; + editedCabalFile = "18gp9q7myy4yvqv5p1ra12d5g69qrc0r0i8ifzwavj4vc92bhmdc"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring connection containers data-default-class either filepath hoauth2 http-client @@ -161165,6 +161416,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "little-rio_0_2_1" = callPackage + ({ mkDerivation, base, exceptions, microlens, microlens-mtl, mtl + , primitive, resourcet, unliftio-core + }: + mkDerivation { + pname = "little-rio"; + version = "0.2.1"; + sha256 = "1fywk5nva88365p9qv866mf1j4jksarv7d9i39m5xxi764wwpzjp"; + libraryHaskellDepends = [ + base exceptions microlens microlens-mtl mtl primitive resourcet + unliftio-core + ]; + description = "When you need just the RIO monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "live-sequencer" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, bytestring, cgi , concurrent-split, containers, data-accessor @@ -162203,6 +162471,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-base_0_9_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq + , exceptions, mmorph, monad-control, monad-time, mtl, semigroups + , stm, text, time, transformers-base, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "log-base"; + version = "0.9.0.0"; + sha256 = "0rlwr80636b4rrjgqg7ri5cfz95v9h47r9k413r9wvldfvz2abyg"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring deepseq exceptions mmorph + monad-control monad-time mtl semigroups stm text time + transformers-base unliftio-core unordered-containers + ]; + description = "Structured logging solution (base package)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-domain" = callPackage ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal , comonad, deepseq, distributive, doctest, generic-deriving @@ -162294,8 +162582,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7.1.3"; - sha256 = "132q4cx0a2malzncm7bscjikpqaaz6fwzz6n8mhqianbpq02s0v1"; + version = "0.7.1.4"; + sha256 = "1m96d5486xadypm5iby8rkb979k82md394j5iaik6xk5aavcn6xx"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -163245,18 +163533,19 @@ self: { ({ mkDerivation, aeson-pretty, base, bimap, bytestring, constraints , containers, data-default, first-class-families, fmt, interpolate , lens, morley, morley-prelude, mtl, named, optparse-applicative - , pretty-terminal, QuickCheck, singletons, text - , unordered-containers, vinyl + , pretty-terminal, QuickCheck, singletons, template-haskell, text + , unordered-containers, vinyl, with-utf8 }: mkDerivation { pname = "lorentz"; - version = "0.6.0"; - sha256 = "1mzw2m46g5gffhihjfwimrhwqlky3z420b5wifdvxybm5vfc0qm2"; + version = "0.6.1"; + sha256 = "124zqmf200d5gs5bdxbf63z2w0kynxai3hlhf787sdksl3dc4sbl"; libraryHaskellDepends = [ aeson-pretty base bimap bytestring constraints containers data-default first-class-families fmt interpolate lens morley morley-prelude mtl named optparse-applicative pretty-terminal - QuickCheck singletons text unordered-containers vinyl + QuickCheck singletons template-haskell text unordered-containers + vinyl with-utf8 ]; description = "EDSL for the Michelson Language"; license = stdenv.lib.licenses.mit; @@ -163527,7 +163816,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lsp-test_0_11_0_4" = callPackage + "lsp-test_0_11_0_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl @@ -163536,8 +163825,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.11.0.4"; - sha256 = "0nf0ys44q2n81arg7ll08dkilq8giz0gxarld2lpq5fyhhfvyv7g"; + version = "0.11.0.5"; + sha256 = "0r038x65lc0ij6hs8klgj8v8f0fqqrn12dyxc0k8zf9pan9bwnph"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163796,8 +164085,8 @@ self: { ({ mkDerivation, base, lucid }: mkDerivation { pname = "lucid-cdn"; - version = "0.2.0.0"; - sha256 = "1b4s4yfhxnixc33kz0hnj2v5vrwag4vnssp8ma0vjgh17b9g4qzr"; + version = "0.2.0.1"; + sha256 = "1y1rszg00kb1qpwrccpjv6l0qkn8cpxawks7ylcw8sbs0h824l73"; libraryHaskellDepends = [ base lucid ]; description = "Curated list of CDN imports for lucid"; license = stdenv.lib.licenses.mit; @@ -165420,17 +165709,6 @@ self: { }) {}; "managed" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "managed"; - version = "1.0.7"; - sha256 = "0wxi6d3kcpc4iyhbrnbapbdgaf46aw0a8d32n2sbs0lbk0pc4c6i"; - libraryHaskellDepends = [ base transformers ]; - description = "A monad for managed values"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "managed_1_0_8" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "managed"; @@ -165439,7 +165717,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manatee" = callPackage @@ -166596,8 +166873,8 @@ self: { }: mkDerivation { pname = "mason"; - version = "0.2.2"; - sha256 = "1wck31lm5ms99r0aji8mkr0ax78i9z0qzz7gy9ihwriwwhyl9yiz"; + version = "0.2.3"; + sha256 = "0iwbdkrlbjn44gj0g43lfajx35jbihw4in5pc8by33ajwix43y5j"; libraryHaskellDepends = [ array base bytestring ghc-prim integer-gmp network text ]; @@ -166606,30 +166883,6 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, deepseq - , doctest, exceptions, mersenne-random-pure64, primitive - , QuickCheck, random, scheduler, splitmix, template-haskell - , unliftio-core, vector - }: - mkDerivation { - pname = "massiv"; - version = "0.5.3.2"; - sha256 = "0fprcp231ynl9rax7xniqfr8ryavcbgc0j2h6w3c11n8bnrabrrr"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions primitive - scheduler unliftio-core vector - ]; - testHaskellDepends = [ - base doctest mersenne-random-pure64 QuickCheck random splitmix - template-haskell - ]; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "massiv_0_5_4_0" = callPackage ({ mkDerivation, base, bytestring, data-default-class, deepseq , doctest, exceptions, mersenne-random-pure64, primitive , QuickCheck, random, scheduler, splitmix, template-haskell @@ -166725,30 +166978,6 @@ self: { }) {}; "massiv-test" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default - , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec - , massiv, mwc-random, primitive, QuickCheck, scheduler, unliftio - , vector - }: - mkDerivation { - pname = "massiv-test"; - version = "0.1.3.1"; - sha256 = "0nwrfxi77w2xmmy7j7fh6kb06hzhmxl8vagdb856xmr9cbq02nj5"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions hspec massiv - primitive QuickCheck scheduler unliftio vector - ]; - testHaskellDepends = [ - base bytestring containers data-default deepseq genvalidity-hspec - hspec massiv mwc-random primitive QuickCheck scheduler vector - ]; - description = "Library that contains generators, properties and tests for Massiv Array Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "massiv-test_0_1_4" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec , massiv, mwc-random, primitive, QuickCheck, scheduler, unliftio @@ -170431,35 +170660,6 @@ self: { }) {}; "mime-mail-ses" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , byteable, bytestring, case-insensitive, conduit, cryptohash - , http-client, http-client-tls, http-conduit, http-types, mime-mail - , optparse-applicative, tasty, tasty-hunit, text, time, xml-conduit - , xml-types - }: - mkDerivation { - pname = "mime-mail-ses"; - version = "0.4.2"; - sha256 = "1jiv1h9b8396nf8iqf9x11idfcrppank3gqcn6l5877893fzd9hk"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring byteable bytestring - case-insensitive conduit cryptohash http-client http-client-tls - http-conduit http-types mime-mail text time xml-conduit xml-types - ]; - executableHaskellDepends = [ - base http-client http-client-tls mime-mail optparse-applicative - text - ]; - testHaskellDepends = [ - base bytestring case-insensitive tasty tasty-hunit time - ]; - description = "Send mime-mail messages via Amazon SES"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mime-mail-ses_0_4_3" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , byteable, bytestring, case-insensitive, conduit, cryptohash , http-client, http-client-tls, http-conduit, http-types, mime-mail @@ -170486,7 +170686,6 @@ self: { ]; description = "Send mime-mail messages via Amazon SES"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime-string" = callPackage @@ -171606,8 +171805,8 @@ self: { pname = "mmark"; version = "0.0.7.2"; sha256 = "1wwszzba6fvg0r4q5z2dzashim0nkaxzx4rmjl216kdi08jkp7mm"; - revision = "2"; - editedCabalFile = "1wwcar2a5hdwac8r1c1wlqhk7dnidvq98qsgnxyhfh8iblpn81hb"; + revision = "3"; + editedCabalFile = "1ffa76pz544pa3s764lnc38rdmfccyn8z6zn1w76pqb01p0f9k9p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -171634,8 +171833,8 @@ self: { pname = "mmark-cli"; version = "0.0.5.0"; sha256 = "15qrp2q1flx9csqvj8zx9w1jqg8pwfi0v7wpia7n7vg09jgydhby"; - revision = "4"; - editedCabalFile = "1z2jfbbjimcryb44g990cnx5xvmfipy5dx6z33v2aqgpjgjn2rr5"; + revision = "5"; + editedCabalFile = "1ncyh564gk6fhirx97jnr6v2nw3k69kngxd3gbn9wbi6hm6zz238"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -172050,8 +172249,8 @@ self: { pname = "modern-uri"; version = "0.3.2.0"; sha256 = "162s88yayalh4vlngman5gz3k0gnszxrksh1wk5227qihbpsiwhb"; - revision = "1"; - editedCabalFile = "13a9wh31pm151d1xz00wp2nfs73s2ysr1g97vx91rl2caak14ab0"; + revision = "2"; + editedCabalFile = "14qxgpv72ybxrv08591ipsn5x5sdf9iflc94n9liagv5rjriy09x"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -174624,12 +174823,12 @@ self: { , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances , semigroups, show-type, singletons, syb, template-haskell, text , th-lift, th-lift-instances, time, timerep, transformers-compat - , unordered-containers, vector, vinyl, wl-pprint-text + , unordered-containers, vector, vinyl, with-utf8, wl-pprint-text }: mkDerivation { pname = "morley"; - version = "1.6.0"; - sha256 = "0i06yh7v2zz8lcjhc96k5wsfj9i401mgs05myg46ml04zz4pw408"; + version = "1.7.0"; + sha256 = "18vc9d44hjr8sadh4fhlmzw6668lbzw7a2wbsmyh817blhk9jg6k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174641,11 +174840,11 @@ self: { quickcheck-arbitrary-adt quickcheck-instances semigroups show-type singletons syb template-haskell text th-lift th-lift-instances time timerep transformers-compat unordered-containers vector vinyl - wl-pprint-text + with-utf8 wl-pprint-text ]; executableHaskellDepends = [ aeson base bytestring fmt haskeline megaparsec morley-prelude named - optparse-applicative pretty-simple text vinyl + optparse-applicative pretty-simple text vinyl with-utf8 ]; description = "Developer tools for the Michelson Language"; license = stdenv.lib.licenses.mit; @@ -182410,8 +182609,8 @@ self: { }: mkDerivation { pname = "niv"; - version = "0.2.16"; - sha256 = "0z2wws28nl7xd5fbc5za287y8ryvfrgha4qh7aahr3x1j9sywpyg"; + version = "0.2.17"; + sha256 = "0qra7rrak3g2r8irbfib6j3jdcaw8d0j6y5k12clpcn8iv0d5bgf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -183588,6 +183787,24 @@ self: { broken = true; }) {}; + "nothunks" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc-heap, ghc-prim + , hedgehog, random, tasty, tasty-hedgehog, text, time, vector + }: + mkDerivation { + pname = "nothunks"; + version = "0.1.0.0"; + sha256 = "1ygkkyl90z99xgxzjl122vqnra7jl3v5cxzrb78z4lfx2mm59yla"; + libraryHaskellDepends = [ + base bytestring containers ghc-heap text time vector + ]; + testHaskellDepends = [ + base containers ghc-prim hedgehog random tasty tasty-hedgehog text + ]; + description = "Examine values for unexpected thunks"; + license = stdenv.lib.licenses.mit; + }) {}; + "notifications-tray-icon" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers, dbus , gi-dbusmenu, gi-gio, gi-glib, github, haskeline, hslogger @@ -184581,6 +184798,8 @@ self: { pname = "nvim-hs"; version = "2.1.0.4"; sha256 = "0bg94adja6xvzlv1x849nrfpb0i5mjbp19f9cwhaa4iw1qs532rf"; + revision = "1"; + editedCabalFile = "0yzdq8nxf2n7n4ns6frgl5nhgb3vj3nkh7336mz994iydam17wcl"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -185119,6 +185338,18 @@ self: { broken = true; }) {}; + "ocap-io" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ocap-io"; + version = "0.1.0.0"; + sha256 = "0cdxdi7rllkc4f0qi73xgz5jz2h936hnzashwz3hv82br8482lyv"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Object capability based IO"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ochan" = callPackage ({ mkDerivation, async, base, bytestring, mtl, oref, text , transformers @@ -186073,7 +186304,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "opaleye_0_7_0_0" = callPackage + "opaleye_0_7_1_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -186083,8 +186314,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.7.0.0"; - sha256 = "1a4ymnfw7gdqf2b5lsrfhxf53ybjfcyx31fdxn52fv89jc2h2yiy"; + version = "0.7.1.0"; + sha256 = "0i4ndy9dd6jb4dzx8a5fv8jsmnmp7p1kx2qr012xj1qjq36sqpy6"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -186881,6 +187112,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "openssl-streams_1_2_3_0" = callPackage + ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams + , network, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "openssl-streams"; + version = "1.2.3.0"; + sha256 = "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"; + libraryHaskellDepends = [ + base bytestring HsOpenSSL io-streams network + ]; + testHaskellDepends = [ + base bytestring HsOpenSSL HUnit io-streams network test-framework + test-framework-hunit + ]; + description = "OpenSSL network support for io-streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opentelemetry" = callPackage ({ mkDerivation, base, bytestring, exceptions }: mkDerivation { @@ -188294,8 +188545,8 @@ self: { }: mkDerivation { pname = "org-mode-lucid"; - version = "1.4.0"; - sha256 = "01h8lf3cdkq5s4nx5iy2835sdbly4vrdn2ml34qgaby703drlci4"; + version = "1.5.0"; + sha256 = "1vy8agbcrd81zskfwmrmz63vdif6a2wllr910nmg0jgqxbrd8wn1"; libraryHaskellDepends = [ base containers hashable lucid org-mode text ]; @@ -189559,6 +189810,7 @@ self: { ''; description = "Conversion between markup formats"; license = stdenv.lib.licenses.gpl2Plus; + hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -190066,6 +190318,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-throw" = callPackage + ({ mkDerivation, base, exceptions, pandoc }: + mkDerivation { + pname = "pandoc-throw"; + version = "0.1.0.0"; + sha256 = "1i737mv2sgm65c53ggrxnscga92fya5khb5nhgbg1nnqgy2sjkm8"; + libraryHaskellDepends = [ base exceptions pandoc ]; + description = "MonadThrow behaviour for Pandoc"; + license = stdenv.lib.licenses.mit; + }) {}; + "pandoc-types" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb @@ -191725,8 +191988,8 @@ self: { pname = "parser-combinators-tests"; version = "1.2.1"; sha256 = "0iy4iajpjka1diy660x3mvmh8kldwf3svwdmvlxh26dsqy2s8sx8"; - revision = "1"; - editedCabalFile = "07isz6d136dkbr1aykznfi3dr3dp18x14548af207rd29x51g0di"; + revision = "2"; + editedCabalFile = "07j1y8iqljaqyqhy37db2xvs7y9z91r3sndzmz4gga7w2jpkhq2b"; isLibrary = false; isExecutable = false; testHaskellDepends = [ @@ -192527,6 +192790,17 @@ self: { broken = true; }) {}; + "path-utils" = callPackage + ({ mkDerivation, base, exceptions, path, split, text }: + mkDerivation { + pname = "path-utils"; + version = "0.1.0.0"; + sha256 = "1abva4kfmj00ahd44rgzr6mk41y84gkvc6z7vwqz7m2g3r4zsxm2"; + libraryHaskellDepends = [ base exceptions path split text ]; + description = "Handful of simple utility functions for the path library"; + license = stdenv.lib.licenses.mit; + }) {}; + "pathfinding" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -194948,6 +195222,8 @@ self: { pname = "persistent-template"; version = "2.8.2.3"; sha256 = "1y96aj5i3c1j2ls6980l8lfjj9b3vfmp3766xk5af1870vj1s1lf"; + revision = "1"; + editedCabalFile = "0ilgcn3k72b2zm53yy4na4y0f8xfrlw6s5w3xhhavg6blyw971j7"; libraryHaskellDepends = [ aeson base bytestring containers http-api-data monad-control monad-logger path-pieces persistent template-haskell text @@ -195686,6 +195962,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "phonetic-languages-ukrainian" = callPackage + ({ mkDerivation, base, mmsyn2, mmsyn5, vector }: + mkDerivation { + pname = "phonetic-languages-ukrainian"; + version = "0.2.0.0"; + sha256 = "0lx1br8az752lnnwqm3qp3z27z78922d5i03bxgzd4v6zx78iksp"; + libraryHaskellDepends = [ base mmsyn2 mmsyn5 vector ]; + description = "Prepares Ukrainian text to be used as a phonetic language text"; + license = stdenv.lib.licenses.mit; + }) {}; + "phooey" = callPackage ({ mkDerivation, array, base, mtl, reactive, TypeCompose, wx , wxcore @@ -199307,8 +199594,8 @@ self: { }: mkDerivation { pname = "polysemy-http"; - version = "0.2.0.1"; - sha256 = "0a8sq6pfwskviqkblz5i7c2f604xpkv7j07kfngci3xspbskk71v"; + version = "0.2.0.2"; + sha256 = "0ahanslhdidday6ykfcw1yshjp5yjzx5wlwwdy3csr67mnxxs44y"; libraryHaskellDepends = [ aeson ansi-terminal base-noprelude bytestring case-insensitive co-log-core co-log-polysemy composition containers data-default @@ -200441,8 +200728,8 @@ self: { }: mkDerivation { pname = "postgres-websockets"; - version = "0.8.0.1"; - sha256 = "0a56dpj90nmrinjgxaipgbsfl5ligx3iydcnijxpwy6vwbjijnmi"; + version = "0.9.0.0"; + sha256 = "1c7has1vyp8i3my5126m8ciimcyyv4prav94wpl861gz7npdqxym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206830,6 +207117,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pusher-http-haskell_2_0_0_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, hashable, hspec, http-client, http-client-tls + , http-types, memory, QuickCheck, text, time, unordered-containers + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "2.0.0.0"; + sha256 = "0q13lq2bjhw2mwsla1m6h1l6bhrwsy6iin7cprqh9bjjaqmq4dxi"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite hashable + http-client http-client-tls http-types memory text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec QuickCheck text unordered-containers + ]; + description = "Haskell client library for the Pusher Channels HTTP API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -208091,6 +208400,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-classes-base_0_6_1_0" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, containers + , contravariant, fail, QuickCheck, tagged, transformers + }: + mkDerivation { + pname = "quickcheck-classes-base"; + version = "0.6.1.0"; + sha256 = "0yzljsy74njmbav90hgraxhjx0l86zggakfw0j3k7maz9376jvax"; + libraryHaskellDepends = [ + base base-orphans bifunctors containers contravariant fail + QuickCheck tagged transformers + ]; + description = "QuickCheck common typeclasses from `base`"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-combinators" = callPackage ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { @@ -211849,35 +212175,36 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "reanimate_0_4_3_0" = callPackage + "reanimate_0_5_0_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base , base64-bytestring, bytestring, cassava, cereal, colour - , containers, cubicbezier, directory, filelock, filepath, fsnotify - , geojson, ghcid, hashable, hgeometry, hgeometry-combinatorial - , JuicyPixels, lens, linear, matrix, mtl, neat-interpolation - , open-browser, optparse-applicative, parallel, process, QuickCheck - , random, random-shuffle, reanimate-svg, split, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, tasty-rerun, temporary, text, time - , vector, vector-space, websockets, xml + , containers, cubicbezier, directory, filelock, filepath + , fingertree, fsnotify, geojson, ghcid, hashable, hgeometry + , hgeometry-combinatorial, JuicyPixels, lens, linear, matrix, mtl + , neat-interpolation, open-browser, optparse-applicative, parallel + , process, QuickCheck, random, random-shuffle, reanimate-svg, split + , tasty, tasty-expected-failure, tasty-golden, tasty-hunit + , tasty-quickcheck, tasty-rerun, temporary, text, time + , unordered-containers, vector, vector-space, websockets, xml }: mkDerivation { pname = "reanimate"; - version = "0.4.3.0"; - sha256 = "0rp9qfp8fhz6cxrw9gcva9crxpayrm7a49m1fmma1x9dw4x79b1q"; + version = "0.5.0.1"; + sha256 = "1rk28hwz30dq2162fzl98sa0kz1vpy4r3a00npw30vv3ywjm2sgz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring bytestring cassava cereal colour containers cubicbezier directory - filelock filepath fsnotify geojson ghcid hashable hgeometry - hgeometry-combinatorial JuicyPixels lens linear matrix mtl - neat-interpolation open-browser optparse-applicative parallel + filelock filepath fingertree fsnotify geojson ghcid hashable + hgeometry hgeometry-combinatorial JuicyPixels lens linear matrix + mtl neat-interpolation open-browser optparse-applicative parallel process random random-shuffle reanimate-svg split temporary text - time vector vector-space websockets xml + time unordered-containers vector vector-space websockets xml ]; testHaskellDepends = [ base bytestring directory filepath linear process QuickCheck tasty - tasty-golden tasty-hunit tasty-quickcheck tasty-rerun temporary - text vector + tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck + tasty-rerun temporary text vector ]; description = "Animation library based on SVGs"; license = stdenv.lib.licenses.publicDomain; @@ -211904,21 +212231,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "reanimate-svg_0_10_2_0" = callPackage + "reanimate-svg_0_11_0_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers - , double-conversion, hspec, JuicyPixels, lens, linear, mtl - , scientific, svg-tree, text, transformers, vector, xml + , double-conversion, hashable, JuicyPixels, lens, linear, mtl + , scientific, text, transformers, vector, xml }: mkDerivation { pname = "reanimate-svg"; - version = "0.10.2.0"; - sha256 = "0czj7yii9h24823rl2jlf8pqc670azgbzhrkbizdr2bnrz6g981g"; + version = "0.11.0.0"; + sha256 = "0cgyz2vf6yqkydxbx73blyr0fz0i50i0bdlnzs0r6ypdpsk5hqxy"; libraryHaskellDepends = [ - attoparsec base bytestring containers double-conversion JuicyPixels - lens linear mtl scientific text transformers vector xml - ]; - testHaskellDepends = [ - attoparsec base hspec linear scientific svg-tree + attoparsec base bytestring containers double-conversion hashable + JuicyPixels lens linear mtl scientific text transformers vector xml ]; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; @@ -211993,22 +212317,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rebase_1_7" = callPackage + "rebase_1_7_1_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, contravariant-extras, deepseq, dlist, either , hashable, mtl, profunctors, scientific, selective, semigroupoids - , semigroups, stm, text, time, transformers, unordered-containers - , uuid, vector, void + , stm, text, time, transformers, unordered-containers, uuid, vector + , void }: mkDerivation { pname = "rebase"; - version = "1.7"; - sha256 = "1gqdqx2sbm7hn6pyqqi65g8mwz2igsq1lz7y3qdplv2aic6myla7"; + version = "1.7.1.1"; + sha256 = "1hyh4b5dqp3lkfyafv6zm41vw9mnpvw6gb9ypwh6lwx64yipzmlx"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant contravariant-extras deepseq dlist either hashable mtl profunctors - scientific selective semigroupoids semigroups stm text time - transformers unordered-containers uuid vector void + scientific selective semigroupoids stm text time transformers + unordered-containers uuid vector void ]; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; @@ -212724,8 +213048,8 @@ self: { }: mkDerivation { pname = "ref-extras"; - version = "0.1.1"; - sha256 = "0cv8h2v7vp6gv2lslzc7rpagaa871bi5drzml3090wna1kqnd0nq"; + version = "0.2.0"; + sha256 = "17f5cjzbhx4ay7qyd5p667hmzg8ps9jnkass5mi423lzly9nyr09"; libraryHaskellDepends = [ base hashable little-rio microlens stm unliftio unliftio-core unordered-containers @@ -216020,7 +216344,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "req_3_5_0" = callPackage + "req_3_6_0" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, exceptions, hspec , hspec-core, hspec-discover, http-api-data, http-client @@ -216030,8 +216354,8 @@ self: { }: mkDerivation { pname = "req"; - version = "3.5.0"; - sha256 = "0ydz6m3d87apmkd8i55q4r57cqd65sssxz972p6vv77v3r471n26"; + version = "3.6.0"; + sha256 = "1ks9iqnnsa8m65ndyblyndb95fc4r4xachq1zrik04adxrdj3b50"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -216229,12 +216553,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rerebase_1_7" = callPackage + "rerebase_1_7_1_1" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.7"; - sha256 = "0primlvckzkz72pdm3c1y32wjbz5wmxkdwfzvxs3yg08v01hrwb7"; + version = "1.7.1.1"; + sha256 = "0jvvyqridkbcgyfisvc5c3116d2asph3vim72mvgwbd1ijs101y7"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; @@ -219520,26 +219844,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rpmbuild-order_0_4_2" = callPackage - ({ mkDerivation, base, bytestring, Cabal, case-insensitive - , containers, directory, extra, fgl, filepath, hspec - , optparse-applicative, process, simple-cmd-args, unix + "rpmbuild-order_0_4_2_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , directory, extra, fgl, filepath, hspec, optparse-applicative + , process, simple-cmd, simple-cmd-args, unix }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.2"; - sha256 = "18ay3wga9s3whky49c8v0x7drpv1sf536p4n3h1549zd5w3vjms7"; + version = "0.4.2.1"; + sha256 = "148wxcglf4jiz5s2ybw9ija33vzp0cg619dxncsmjsn9lz4c8gcf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal case-insensitive containers directory extra fgl filepath + base case-insensitive containers directory extra fgl filepath process ]; executableHaskellDepends = [ base bytestring directory extra fgl optparse-applicative simple-cmd-args ]; - testHaskellDepends = [ base extra hspec unix ]; + testHaskellDepends = [ base extra hspec simple-cmd unix ]; description = "Order RPM packages by dependencies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -220912,8 +221236,8 @@ self: { pname = "salak"; version = "0.3.6"; sha256 = "00qyd09az0ldfidfgcki8z3r9gcpxmss3iyr99as5bky29rlz9n3"; - revision = "2"; - editedCabalFile = "0azqzfw8ynbj1fzgwksx30m88zsz71vwhdlxw8fkcwbgz49vc7zb"; + revision = "3"; + editedCabalFile = "0cdp6gy3r92vhpmq2i7yg4xxmnj95dyfvaf8gm05v6wl8l6rihfy"; libraryHaskellDepends = [ base bytestring containers data-default directory dlist exceptions filepath hashable heaps megaparsec mtl scientific text time @@ -221659,8 +221983,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "0.11"; - sha256 = "19gji0aqdi232x3y3vkpblwr6y63n7in92dq48ax67h6bqxwg5g2"; + version = "0.12"; + sha256 = "1c413kqbznl1cc3l4lbpk3d8c2jzl62znf7zm89x5dcw7wyfpz0y"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -226003,28 +226327,6 @@ self: { }) {}; "servant-conduit" = callPackage - ({ mkDerivation, base, base-compat, bytestring, conduit - , http-client, http-media, mtl, resourcet, servant, servant-client - , servant-server, unliftio-core, wai, warp - }: - mkDerivation { - pname = "servant-conduit"; - version = "0.15"; - sha256 = "0mpnkqcls4mrxfd3ksy53k7vvm0hildj21b8mdy53z993wq1blfz"; - revision = "3"; - editedCabalFile = "0adximf4hg3bf7d9mkcjdsp5klg787ryb1hy3j49fg39l1rszac4"; - libraryHaskellDepends = [ - base bytestring conduit mtl resourcet servant unliftio-core - ]; - testHaskellDepends = [ - base base-compat bytestring conduit http-client http-media - resourcet servant servant-client servant-server wai warp - ]; - description = "Servant Stream support for conduit"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-conduit_0_15_1" = callPackage ({ mkDerivation, base, base-compat, bytestring, conduit , http-client, http-media, mtl, resourcet, servant, servant-client , servant-server, unliftio-core, wai, warp @@ -226042,7 +226344,6 @@ self: { ]; description = "Servant Stream support for conduit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-csharp" = callPackage @@ -226780,26 +227081,6 @@ self: { }) {}; "servant-machines" = callPackage - ({ mkDerivation, base, base-compat, bytestring, http-client - , http-media, machines, mtl, servant, servant-client - , servant-server, wai, warp - }: - mkDerivation { - pname = "servant-machines"; - version = "0.15"; - sha256 = "137c0svvwvkh3ad8cc5q5vygci3c5951hbwlhk09znqaqycck35i"; - revision = "4"; - editedCabalFile = "1p8ld4cxwsirlwz5ihrz6fyxbary4llxsnby42vjnhl19gylhdmk"; - libraryHaskellDepends = [ base bytestring machines mtl servant ]; - testHaskellDepends = [ - base base-compat bytestring http-client http-media machines servant - servant-client servant-server wai warp - ]; - description = "Servant Stream support for machines"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-machines_0_15_1" = callPackage ({ mkDerivation, base, base-compat, bytestring, http-client , http-media, machines, mtl, servant, servant-client , servant-server, wai, warp @@ -226815,7 +227096,6 @@ self: { ]; description = "Servant Stream support for machines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-match" = callPackage @@ -227053,29 +227333,6 @@ self: { }) {}; "servant-pipes" = callPackage - ({ mkDerivation, base, base-compat, bytestring, http-client - , http-media, monad-control, mtl, pipes, pipes-bytestring - , pipes-safe, servant, servant-client, servant-server, wai, warp - }: - mkDerivation { - pname = "servant-pipes"; - version = "0.15.1"; - sha256 = "1r2n7f8x7adl117zlswf4ji5yxib2v80wh7wbhwklvd86dbzyrby"; - revision = "1"; - editedCabalFile = "0xm07qxw0szffm8krbvj2kdflwlx2ixlhp5scaj3fhwivycyayvg"; - libraryHaskellDepends = [ - base bytestring monad-control mtl pipes pipes-safe servant - ]; - testHaskellDepends = [ - base base-compat bytestring http-client http-media pipes - pipes-bytestring pipes-safe servant servant-client servant-server - wai warp - ]; - description = "Servant Stream support for pipes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-pipes_0_15_2" = callPackage ({ mkDerivation, base, base-compat, bytestring, http-client , http-media, monad-control, mtl, pipes, pipes-bytestring , pipes-safe, servant, servant-client, servant-server, wai, warp @@ -227094,7 +227351,6 @@ self: { ]; description = "Servant Stream support for pipes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-pool" = callPackage @@ -227605,8 +227861,8 @@ self: { }: mkDerivation { pname = "servant-snap"; - version = "0.8.5"; - sha256 = "12ihxmi6c6zypzx6ijj0yhl0mppk40zkyhkv3g3kx3mgx50qs5yq"; + version = "0.9.0"; + sha256 = "1csfxhdfn4qchxw6n1ysj4mc4ncywdxp326nqjy4b19cxrnkgjsw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229444,14 +229700,15 @@ self: { }) {}; "shake-futhark" = callPackage - ({ mkDerivation, base, containers, filepath, futhark, shake, text + ({ mkDerivation, base, containers, directory, filepath, futhark + , shake, text }: mkDerivation { pname = "shake-futhark"; - version = "0.1.0.1"; - sha256 = "110kvha6makrirdpc3x2r2lnazy4nn2xc8s5ydaz64fx9838mlra"; + version = "0.1.0.2"; + sha256 = "1npkzgixkkkb611hhlrl1xjyp5xl27rlfqyh6q8vz4lg8fmsxsyh"; libraryHaskellDepends = [ - base containers filepath futhark shake text + base containers directory filepath futhark shake text ]; description = "Dependency tracking for Futhark"; license = stdenv.lib.licenses.bsd3; @@ -230382,10 +230639,8 @@ self: { }: mkDerivation { pname = "shh"; - version = "0.7.0.8"; - sha256 = "1f8r8wymdbv8j2m3apdw75xqq2c1s4wr694qhxljvwa9r0s326wf"; - revision = "1"; - editedCabalFile = "03gvwv2hxrp8ncfmwhp7hn8xah5mx9fgm298s83l78grqjlzdbil"; + version = "0.7.1.0"; + sha256 = "03b8h6sjnrlksvpr9f451469j5xngqpb6g3hyxmxp7h7h4xrsvq2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236762,8 +237017,8 @@ self: { }: mkDerivation { pname = "souffle-haskell"; - version = "2.0.0"; - sha256 = "0x6v1g5in762w1hhwcg5ipa0c491wp0mflqljjpl99da6kr1l93f"; + version = "2.0.1"; + sha256 = "1imnmgx2wpxx2g51ajcsvnrpwvw97wmind9wzfirfx4l7zr3cp7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -239145,8 +239400,8 @@ self: { pname = "stache"; version = "2.2.0"; sha256 = "09cfj8hs2249gqf0nrlv9b8vg8gmxabs7ndxasphxdd0rb1y3z3g"; - revision = "1"; - editedCabalFile = "12cjs085pmf52ykh24mn538wc9dvjydam6vn1rjxz03wc6mx2vf5"; + revision = "2"; + editedCabalFile = "1p435wl5c50wjz5s07p102dlyg3pby7n918gp4za0crgb8fi99xh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -241860,15 +242115,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_58_0" = callPackage + "stratosphere_0_59_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.58.0"; - sha256 = "17yi1h5rcnhvwzpd27hz5pw1dznmdhg58jwsp37bfxns0hx35ywn"; + version = "0.59.0"; + sha256 = "0k9xynh0qbnbif78air5dn6ndk3bydnbkcx0ny0hbcx1p2x3fifn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242557,6 +242812,8 @@ self: { pname = "streaming-utils"; version = "0.2.0.0"; sha256 = "05cgcypwxrhhf3xyxggwiz0v3193hf8h7vripqjam38f8ji3lxhk"; + revision = "1"; + editedCabalFile = "0wfk7bq5kpm6cn28z8mjlr1w5y2gp7bkm1xng1myy3jzyjwr68ph"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-client http-client-tls json-stream mtl network network-simple pipes resourcet streaming @@ -243649,25 +243906,6 @@ self: { }) {}; "stripe-signature" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite - , memory, stripe-concepts, text - }: - mkDerivation { - pname = "stripe-signature"; - version = "1.0.0.4"; - sha256 = "1gsw1a1x4a46fiihwqsh2706nsrjy00mv881fmc1aab7ln2cmzkg"; - libraryHaskellDepends = [ - base base16-bytestring bytestring cryptonite memory stripe-concepts - text - ]; - testHaskellDepends = [ base bytestring text ]; - description = "Verification of Stripe webhook signatures"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "stripe-signature_1_0_0_6" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite , memory, stripe-concepts, text }: @@ -244252,6 +244490,35 @@ self: { broken = true; }) {}; + "subcategories" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default, foldl + , hashable, inspection-testing, mono-traversable, pointed + , primitive, QuickCheck, reflection, semialign, tasty + , tasty-discover, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, template-haskell, text, these + , unordered-containers, vector, vector-algorithms, vector-builder + }: + mkDerivation { + pname = "subcategories"; + version = "0.1.0.0"; + sha256 = "0rrvlwfyjmv4wpvm9dbr4vxbmlr24pzdfwvz3hkshgxnrc58gslw"; + libraryHaskellDepends = [ + base containers data-default foldl hashable mono-traversable + pointed primitive reflection semialign template-haskell text these + unordered-containers vector vector-algorithms vector-builder + ]; + testHaskellDepends = [ + base bytestring containers data-default foldl hashable + inspection-testing mono-traversable pointed primitive QuickCheck + reflection semialign tasty tasty-expected-failure tasty-hunit + tasty-quickcheck template-haskell text these unordered-containers + vector vector-algorithms vector-builder + ]; + testToolDepends = [ tasty-discover ]; + description = "Subcategories induced by class constraints"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "subhask" = callPackage ({ mkDerivation, approximate, array, base, bloomfilter, bytes , bytestring, cassava, containers, criterion, deepseq, erf, gamma @@ -244985,8 +245252,8 @@ self: { pname = "supervisors"; version = "0.2.0.0"; sha256 = "0q6r211sbb9dyrplr61xajbwcfvz7z93401mhqxhw3pz55vyrg8i"; - revision = "1"; - editedCabalFile = "1p91gji7qgvash13d4c6av573czk70p89g9i4x8gnklzbrpz2qg7"; + revision = "2"; + editedCabalFile = "0pnxmbw3wb0dcbhpl583ffd991iv3zy4xf6xi5z3qhn5qh8nrmz1"; libraryHaskellDepends = [ async base containers safe-exceptions stm ]; @@ -245599,8 +245866,8 @@ self: { }: mkDerivation { pname = "swiss-ephemeris"; - version = "0.2.0.0"; - sha256 = "12va8a5brad7jqafvp1d4m3kvc0a00w2961jl0kyn4iq7kbgapdb"; + version = "1.0.0.0"; + sha256 = "0sv53h1wy0yf32hkwywigl3hpjaabslk0v6m2y2b1lc1hxnavxnv"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -247406,17 +247673,6 @@ self: { }) {}; "tabular" = callPackage - ({ mkDerivation, base, csv, html, mtl }: - mkDerivation { - pname = "tabular"; - version = "0.2.2.7"; - sha256 = "1ysgq7rrks7f98nnvxil8xz1q27hxdgz4szbjhqwzbwd209dmy0k"; - libraryHaskellDepends = [ base csv html mtl ]; - description = "Two-dimensional data tables with rendering functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tabular_0_2_2_8" = callPackage ({ mkDerivation, base, csv, html, mtl }: mkDerivation { pname = "tabular"; @@ -247425,7 +247681,6 @@ self: { libraryHaskellDepends = [ base csv html mtl ]; description = "Two-dimensional data tables with rendering functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "taffybar" = callPackage @@ -249999,17 +250254,6 @@ self: { }) {}; "template-haskell-compat-v0208" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "template-haskell-compat-v0208"; - version = "0.1.4"; - sha256 = "0byc81m07v5a765vs4jpwgmgkf54c2n5yaqz8ava1sspmmf2p9fh"; - libraryHaskellDepends = [ base template-haskell ]; - description = "A backwards compatibility layer for Template Haskell newer than 2.8"; - license = stdenv.lib.licenses.mit; - }) {}; - - "template-haskell-compat-v0208_0_1_5" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "template-haskell-compat-v0208"; @@ -250018,7 +250262,6 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "A backwards compatibility layer for Template Haskell newer than 2.8"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template-haskell-optics" = callPackage @@ -263357,8 +263600,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "uniqueness-periods-vector"; - version = "0.1.0.0"; - sha256 = "0c5ywfpcy71dqxsvsxk1xkmnhaa9fsnaypr6rnv1igiv1qc8fqkc"; + version = "0.3.0.0"; + sha256 = "139xs292irnsw7574nsrpw5dqsg0g7j71p2jvq6h2bl9wnndsi8b"; libraryHaskellDepends = [ base vector ]; description = "Generalization of the uniqueness-periods and uniqueness-periods-general packages functionality"; license = stdenv.lib.licenses.mit; @@ -263368,21 +263611,44 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "uniqueness-periods-vector-common"; - version = "0.1.0.0"; - sha256 = "0lkkanqi2l2c6fmf1nasb6kigdp0gfi9qncsl07i8jmbk6wxppss"; + version = "0.2.0.0"; + sha256 = "1qnnydvfl1ylgd2j54jyq820404pq1477qqda70bbr6y5ax2as62"; libraryHaskellDepends = [ base vector ]; description = "Generalization of the dobutokO-poetry-general package functionality"; license = stdenv.lib.licenses.mit; }) {}; + "uniqueness-periods-vector-examples" = callPackage + ({ mkDerivation, base, mmsyn6ukr, phonetic-languages-ukrainian + , print-info, uniqueness-periods-vector + , uniqueness-periods-vector-common + , uniqueness-periods-vector-general + , uniqueness-periods-vector-properties, vector + }: + mkDerivation { + pname = "uniqueness-periods-vector-examples"; + version = "0.1.0.0"; + sha256 = "151gmyq6hx61hgq5inf939dbhlc8wb2y5bw43xx11rmv77ajkf14"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base mmsyn6ukr phonetic-languages-ukrainian print-info + uniqueness-periods-vector uniqueness-periods-vector-common + uniqueness-periods-vector-general + uniqueness-periods-vector-properties vector + ]; + description = "Examples of usage for the uniqueness-periods-vector series of packages"; + license = stdenv.lib.licenses.mit; + }) {}; + "uniqueness-periods-vector-general" = callPackage ({ mkDerivation, base, print-info, uniqueness-periods-vector-common , vector }: mkDerivation { pname = "uniqueness-periods-vector-general"; - version = "0.2.0.0"; - sha256 = "0aqjj08y6jf03dcwcvshxm9vzqyk6i05758c994d0xz23pzwi2lx"; + version = "0.2.3.0"; + sha256 = "0nw03a751cyr9mw9qz0vdc284bwvw52ybw87wj3cm1l7if54qjwk"; libraryHaskellDepends = [ base print-info uniqueness-periods-vector-common vector ]; @@ -263394,10 +263660,10 @@ self: { ({ mkDerivation, base, uniqueness-periods-vector, vector }: mkDerivation { pname = "uniqueness-periods-vector-properties"; - version = "0.1.1.1"; - sha256 = "17bwchd6acnr457rhkrqsanl67nps2d6722ap781havnsvqlff0x"; + version = "0.3.1.0"; + sha256 = "0dpbda0p0f6mw5akyfvlj02ih59x0ajmbm3mnykw43xql8jvjarw"; libraryHaskellDepends = [ base uniqueness-periods-vector vector ]; - description = "Metrics for the maximum element for the uniqueness-periods-vector packages family"; + description = "Metrices for the maximum element for the uniqueness-periods-vector packages family"; license = stdenv.lib.licenses.mit; }) {}; @@ -272259,22 +272525,25 @@ self: { }) {}; "webgear-server" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-api-data, http-types - , mtl, QuickCheck, quickcheck-instances, tagged, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, unordered-containers - , wai + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , bytestring-conversion, case-insensitive, http-api-data + , http-types, mtl, network, QuickCheck, quickcheck-instances, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text + , unordered-containers, wai }: mkDerivation { pname = "webgear-server"; - version = "0.1.0"; - sha256 = "03733kxh1r3yd0hicln64mgfr41zbz7bjvddc1j8h45ppxif8xfm"; + version = "0.2.0"; + sha256 = "0fyyb4f4dab24as2dv5vbvacwcvp9bcrwyr483yiqn3fhm7975nr"; libraryHaskellDepends = [ - aeson base bytestring http-api-data http-types mtl tagged + aeson base base64-bytestring bytestring bytestring-conversion + case-insensitive http-api-data http-types mtl network template-haskell text unordered-containers wai ]; testHaskellDepends = [ - aeson base bytestring http-api-data http-types mtl QuickCheck - quickcheck-instances tagged tasty tasty-hunit tasty-quickcheck + aeson base base64-bytestring bytestring bytestring-conversion + case-insensitive http-api-data http-types mtl network QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck template-haskell text unordered-containers wai ]; description = "Composable, type-safe library to build HTTP API servers"; @@ -272658,8 +272927,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "2.1.0"; - sha256 = "0pplr61bf9b6s5wgji8s5dwpp69164zhh6skpsminf6fcpvwqwcl"; + version = "2.1.2"; + sha256 = "0jhdpv4032334ag46jm6d6nc3pdkccq74fkfzijslz798zh9sqmj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -273290,8 +273559,8 @@ self: { }: mkDerivation { pname = "winery"; - version = "1.2"; - sha256 = "13ngxcvkixd4dpwkgmiz6w6rczj9jc4hhs39sgmln7y6cb3sfkih"; + version = "1.3"; + sha256 = "0l22647x0j3487kl8f27hn31lprh0cz906h75azvgn9h8s8hpqmr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -275702,33 +275971,6 @@ self: { }) {}; "xeno" = callPackage - ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib - , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl - , mutable-containers, time, vector, weigh, xml - }: - mkDerivation { - pname = "xeno"; - version = "0.4.1"; - sha256 = "0pnmbi6w4l1i8m5vjxgxpcx98b5rphm32ykzcvgdnvahv8mrqycy"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base bytestring deepseq mtl mutable-containers vector - ]; - executableHaskellDepends = [ - base bytestring bytestring-mmap deepseq hexml time weigh - ]; - testHaskellDepends = [ base bytestring hexml hspec ]; - benchmarkHaskellDepends = [ - base bytestring bzlib criterion deepseq filepath ghc-prim hexml - hexpat weigh xml - ]; - description = "A fast event-based XML parser in pure Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xeno_0_4_2" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl , mutable-containers, time, vector, weigh, xml @@ -275748,7 +275990,6 @@ self: { ]; description = "A fast event-based XML parser in pure Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xenstore" = callPackage @@ -278211,8 +278452,8 @@ self: { }: mkDerivation { pname = "yaml-combinators"; - version = "1.1.1.2"; - sha256 = "13f5z4xq5k8ss3x0afw21cylhpmr1mzsnrj9ck5531p407rj3glw"; + version = "1.1.2"; + sha256 = "0435m79lqah778g95ds628j5bilfggzyn9hzc309xh47h4mxl92m"; libraryHaskellDepends = [ aeson base bytestring generics-sop scientific text transformers unordered-containers vector yaml @@ -279488,8 +279729,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.6.1.3"; - sha256 = "0vgxc5xsdhxws8jasngd66pmy4nmz5768fibfzn5m4dc0f5sw4mr"; + version = "0.6.1.5"; + sha256 = "1awd16wli7g746sf5aqkzb0nglcbji3pl5yyximhb2ab2gjl2ank"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -280361,8 +280602,8 @@ self: { }: mkDerivation { pname = "yesod-page-cursor"; - version = "1.0.0.1"; - sha256 = "0grh7pnzhxicanf2ipnb0ivq5lal9h42jd2kbbypgxp7qhvp69g3"; + version = "2.0.0.0"; + sha256 = "0dlr16jkv104siq7r7ff02x60dy6bvhrgq43s5g8iydc9khafai8"; libraryHaskellDepends = [ aeson base bytestring containers http-link-header network-uri text unliftio yesod-core @@ -280745,6 +280986,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-recaptcha2_1_0_1" = callPackage + ({ mkDerivation, aeson, base, classy-prelude, http-conduit + , yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-recaptcha2"; + version = "1.0.1"; + sha256 = "0mf9n016jxiq6ayq80fv9zldfjh9yskcq8p9grfr0dl8njj88yn5"; + libraryHaskellDepends = [ + aeson base classy-prelude http-conduit yesod-core yesod-form + ]; + description = "yesod recaptcha2"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-routes" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, HUnit , path-pieces, template-haskell, text, vector From d9a04576809362a3ad10eb5186277cce2138a7a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Sep 2020 17:42:22 +0200 Subject: [PATCH 04/16] haskell-gi-base: update overrides for the new version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0a61c0accb4a..250c384ebb61 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1340,7 +1340,7 @@ self: super: { # 2020-08-14: gi-pango from stackage is to old for the C libs it links against in nixpkgs. # That's why we need to bump a ton of dependency versions to unbreak them. gi-pango = assert super.gi-pango.version == "1.0.22"; self.gi-pango_1_0_23; - haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_2) [ pkgs.gobject-introspection ]; + haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_3) [ pkgs.gobject-introspection ]; haskell-gi = assert super.haskell-gi.version == "0.23.1"; self.haskell-gi_0_24_4; gi-cairo = assert super.gi-cairo.version == "1.0.23"; self.gi-cairo_1_0_24; gi-glib = assert super.gi-glib.version == "2.0.23"; self.gi-glib_2_0_24; From 88dbd029bc80273796e87384639d36ebbaed4bbf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Sep 2020 17:50:50 +0200 Subject: [PATCH 05/16] haskell-dhall: update override for ghc-8.10.2 --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 35a7d425a5b6..5b4768829431 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -66,7 +66,7 @@ self: super: { unliftio-core = doJailbreak super.unliftio-core; # Use the latest version to fix the build. - dhall = self.dhall_1_34_0; + dhall = self.dhall_1_35_0; lens = self.lens_4_19_2; optics = self.optics_0_3; optics-core = self.optics-core_0_3_0_1; From 92a2366ec2266e0eb8d3466b1ea7f6b5ea0f880c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Sep 2020 20:19:21 +0200 Subject: [PATCH 06/16] dhall-nix: update override for the new dhall version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 250c384ebb61..6acd64a625f9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -923,7 +923,7 @@ self: super: { dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json; dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" ( super.dhall-nix.overrideScope (self: super: { - dhall = super.dhall_1_34_0; + dhall = super.dhall_1_35_0; repline = self.repline_0_4_0_0; haskeline = self.haskeline_0_8_1_0; })); From d3810727cf219c045462efcd901f94640609c521 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Sep 2020 20:19:50 +0200 Subject: [PATCH 07/16] git-annex: update sha256 hash for the new 8.20200908 release --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6acd64a625f9..b4fd9ecf7faa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -69,7 +69,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1d24080xh7gl197i0y5bkn3j94hvh8zqyg9gfcnx2qdlxfca1knb"; + sha256 = "19ipaalp9g25zhg44rialwhp2fv5n8q5fzqw72rfcjcca5iy6r72"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From 10ec99b0de6446a3d2a64564019e912d15132142 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Sep 2020 20:22:06 +0200 Subject: [PATCH 08/16] haskell-lsp-test: update override for the new version --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b4fd9ecf7faa..f3c30f7fa9b2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1211,7 +1211,7 @@ self: super: { # we need an override because ghcide is tracking haskell-lsp closely. ghcide = dontCheck (appendPatch (super.ghcide.override { hie-bios = dontCheck super.hie-bios_0_7_1; - lsp-test = dontCheck self.lsp-test_0_11_0_4; + lsp-test = dontCheck self.lsp-test_0_11_0_5; }) (pkgs.fetchpatch { # This patch loosens the hie-bios upper bound. # It is already merged into upstream and won‘t be needed for ghcide 0.4.0 @@ -1480,7 +1480,7 @@ self: super: { ghcide = hls-ghcide; # we are faster than stack here hie-bios = dontCheck super.hie-bios_0_7_1; - lsp-test = dontCheck super.lsp-test_0_11_0_4; + lsp-test = dontCheck super.lsp-test_0_11_0_5; # fourmolu can‘t compile with an older aeson aeson = dontCheck super.aeson_1_5_2_0; # brittany has an aeson upper bound of 1.5 From 0e8da16ac7d21039b64a8db0dadd18592264ea0c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Sep 2020 20:54:54 +0200 Subject: [PATCH 09/16] Enable meta.hydraPlatforms for Haskell overrides to the latest version. We distribute some packages in their respective latest version even though Stackage LTS says that we should use an older one. These packages need to have their meta.hydraPlatforms attribute populated or Nixpkgs will fail to build it release tarball. This happened most recently with Pandoc, which was updated to the latest 2.10.1 version without fixing up meta.hydraPlatforms. --- .../haskell-modules/configuration-common.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f3c30f7fa9b2..dd9a9463b3c4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1459,16 +1459,16 @@ self: super: { # We want the latest version of cryptonite. This is a first step towards # resolving https://github.com/NixOS/nixpkgs/issues/81915. - cryptonite = self.cryptonite_0_27; + cryptonite = doDistribute self.cryptonite_0_27; # We want the latest version of Pandoc. - hslua = self.hslua_1_1_2; - jira-wiki-markup = self.jira-wiki-markup_1_3_2; - pandoc = self.pandoc_2_10_1; - pandoc-citeproc = self.pandoc-citeproc_0_17_0_2; - pandoc-plot = self.pandoc-plot_0_9_2_0; - pandoc-types = self.pandoc-types_1_21; - rfc5051 = self.rfc5051_0_2; + hslua = doDistribute self.hslua_1_1_2; + jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; + pandoc = doDistribute self.pandoc_2_10_1; + pandoc-citeproc = doDistribute self.pandoc-citeproc_0_17_0_2; + pandoc-plot = doDistribute self.pandoc-plot_0_9_2_0; + pandoc-types = doDistribute self.pandoc-types_1_21; + rfc5051 = doDistribute self.rfc5051_0_2; # INSERT NEW OVERRIDES ABOVE THIS LINE From e9b791e6a0a7b7cbc5bf17302cf6836bc2811007 Mon Sep 17 00:00:00 2001 From: galagora Date: Fri, 11 Sep 2020 14:10:19 +0300 Subject: [PATCH 10/16] haskell-language-server: add brittany fork --- .../haskell-modules/configuration-common.nix | 6 ++-- .../haskell-modules/non-hackage-packages.nix | 1 + .../haskell-language-server/hls-brittany.nix | 36 +++++++++++++++++++ .../haskell/haskell-language-server/update.sh | 18 ++++++++++ 4 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dd9a9463b3c4..220af3b36844 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1473,7 +1473,7 @@ self: super: { # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let - inherit (self) hls-ghcide; + inherit (self) hls-ghcide hls-brittany; hlsScopeOverride = self: super: { # haskell-language-server uses its own fork of ghcide # Test disabled: it seems to freeze (is it just that it takes a long time ?) @@ -1484,7 +1484,8 @@ self: super: { # fourmolu can‘t compile with an older aeson aeson = dontCheck super.aeson_1_5_2_0; # brittany has an aeson upper bound of 1.5 - brittany = doJailbreak super.brittany; + brittany = hls-brittany; + data-tree-print = doJailbreak super.data-tree-print; }; in { # jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357) @@ -1496,6 +1497,7 @@ self: super: { url = "https://github.com/haskell/ghcide/commit/3e1b3620948870a4da8808ca0c0897fbd3ecad16.patch"; sha256 = "1jwn7jgi740x6wwv1k0mz9d4z0b9p3mzs54pdg4nfq0h2v7zxchz"; }); + hls-brittany = dontCheck (super.hls-brittany.overrideScope hlsScopeOverride); fourmolu = super.fourmolu.overrideScope hlsScopeOverride; } ) // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index dc6dbe650614..7cd4547d9042 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -23,6 +23,7 @@ self: super: { # both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { }; hls-ghcide = self.callPackage ../tools/haskell/haskell-language-server/hls-ghcide.nix { }; + hls-brittany = self.callPackage ../tools/haskell/haskell-language-server/hls-brittany.nix { }; # cabal2nix --revision https://github.com/hasura/ci-info-hs.git ci-info = self.callPackage ../misc/haskell/hasura/ci-info {}; diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix new file mode 100644 index 000000000000..0519cf42dd8c --- /dev/null +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix @@ -0,0 +1,36 @@ +{ mkDerivation, aeson, base, butcher, bytestring, cmdargs +, containers, czipwith, data-tree-print, deepseq, directory, extra +, fetchgit, filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths +, hspec, monad-memo, mtl, multistate, parsec, pretty, random, safe +, semigroups, stdenv, strict, syb, text, transformers, uniplate +, unsafe, yaml +}: +mkDerivation { + pname = "brittany"; + version = "0.12.1.1"; + src = fetchgit { + url = "https://github.com/bubba/brittany"; + sha256 = "1rkk09f8750qykrmkqfqbh44dbx1p8aq1caznxxlw8zqfvx39cxl"; + rev = "c59655f10d5ad295c2481537fc8abf0a297d9d1c"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths monad-memo mtl multistate pretty random + safe semigroups strict syb text transformers uniplate unsafe yaml + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base butcher bytestring cmdargs containers czipwith + data-tree-print deepseq directory extra filepath ghc ghc-boot-th + ghc-exactprint ghc-paths hspec monad-memo mtl multistate parsec + pretty safe semigroups strict syb text transformers uniplate unsafe + yaml + ]; + homepage = "https://github.com/lspitzner/brittany/"; + description = "Haskell source code formatter"; + license = stdenv.lib.licenses.agpl3; +} diff --git a/pkgs/development/tools/haskell/haskell-language-server/update.sh b/pkgs/development/tools/haskell/haskell-language-server/update.sh index 2f2741e9a49a..fd22a80126d9 100755 --- a/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ b/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -7,6 +7,8 @@ # Note that you should always try building haskell-language-server after updating it here, since # some of the overrides in pkgs/development/haskell/configuration-nix.nix may # need to be updated/changed. +# +# Remember to split out different updates into multiple commits set -eo pipefail @@ -31,6 +33,22 @@ echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..." cabal2nix --revision "$ghcide_new_version" "https://github.com/haskell/ghcide" > "$ghcide_derivation_file" +# =========================== +# HLS maintainer's Brittany fork +# =========================== + +# brittany derivation created with cabal2nix. +brittany_derivation_file="${script_dir}/hls-brittany.nix" + +# This is the current revision of the brittany fork in Nixpkgs. +brittany_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$brittany_derivation_file")" + +brittany_new_version=$(curl --silent "https://api.github.com/repos/bubba/brittany/commits/ghc-8.10.1" | jq '.sha' --raw-output) + +echo "Updating haskell-language-server's brittany from old version $brittany_old_version to new version $brittany_new_version." +echo "Running cabal2nix and outputting to ${brittany_derivation_file}..." + +cabal2nix --revision "$brittany_new_version" "https://github.com/bubba/brittany" > "$brittany_derivation_file" # =========================== # HLS From 80328d9ea46a7da19db5e897eb8fcda4f2c8361e Mon Sep 17 00:00:00 2001 From: galagora Date: Fri, 11 Sep 2020 14:13:34 +0300 Subject: [PATCH 11/16] haskell-language-server: hls-ghcide 0.3.0 -> 0.4.0 The patch is merged into master --- .../haskell-modules/configuration-common.nix | 10 ++----- .../haskell-language-server/hls-ghcide.nix | 29 +++++++++---------- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 220af3b36844..95214676ad41 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1477,7 +1477,7 @@ self: super: { hlsScopeOverride = self: super: { # haskell-language-server uses its own fork of ghcide # Test disabled: it seems to freeze (is it just that it takes a long time ?) - ghcide = hls-ghcide; + ghcide = dontCheck hls-ghcide; # we are faster than stack here hie-bios = dontCheck super.hie-bios_0_7_1; lsp-test = dontCheck super.lsp-test_0_11_0_5; @@ -1490,13 +1490,7 @@ self: super: { in { # jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357) haskell-language-server = dontCheck (doJailbreak (super.haskell-language-server.overrideScope hlsScopeOverride)); - hls-ghcide = appendPatch (dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride)) - (pkgs.fetchpatch { - # This patch loosens the hie-bios upper bound. - # It is already merged into upstream and won‘t be needed for ghcide 0.4.0 - url = "https://github.com/haskell/ghcide/commit/3e1b3620948870a4da8808ca0c0897fbd3ecad16.patch"; - sha256 = "1jwn7jgi740x6wwv1k0mz9d4z0b9p3mzs54pdg4nfq0h2v7zxchz"; - }); + hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride); hls-brittany = dontCheck (super.hls-brittany.overrideScope hlsScopeOverride); fourmolu = super.fourmolu.overrideScope hlsScopeOverride; } diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix index c6a9b31fb738..af38312a3616 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix @@ -5,21 +5,20 @@ , ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev , haddock-library, hashable, haskell-lsp, haskell-lsp-types , hie-bios, hslogger, lens, lsp-test, mtl, network-uri -, opentelemetry, optparse-applicative, prettyprinter -, prettyprinter-ansi-terminal, process, QuickCheck -, quickcheck-instances, regex-tdfa, rope-utf16-splay, safe -, safe-exceptions, shake, sorted-list, stdenv, stm, syb, tasty -, tasty-expected-failure, tasty-hunit, tasty-quickcheck -, tasty-rerun, text, time, transformers, unix, unordered-containers -, utf8-string, yaml +, optparse-applicative, prettyprinter, prettyprinter-ansi-terminal +, process, QuickCheck, quickcheck-instances, regex-tdfa +, rope-utf16-splay, safe, safe-exceptions, shake, sorted-list +, stdenv, stm, syb, tasty, tasty-expected-failure, tasty-hunit +, tasty-quickcheck, tasty-rerun, text, time, transformers, unix +, unordered-containers, utf8-string, yaml }: mkDerivation { pname = "ghcide"; - version = "0.2.0"; + version = "0.3.0"; src = fetchgit { url = "https://github.com/haskell/ghcide"; - sha256 = "1zq7ngaak8il91a309rl51dghzasnk4m2sm3av6d93cyqyra1hfc"; - rev = "078e3d3c0d319f83841ccbcdc60ff5f0e243f6be"; + sha256 = "15v3g3i5v0xbq50lfvl4bv3rx01nixiqx02sddqi5lj2idgmg24g"; + rev = "96cf8c53d0bdc16d3d2cd0559b74962593ce6dc5"; fetchSubmodules = true; }; isLibrary = true; @@ -29,10 +28,10 @@ mkDerivation { containers cryptohash-sha1 data-default deepseq directory extra filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths haddock-library hashable haskell-lsp haskell-lsp-types hie-bios - hslogger mtl network-uri opentelemetry prettyprinter - prettyprinter-ansi-terminal regex-tdfa rope-utf16-splay safe - safe-exceptions shake sorted-list stm syb text time transformers - unix unordered-containers utf8-string + hslogger mtl network-uri prettyprinter prettyprinter-ansi-terminal + regex-tdfa rope-utf16-splay safe safe-exceptions shake sorted-list + stm syb text time transformers unix unordered-containers + utf8-string ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra @@ -52,7 +51,7 @@ mkDerivation { aeson base Chart Chart-diagrams diagrams diagrams-svg directory extra filepath shake text yaml ]; - homepage = "https://github.com/digital-asset/ghcide#readme"; + homepage = "https://github.com/haskell/ghcide#readme"; description = "The core of an IDE"; license = stdenv.lib.licenses.asl20; } From da9d7a4a7509c31f08d67dfcf19c379312e10ca8 Mon Sep 17 00:00:00 2001 From: galagora Date: Fri, 11 Sep 2020 14:19:04 +0300 Subject: [PATCH 12/16] haskell-language-server: ghc-exactprint update 0.6.2 -> 0.6.3.2 --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 95214676ad41..29ee9d481584 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1486,6 +1486,7 @@ self: super: { # brittany has an aeson upper bound of 1.5 brittany = hls-brittany; data-tree-print = doJailbreak super.data-tree-print; + ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_2; }; in { # jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357) From 875e9b94d0358a88bd6f4cd2a35161ee1ebce896 Mon Sep 17 00:00:00 2001 From: galagora Date: Fri, 11 Sep 2020 14:21:34 +0300 Subject: [PATCH 13/16] haskell-language-server: cb861b878a -> c476992f43 --- .../tools/haskell/haskell-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix index c29ed6ce07ef..10cfa57f9147 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -14,8 +14,8 @@ mkDerivation { version = "0.4.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "157bsq6i824bl6krw7znp0byd8ibaqsq7mfwnkl741dmrflsxpa9"; - rev = "cb861b878ae01911b066182ff0d8080050c3b2d6"; + sha256 = "1fh9k9b3880m6ql4i10yn2yanskk9xhrakrrddqvainhcf2ik8hl"; + rev = "c4576992f443a9abe48ffcfa0e2d2b9bce15d7ae"; fetchSubmodules = true; }; isLibrary = true; From 9ee19bc889dfaaecdf71392453c22ad2f3595cf7 Mon Sep 17 00:00:00 2001 From: galagora Date: Fri, 11 Sep 2020 10:05:06 +0300 Subject: [PATCH 14/16] haskellPackages.stylish-haskell: fix cabal bounds --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 29ee9d481584..79c1e003ec13 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1470,6 +1470,13 @@ self: super: { pandoc-types = doDistribute self.pandoc-types_1_21; rfc5051 = doDistribute self.rfc5051_0_2; + # Upstream forgot to change the Cabal version bounds in the test suite. + # See: https://github.com/jaspervdj/stylish-haskell/pull/297 + # Will be fixed whenever they next bump the version number + stylish-haskell = appendPatch super.stylish-haskell (pkgs.fetchpatch { + url = "https://github.com/jaspervdj/stylish-haskell/commit/9550aa1cd177aa6fe271d075177109d66a79e67f.patch"; + sha256 = "159jr80k40hdq5gpqfjknqx6vj2licx1l0f57l5r3k4264lnxjdb"; + }); # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let From 5175a8947d87ebe1ef0574beb49685eba33196dd Mon Sep 17 00:00:00 2001 From: galagora Date: Fri, 11 Sep 2020 21:13:34 +0300 Subject: [PATCH 15/16] haskell-language-server: don't test fourmolu --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 79c1e003ec13..96bf7cb70fdb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1500,6 +1500,6 @@ self: super: { haskell-language-server = dontCheck (doJailbreak (super.haskell-language-server.overrideScope hlsScopeOverride)); hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride); hls-brittany = dontCheck (super.hls-brittany.overrideScope hlsScopeOverride); - fourmolu = super.fourmolu.overrideScope hlsScopeOverride; + fourmolu = dontCheck (super.fourmolu.overrideScope hlsScopeOverride); } ) // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 5f7b5a370c3bedb52b86b12e5dd187bde05dd172 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Sep 2020 21:31:10 +0200 Subject: [PATCH 16/16] haskell-stylish-haskell: update sha256 hash for the patch --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 96bf7cb70fdb..18ec7ea30212 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1475,7 +1475,7 @@ self: super: { # Will be fixed whenever they next bump the version number stylish-haskell = appendPatch super.stylish-haskell (pkgs.fetchpatch { url = "https://github.com/jaspervdj/stylish-haskell/commit/9550aa1cd177aa6fe271d075177109d66a79e67f.patch"; - sha256 = "159jr80k40hdq5gpqfjknqx6vj2licx1l0f57l5r3k4264lnxjdb"; + sha256 = "1ffnbd2s4fx0ylnnlcyyag119yxb32p5r20b38l39lsa0jwv229f"; }); # INSERT NEW OVERRIDES ABOVE THIS LINE