From ef2eaa937346d9a7dedeff176671a7fcb5ed6efa Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Fri, 9 Oct 2020 23:16:54 +0200 Subject: [PATCH 01/23] cut-the-crap: Mark unbroken I fixed this by adding c2hs to cabal as a built tool. --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fe19ca322a3b..c77ce2f87421 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4235,7 +4235,6 @@ broken-packages: - curve25519 - curves - custom-prelude - - cut-the-crap - CV - cv-combinators - cypher From 698b39ff6c9c1041f6aa77213b5d1d000dfb1e28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 10 Oct 2020 02:31:02 +0200 Subject: [PATCH 02/23] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-17-g25ee725 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/735a8cae16befcd0fae16a7b5a44243a690348cf. --- .../haskell-modules/hackage-packages.nix | 72 +++++++++++++------ 1 file changed, 52 insertions(+), 20 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c60cc882e98e..5756be57663b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -54557,6 +54557,32 @@ self: { broken = true; }) {}; + "citeproc" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , case-insensitive, containers, data-default, Diff, directory + , file-embed, filepath, mtl, pandoc-types, pretty, rfc5051, safe + , scientific, text, timeit, transformers, uniplate, vector + , xml-conduit + }: + mkDerivation { + pname = "citeproc"; + version = "0.1"; + sha256 = "1j1jlarqgv0q8c4vvys62n8p6hsgw26xm7n83w66ab4m5wwrgn5g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring case-insensitive containers + data-default file-embed filepath pandoc-types rfc5051 safe + scientific text transformers uniplate vector xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath mtl pretty + text timeit transformers + ]; + description = "Generates citations and bibliography from CSL styles"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "citeproc-hs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , hexpat, hs-bibutils, HTTP, json, mtl, network, network-uri @@ -67107,32 +67133,34 @@ self: { "cut-the-crap" = callPackage ({ mkDerivation, base, c2hs, exceptions, generic-lens, hspec - , hspec-core, lens, optparse-applicative, pocketsphinx, QuickCheck - , quickcheck-classes, regex-tdfa, shelly, sphinxbase - , system-filepath, temporary, text, time, unliftio-core + , hspec-core, lens, network-uri, optparse-applicative, pocketsphinx + , QuickCheck, quickcheck-classes, random, regex-tdfa, shelly + , sphinxbase, system-filepath, temporary, text, time, unliftio-core }: mkDerivation { pname = "cut-the-crap"; - version = "1.4.2"; - sha256 = "16l8ar38nl2sgsbwjslhxd8z2wyjmdgmi51sic3vvyv7n6b9mr51"; + version = "2.0.0"; + sha256 = "1a4qzn56pvfrn6g78ifb67qynr5ni74qmp43gdg7x84gn1633j0s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base exceptions generic-lens lens optparse-applicative regex-tdfa - shelly system-filepath temporary text time unliftio-core + base exceptions generic-lens lens network-uri optparse-applicative + random regex-tdfa shelly system-filepath temporary text time + unliftio-core ]; libraryPkgconfigDepends = [ pocketsphinx sphinxbase ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ - base exceptions generic-lens lens optparse-applicative regex-tdfa - shelly system-filepath temporary text time unliftio-core + base exceptions generic-lens lens network-uri optparse-applicative + random regex-tdfa shelly system-filepath temporary text time + unliftio-core ]; executablePkgconfigDepends = [ pocketsphinx sphinxbase ]; executableToolDepends = [ c2hs ]; testHaskellDepends = [ - base exceptions generic-lens hspec hspec-core lens - optparse-applicative QuickCheck quickcheck-classes regex-tdfa - shelly system-filepath temporary text time unliftio-core + base exceptions generic-lens hspec hspec-core lens network-uri + optparse-applicative QuickCheck quickcheck-classes random + regex-tdfa shelly system-filepath temporary text time unliftio-core ]; testPkgconfigDepends = [ pocketsphinx sphinxbase ]; testToolDepends = [ c2hs ]; @@ -265890,8 +265918,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-properties"; - version = "0.5.2.0"; - sha256 = "04gg6mcfd27yv2305gmbw1bxcn480933h9cw16lir5swifymbzx5"; + version = "0.5.3.0"; + sha256 = "1k6rdw55myb1qi0idxk4rks9na2w36gh2pmdlx2qkr7iiqrp613g"; libraryHaskellDepends = [ base mmsyn6ukr mmsyn7s phonetic-languages-rhythmicity phonetic-languages-ukrainian uniqueness-periods-vector @@ -274236,12 +274264,16 @@ self: { }) {}; "web-plugins" = callPackage - ({ mkDerivation, base, containers, mtl, stm, text }: + ({ mkDerivation, base, binary, bytestring, containers, http-types + , mtl, stm, text + }: mkDerivation { pname = "web-plugins"; - version = "0.2.9.1"; - sha256 = "13wbfl8v5milx2s4lyiw4b44gk5syqbaaqwdxz5sclpxs2ilxvq2"; - libraryHaskellDepends = [ base containers mtl stm text ]; + version = "0.3.0"; + sha256 = "08qv5770nq5nivl03q0bdz6v0x3vvyg12q4mgxrj2kds5hkn23nd"; + libraryHaskellDepends = [ + base binary bytestring containers http-types mtl stm text + ]; description = "dynamic plugin system for web applications"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -276543,8 +276575,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.47"; - sha256 = "1p6d61zk0yr55f7mk7cv1fyjs23aximsy1ayjknvc3rwsijqx264"; + version = "0.3.48"; + sha256 = "1fg3wxhc37vl54rb2ikr2mpwdnhsmc3zw7111jignwq4q9nb8w5v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 2005dbf5a83bac383776c719c051266dd012580d Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Sat, 10 Oct 2020 12:58:11 +0200 Subject: [PATCH 03/23] Add youtube-dl to path for version 2 --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9be625683732..ad9e33042a0e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -731,7 +731,7 @@ self: super: builtins.intersectAttrs super { primitive = dontCheck super.primitive; cut-the-crap = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 ]; + let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ]; in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { postInstall = '' wrapProgram $out/bin/cut-the-crap \ From 0756b8a7bf25e7a5b4fbfa578e95a28cb5ef6380 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 10 Oct 2020 16:01:57 +0200 Subject: [PATCH 04/23] haskell-language-server: Init wrapper for multiple ghc versions at 0.5.0 (#99519) * haskell-language-server: Init wrapper for multiple ghc versions at 0.5.0 * Fix closure size * docs: Add hls section to Haskell part of manual --- doc/languages-frameworks/haskell.section.md | 33 +++++++++++ .../haskell-language-server/withWrapper.nix | 58 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 93 insertions(+) create mode 100644 pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index cba4d0561b07..c2838c733c72 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -359,6 +359,39 @@ services.hoogle = { }; ``` +### How to install haskell-language-server + +In short: Install `pkgs.haskell-language-server` and use the +`haskell-language-server-wrapper` command to run it. See the [hls +README](https://github.com/haskell/haskell-language-server) on how to configure +your text editor to use hls and how to test your setup. + +Hls needs to be compiled with the ghc version of the project you use it on. + +`pkgs.haskell-language-server` provides `haskell-language-server-wrapper`, +`haskell-language-server`, `haskell-language-server-x.x` and +`haskell-language-server-x.x.x` binaries, where `x.x.x` is the ghc version for +which it is compiled. By default it includes binaries for all ghc versions +that are provided in the binary caches. You can override that list with e.g. + +```nix +pkgs.haskell-language-server.override { supportedGhcVersions = [ "884" "901" ]; } +``` + +When you run `haskell-language-server-wrapper` it will detect the ghc version +used by the project you are working on (by asking e.g. cabal or stack) and pick +the appropriate above mentioned binary from your path. + +Be careful when installing hls globally and using a pinned nixpkgs for a Haskell +project in a nix-shell. If the nixpkgs versions deviate to much (e.g. use +different `glibc` versions) hls might fail. It is recommended to then install hls +in the nix-shell from the nixpkgs version pinned in there. + +If you know, that you only use one ghc version, e.g. in a project specific +nix-shell You can either use an override as given above or simply install +`pkgs.haskellPackages.haskell-language-server` instead of the top-level +attribute `pkgs.haskell-language-server`. + ### How to build a Haskell project using Stack [Stack](http://haskellstack.org) is a popular build tool for Haskell projects. diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix new file mode 100644 index 000000000000..09cb60901e43 --- /dev/null +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -0,0 +1,58 @@ +{ lib, supportedGhcVersions ? [ "865" "884" "8102" ], stdenv, haskellPackages +, haskell }: +# +# The recommended way to override this package is +# +# pkgs.haskell-language-server.override { supportedGhcVersions = [ "901" ]; } +# +# for example. Read more about this in the haskell-language-server section of the nixpkgs manual. +# +let + inherit (lib) concatStringsSep concatMapStringsSep take splitString; + getPackages = version: haskell.packages."ghc${version}"; + getMajorVersion = packages: + concatStringsSep "." (take 2 (splitString "." packages.ghc.version)); + tunedHls = hsPkgs: + haskell.lib.justStaticExecutables + (haskell.lib.overrideCabal hsPkgs.haskell-language-server (old: { + postInstall = '' + remove-references-to -t ${hsPkgs.ghc} $out/bin/haskell-language-server + remove-references-to -t ${hsPkgs.shake.data} $out/bin/haskell-language-server + remove-references-to -t ${hsPkgs.js-jquery.data} $out/bin/haskell-language-server + remove-references-to -t ${hsPkgs.js-dgtable.data} $out/bin/haskell-language-server + remove-references-to -t ${hsPkgs.js-flot.data} $out/bin/haskell-language-server + ''; + })); + targets = version: + let packages = getPackages version; + in [ + "haskell-language-server-${packages.ghc.version}" + "haskell-language-server-${getMajorVersion packages}" + ]; + makeSymlinks = version: + concatMapStringsSep "\n" (x: + "ln -s ${ + tunedHls (getPackages version) + }/bin/haskell-language-server $out/bin/${x}") (targets version); + pkg = tunedHls haskellPackages; +in stdenv.mkDerivation { + pname = "haskell-language-server"; + version = haskellPackages.haskell-language-server.version; + buildCommand = '' + mkdir -p $out/bin + ln -s ${pkg}/bin/haskell-language-server $out/bin/haskell-language-server + ln -s ${pkg}/bin/haskell-language-server-wrapper $out/bin/haskell-language-server-wrapper + ${concatMapStringsSep "\n" makeSymlinks supportedGhcVersions} + ''; + meta = haskellPackages.haskell-language-server.meta // { + maintainers = [ lib.maintainers.maralorn ]; + longDescription = '' + This package provides haskell-language-server, haskell-language-server-wrapper, ${ + concatMapStringsSep ", " (x: concatStringsSep ", " (targets x)) + supportedGhcVersions + }. + + You can override the list supportedGhcVersions. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e71ec4fc232..afa6ffb40c0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4340,6 +4340,8 @@ in hash-slinger = callPackage ../tools/security/hash-slinger { }; + haskell-language-server = callPackage ../development/tools/haskell/haskell-language-server/withWrapper.nix { }; + hasmail = callPackage ../applications/networking/mailreaders/hasmail { }; hal-flash = callPackage ../os-specific/linux/hal-flash { }; From a278023859b49f43e6907365a20cebd0501eb5ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Oct 2020 02:30:26 +0200 Subject: [PATCH 05/23] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-17-g25ee725 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/75f7f39925d13a958d2d82903a18980908391b40. --- .../haskell-modules/hackage-packages.nix | 273 ++++++++++++++---- 1 file changed, 222 insertions(+), 51 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5756be57663b..142286bab508 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1318,8 +1318,8 @@ self: { }: mkDerivation { pname = "BNFC"; - version = "2.8.3"; - sha256 = "00w8g0kn4sgjyiq4hykkz8k0kl5b5861v7d9g2021vca78gif6wl"; + version = "2.8.4"; + sha256 = "0z84qfpfm402fl0fpxcggr4jz2sn8cqgjy50r6xfx310g7xwdgnd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base ]; @@ -21941,8 +21941,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.1.3.0"; - sha256 = "0qcnpk2ps2m2s23fv3ydldicz93ad82xadh53wpnwi1m1dh6kjpm"; + version = "0.1.4.0"; + sha256 = "16a7bc8zm7ws3kmhrpjnvc284qq71v5y7r4x8yv268bay7q1bjga"; libraryHaskellDepends = [ base exceptions primitive stm time Z-Data ]; @@ -24515,8 +24515,8 @@ self: { }: mkDerivation { pname = "aeson-deriving"; - version = "0.1.1.1"; - sha256 = "1yqiw8imp30gv3jij4f724yi8mmf6w8fn84kmq9r7yjn7scfz4dj"; + version = "0.1.1.2"; + sha256 = "05mcsask5mhp6gqhch3nnxpcli1j6wax7x9ap1jaypyvq9bi0cxs"; libraryHaskellDepends = [ aeson base regex-tdfa text unordered-containers ]; @@ -46344,20 +46344,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bugsnag-hs_0_2_0_1" = callPackage - ({ mkDerivation, aeson, auto-update, base, bytestring, hedgehog - , http-client, stm, text, time, unordered-containers + "bugsnag-hs_0_2_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client + , text, time, unordered-containers }: mkDerivation { pname = "bugsnag-hs"; - version = "0.2.0.1"; - sha256 = "12s3swamnm9hc3fkwc2qqzr0xz41i0hkgsjmphfsb544r07cfmjn"; + version = "0.2.0.2"; + sha256 = "0rai920g05g6gs8svi10av73ynd5m6kqc5428h55nb3hgb4hm6dh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson auto-update base bytestring http-client stm text time - unordered-containers + aeson base bytestring http-client text time unordered-containers ]; - testHaskellDepends = [ aeson base bytestring hedgehog stm ]; + testHaskellDepends = [ aeson base bytestring hedgehog ]; description = "A Bugsnag client for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -56493,17 +56492,17 @@ self: { }) {inherit (pkgs) clutter; inherit (pkgs) pango;}; "cmaes" = callPackage - ({ mkDerivation, base, doctest, doctest-prop, mtl, process, random + ({ mkDerivation, base, doctest, mtl, process, QuickCheck, random , safe, strict, syb, vector }: mkDerivation { pname = "cmaes"; - version = "0.2.2.1"; - sha256 = "0r0z5rik19sd985hgdy7f00sfpqwlgzbsmkqsiywddi8nqg6qq7m"; + version = "0.2.3"; + sha256 = "1bgyrlqbbq8ff76d6lkig3ajzk2549a7wgvxsdxl76cp3ra323yf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl process safe strict syb ]; testHaskellDepends = [ - base doctest doctest-prop mtl process random syb vector + base doctest mtl process QuickCheck random syb vector ]; description = "CMA-ES wrapper in Haskell"; license = "unknown"; @@ -67166,8 +67165,6 @@ self: { testToolDepends = [ c2hs ]; description = "Cuts out uninteresting parts of videos by detecting silences"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) pocketsphinx; inherit (pkgs) sphinxbase;}; "cutter" = callPackage @@ -93152,6 +93149,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "formatting_7_0_0_1" = callPackage + ({ mkDerivation, array, base, bytestring, clock, double-conversion + , ghc-prim, hspec, integer-gmp, old-locale, scientific, text, time + , transformers + }: + mkDerivation { + pname = "formatting"; + version = "7.0.0.1"; + sha256 = "0vxp1xgg7py3s8lvs63c0961fca829b7mmvdbyhiwyqyyqy2wclg"; + libraryHaskellDepends = [ + array base bytestring clock double-conversion ghc-prim integer-gmp + old-locale scientific text time transformers + ]; + testHaskellDepends = [ + array base bytestring clock double-conversion ghc-prim hspec + integer-gmp old-locale scientific text time transformers + ]; + description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "forml" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger @@ -120922,8 +120941,8 @@ self: { }: mkDerivation { pname = "hasql-dynamic-statements"; - version = "0.2.0.3"; - sha256 = "06xmqqakwji7qy26srys7i8y3mjbyg5qjgzhs56h64ccbs352i56"; + version = "0.3"; + sha256 = "13f0gkgjn7bcxarwz8vyzfdmrz1yqh9xnard6304v4y4zhqjfyjn"; libraryHaskellDepends = [ base bytestring containers hasql hasql-implicits ptr ]; @@ -133062,8 +133081,8 @@ self: { }: mkDerivation { pname = "hs-server-starter"; - version = "0.1.1.0"; - sha256 = "1cki3c6fl7yjw9vww4h9vd68dnci5q8f5c1i3ip8kyv53s9rgbi3"; + version = "0.1.2.0"; + sha256 = "05i1arpzs2mrzgbd87k3a6dwsvf5z7r4vwd3m0m34qps3rwlk78m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory network ]; @@ -141217,6 +141236,24 @@ self: { broken = true; }) {}; + "hwk" = callPackage + ({ mkDerivation, base, directory, extra, filepath, hint, process + , simple-cmd-args + }: + mkDerivation { + pname = "hwk"; + version = "0.2.0"; + sha256 = "1a83y1xgqcxkggbhbw0rpfnjwryl5h0fv6apw86h1ynq7dhf80rd"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base directory extra filepath hint process simple-cmd-args + ]; + description = "A modern Haskell based AWK replacement"; + license = stdenv.lib.licenses.mit; + }) {}; + "hworker" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, hedis, hspec , hspec-contrib, HUnit, text, time, uuid @@ -144493,6 +144530,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "in-other-words" = callPackage + ({ mkDerivation, async, base, exceptions, hspec, hspec-discover + , monad-control, mtl, stm, transformers, transformers-base + }: + mkDerivation { + pname = "in-other-words"; + version = "0.1.0.0"; + sha256 = "06ipmkbgncsgcq5rfyn0v4plhbbrzrcx3r4xr1f3f6xv760pfyra"; + libraryHaskellDepends = [ + async base exceptions monad-control mtl stm transformers + transformers-base + ]; + testHaskellDepends = [ + async base exceptions hspec monad-control mtl stm transformers + transformers-base + ]; + testToolDepends = [ hspec-discover ]; + description = "A higher-order effect system where the sky's the limit"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "inc-ref" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -164553,6 +164611,37 @@ self: { broken = true; }) {}; + "longshot" = callPackage + ({ mkDerivation, base, base16-bytestring, blake2, blake3 + , bytestring, containers, cryptohash-sha256, cryptonite, deepseq + , docopt, memory, parallel, tasty, tasty-hunit, tasty-quickcheck + , template-haskell + }: + mkDerivation { + pname = "longshot"; + version = "0.1.0.2"; + sha256 = "19njqqd4il5gg0pg2q05scm4may9gmfflq65gdilfwcxf6jzxin6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base16-bytestring blake2 blake3 bytestring containers + cryptohash-sha256 cryptonite deepseq docopt memory parallel + template-haskell + ]; + executableHaskellDepends = [ + base base16-bytestring blake2 blake3 bytestring containers + cryptohash-sha256 cryptonite deepseq docopt memory parallel + template-haskell + ]; + testHaskellDepends = [ + base base16-bytestring blake2 blake3 bytestring containers + cryptohash-sha256 cryptonite deepseq docopt memory parallel tasty + tasty-hunit tasty-quickcheck template-haskell + ]; + description = "Fast Brute-force search using parallelism"; + license = stdenv.lib.licenses.mit; + }) {}; + "lookup-tables" = callPackage ({ mkDerivation, base, primitive, tasty, tasty-hunit , template-haskell @@ -165316,8 +165405,8 @@ self: { ({ mkDerivation, base, lucid }: mkDerivation { pname = "lucid-cdn"; - version = "0.2.0.1"; - sha256 = "1y1rszg00kb1qpwrccpjv6l0qkn8cpxawks7ylcw8sbs0h824l73"; + version = "0.2.1.0"; + sha256 = "09g98hnw1mf9wih7jpwkvy8iavas8zg672yqj406zwvg786088jf"; libraryHaskellDepends = [ base lucid ]; description = "Curated list of CDN imports for lucid"; license = stdenv.lib.licenses.mit; @@ -170891,8 +170980,8 @@ self: { }: mkDerivation { pname = "metro"; - version = "0.1.0.3"; - sha256 = "110zxqs79f8bcqx2w6c9h0snsqbzvkixpmzadmpdx13gqz32i73v"; + version = "0.1.0.4"; + sha256 = "1dnfc2nay0n51zkb9fx82yqdi5aj86lmix557w9dd5289v3r0ajb"; libraryHaskellDepends = [ base binary bytestring hashable hslogger mtl transformers unix-time unliftio unordered-containers @@ -171098,8 +171187,8 @@ self: { }: mkDerivation { pname = "micro-gateway"; - version = "1.1.0.0"; - sha256 = "1jb703vcqncxw12cmgmyg63rw6fmfa4mv1685z6vab3xzq7kvxv7"; + version = "1.1.0.1"; + sha256 = "0anph45wr8f9xkn67sssr2jm6dm2h58jzxzxxw2hfcpsqmpvm41z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185371,8 +185460,8 @@ self: { }: mkDerivation { pname = "nri-prelude"; - version = "0.1.0.2"; - sha256 = "08m3a4gk66rfzwphpcfkd3z7qbfdkrks0f2wjwz0d3mwj638gnbv"; + version = "0.1.0.3"; + sha256 = "19rbcdv21j327lffvj43jyp0wa2zbbljfs7zd842szfffzq59bkg"; libraryHaskellDepends = [ aeson ansi-terminal async auto-update base bytestring concurrent-output containers directory exceptions filepath hedgehog @@ -189039,6 +189128,24 @@ self: { broken = true; }) {}; + "oplang" = callPackage + ({ mkDerivation, base, directory, filepath, optparse-applicative + , parsec, process, text, text-builder, unordered-containers + }: + mkDerivation { + pname = "oplang"; + version = "0.1.0.0"; + sha256 = "09n4nq9wl4n3vfkh9av9i0z6gipsffsb5igs0rlcydii10hjcn89"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath optparse-applicative parsec process text + text-builder unordered-containers + ]; + description = "Compiler for OpLang, an esoteric programming language"; + license = stdenv.lib.licenses.mit; + }) {}; + "opml" = callPackage ({ mkDerivation, base, directory, xml }: mkDerivation { @@ -204377,8 +204484,8 @@ self: { }: mkDerivation { pname = "pretty-diff"; - version = "0.2.0.1"; - sha256 = "0g2n14jrmv994kd3wgyg2p52655s9fa5nibz64pdyj1dfkblg007"; + version = "0.2.0.2"; + sha256 = "0nz6shwyw6pkwd8n4rvix4fn0f5mvxx1xkc6q4k1xrg2ylg73ksv"; libraryHaskellDepends = [ base data-default Diff text ]; testHaskellDepends = [ base data-default Diff tasty tasty-hunit tasty-test-reporter text @@ -213813,7 +213920,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "reanimate_1_1_0_0" = callPackage + "reanimate_1_1_1_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base , base64-bytestring, bytestring, cassava, cereal, colour , containers, cryptohash-sha256, cubicbezier, directory, filelock @@ -213828,8 +213935,8 @@ self: { }: mkDerivation { pname = "reanimate"; - version = "1.1.0.0"; - sha256 = "0cqmmdqpfzhqwvjwga2rj94drhrc5g95ji5iia92zzqicr51rfmf"; + version = "1.1.1.0"; + sha256 = "05illhid0nnypkl7znzkmc7b3wc7lmv8jn2sdcj39xr1yr8hji7f"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring @@ -213871,18 +213978,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "reanimate-svg_0_12_2_1" = callPackage + "reanimate-svg_0_13_0_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, Diff , directory, double-conversion, filepath, hashable, JuicyPixels , lens, linear, mtl, process, QuickCheck, scientific, tasty , tasty-expected-failure, tasty-golden, tasty-hunit , tasty-quickcheck, tasty-rerun, temporary, text, transformers - , vector, xml + , typed-process, vector, xml }: mkDerivation { pname = "reanimate-svg"; - version = "0.12.2.1"; - sha256 = "1rg9zz3qnbjxv1w03jzqs7a2qjkrjm5iz6x4j2j7kh2w8x5x1h24"; + version = "0.13.0.0"; + sha256 = "0fl3rb993zihwm9vyg615x4k17rrqimjfpc7k06mb5dlgkd39f7v"; libraryHaskellDepends = [ attoparsec base bytestring containers double-conversion hashable JuicyPixels lens linear mtl scientific text transformers vector xml @@ -213890,7 +213997,7 @@ self: { testHaskellDepends = [ base bytestring Diff directory filepath linear process QuickCheck tasty tasty-expected-failure tasty-golden tasty-hunit - tasty-quickcheck tasty-rerun temporary text vector + tasty-quickcheck tasty-rerun temporary text typed-process vector ]; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; @@ -228282,6 +228389,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-docs-simple_0_3_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hspec + , hspec-core, ordered-containers, prettyprinter, raw-strings-qq + , servant, text, unordered-containers + }: + mkDerivation { + pname = "servant-docs-simple"; + version = "0.3.0.0"; + sha256 = "0nzlgb3ccycqm3v599hh7k7fk7f8wqj0r2c2ldy9fj1c55h9n8hb"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring ordered-containers prettyprinter + servant text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring hspec hspec-core + ordered-containers prettyprinter raw-strings-qq servant text + unordered-containers + ]; + description = "Generate endpoints overview for Servant API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-ede" = callPackage ({ mkDerivation, aeson, base, bytestring, ede, either, filepath , http-media, http-types, semigroups, servant, servant-server, text @@ -251487,8 +251617,8 @@ self: { }: mkDerivation { pname = "tasty-test-reporter"; - version = "0.1.1.1"; - sha256 = "005sfxxgx4dkxw0bs6b5japx0qvzs95mzz3nvpa2ycy3v25qqaad"; + version = "0.1.1.2"; + sha256 = "1v6s3dd3ynzw0690hz1abi8l2j6zlpfj61g072w176n7is6x7p73"; libraryHaskellDepends = [ ansi-terminal base concurrent-output containers directory filepath junit-xml mtl safe-exceptions stm tagged tasty text @@ -263533,6 +263663,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-of-html_1_5_2_0" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers + , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim + , hspec, QuickCheck, random, text, weigh + }: + mkDerivation { + pname = "type-of-html"; + version = "1.5.2.0"; + sha256 = "0s53panifhmyg5xda78x509jvxpbcw2kqan7y4jxa4nysgz34qhc"; + libraryHaskellDepends = [ + base bytestring containers double-conversion ghc-prim text + ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion deepseq ghc ghc-paths random + text weigh + ]; + description = "High performance type driven html generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-of-html-static" = callPackage ({ mkDerivation, base, template-haskell, type-of-html }: mkDerivation { @@ -265155,6 +265307,20 @@ self: { broken = true; }) {}; + "uncaught-exception" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "uncaught-exception"; + version = "0.1.0"; + sha256 = "176xnsfbj9xwha1s03ly7fpirgjkrp74smgrgx16v4wb0r4ifgxn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + description = "Customize uncaught exception handling"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "uncertain" = callPackage ({ mkDerivation, ad, base, base-compat, containers, free , mwc-random, primitive, transformers @@ -265868,10 +266034,15 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-examples"; - version = "0.11.0.0"; - sha256 = "17ls9n8jdwp888xb5zd4m0f8l5xddc7962aa44wnxlc24gaim436"; - isLibrary = false; + version = "0.12.1.0"; + sha256 = "03gk3lrfpn6cn2c2sb22x3baqr45alycv1y6xm26szikc6wa4w6c"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base lists-flines uniqueness-periods-vector + uniqueness-periods-vector-common + uniqueness-periods-vector-properties + ]; executableHaskellDepends = [ base lists-flines mmsyn6ukr parallel phonetic-languages-ukrainian print-info uniqueness-periods-vector @@ -265918,8 +266089,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-properties"; - version = "0.5.3.0"; - sha256 = "1k6rdw55myb1qi0idxk4rks9na2w36gh2pmdlx2qkr7iiqrp613g"; + version = "0.5.4.0"; + sha256 = "0qn8pqny73lmd9al3mlsfzs91rs2y52q1mzpc8xf3bvixhbxvmwa"; libraryHaskellDepends = [ base mmsyn6ukr mmsyn7s phonetic-languages-rhythmicity phonetic-languages-ukrainian uniqueness-periods-vector @@ -271541,8 +271712,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.8"; - sha256 = "1rrswgz7djm4zh6qx1f28lkspidip6r0mqkbk8gcfvv7vikz0vxz"; + version = "3.6.9"; + sha256 = "0h5b8sfd91yz09aws5dpwjz4vqcdsfkq4r7xk3jgc02v5f807iga"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; From 0b6c3228087b028d184323101ad87bc0d8301d97 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sun, 11 Oct 2020 14:49:23 +0300 Subject: [PATCH 06/23] haskellPackages.stylish-haskell: unpin The reason of the pinning was fixed by the 0.12 release, now 0.12.2 is released. Currently, Haskell Language Server Nix env development environment does not work, so it is essentially impossible to develop HLS under NixOS, HLS requirements of environment coerce on the stylish-haskell>=0.12 and looks at haskellPackages.stylish-haskell. M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c85245255cd0..f9d4ed7afce1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1464,14 +1464,6 @@ 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 = "1ffnbd2s4fx0ylnnlcyyag119yxb32p5r20b38l39lsa0jwv229f"; - }); - # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. domain-auth = dontCheck super.domain-auth; # INSERT NEW OVERRIDES ABOVE THIS LINE From d39865aa2945ff50db90a8e6bf140c2c09d722c8 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 11 Oct 2020 14:50:04 +0200 Subject: [PATCH 07/23] haskellPackages.neuron: Fix build --- .../haskell-modules/configuration-common.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f9d4ed7afce1..92319cc27f02 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1376,15 +1376,11 @@ self: super: { # https://github.com/jgm/commonmark-hs/issues/55 commonmark-extensions = dontCheck super.commonmark-extensions; - # Apply version-bump patch that is not contained in released version yet. - # Upstream PR: https://github.com/srid/neuron/pull/304 - neuron = appendPatch super.neuron (pkgs.fetchpatch { - url= "https://github.com/srid/neuron/commit/9ddcb7e9d63b8266d1372ef7c14c13b6b5277990.patch"; - sha256 = "01f9v3jnl05fnpd624wv3a0j5prcbnf62ysa16fbc0vabw19zv1b"; - excludes = [ "commonmark-hs/github.json" ]; - stripLen = 2; - extraPrefix = ""; - }); + + # 2020-10-11: reflex-dom-pandoc and neuron require skylighting >= 9, which we + # can‘t support, because there is no pandoc release compatible with this. + reflex-dom-pandoc = doJailbreak super.reflex-dom-pandoc; + neuron = doJailbreak super.neuron; # Testsuite trying to run `which haskeline-examples-Test` haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0; From c82027ce59a134c6d5c54df56ce1b0ba0e905d34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Oct 2020 02:30:27 +0200 Subject: [PATCH 08/23] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-17-g25ee725 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/8b3f65e1e5f8b0cd7b131867c096917a0d0484f7. --- .../haskell-modules/hackage-packages.nix | 285 +++++++++++++----- 1 file changed, 216 insertions(+), 69 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 142286bab508..559bd7537986 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24449,6 +24449,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-combinators_0_0_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest, fail + , hspec, scientific, text, time, time-compat, unordered-containers + , utf8-string, uuid-types, vector, void + }: + mkDerivation { + pname = "aeson-combinators"; + version = "0.0.3.0"; + sha256 = "0x8bk7jxrg8j1zk5047sf5i6fy6hahjzrfnyzgwv1l443z4v445n"; + libraryHaskellDepends = [ + aeson base bytestring containers fail scientific text time + time-compat unordered-containers uuid-types vector void + ]; + testHaskellDepends = [ + aeson base bytestring doctest hspec text utf8-string + ]; + description = "Aeson combinators for dead simple JSON decoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-compat" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base , base-compat, base-orphans, bytestring, containers, exceptions @@ -32160,8 +32181,8 @@ self: { }: mkDerivation { pname = "arch-hs"; - version = "0.2.0.0"; - sha256 = "08pjfjmj21i1scf4hnhm872wjhkqw9jkk4pgri9yn77kgf76kyf8"; + version = "0.3.0.0"; + sha256 = "068si2cq7557rp86ni5psaig7z89vq38p56743l8yk92i1x1xz9j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54139,6 +54160,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "churros" = callPackage + ({ mkDerivation, async, base, containers, doctest, random, stm + , time + }: + mkDerivation { + pname = "churros"; + version = "0.1.0.2"; + sha256 = "0vqr16bwhi3rhj29s213y9xyzaankihf23m7gj6zhk7yqdqwibwv"; + libraryHaskellDepends = [ async base containers random stm time ]; + testHaskellDepends = [ + async base containers doctest random stm time + ]; + description = "Channel/Arrow based streaming computation library"; + license = stdenv.lib.licenses.mit; + }) {}; + "cielo" = callPackage ({ mkDerivation, aeson, base, bytestring, convertible, data-default , hspec, http-client, http-types, lens, mtl, pretty-show @@ -58473,21 +58510,16 @@ self: { }) {}; "commander-cli" = callPackage - ({ mkDerivation, base, bytestring, commandert, containers - , directory, mtl, process, text, unordered-containers + ({ mkDerivation, base, bytestring, commandert, containers, mtl + , text, unordered-containers }: mkDerivation { pname = "commander-cli"; - version = "0.10.1.1"; - sha256 = "04w8wlbxykp7jl5h76p9pgsg0h3qv94azalhma3f13r3zb5086x6"; - isLibrary = true; - isExecutable = true; + version = "0.10.1.2"; + sha256 = "0hkz657j9rpmda1rr4v7696216xxwjwpzgc5npg5ajhdk74w1vz0"; libraryHaskellDepends = [ base bytestring commandert containers mtl text unordered-containers ]; - executableHaskellDepends = [ - base commandert directory mtl process text - ]; testHaskellDepends = [ base commandert text unordered-containers ]; description = "A command line argument/option parser library"; license = stdenv.lib.licenses.mit; @@ -67138,8 +67170,8 @@ self: { }: mkDerivation { pname = "cut-the-crap"; - version = "2.0.0"; - sha256 = "1a4qzn56pvfrn6g78ifb67qynr5ni74qmp43gdg7x84gn1633j0s"; + version = "2.1.1"; + sha256 = "0w0ir436gmh3d9ycdcjyxkgblrah7ij5njqmm44lx1kyhih6bk2x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91365,6 +91397,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "flat-mcmc_1_5_2" = callPackage + ({ mkDerivation, base, formatting, mcmc-types, monad-par + , monad-par-extras, mwc-probability, pipes, primitive, text + , transformers, vector + }: + mkDerivation { + pname = "flat-mcmc"; + version = "1.5.2"; + sha256 = "13xdmiw96hb0iw87bzyks5bm58rgcv348aj09ax7gy2qjpq969iv"; + libraryHaskellDepends = [ + base formatting mcmc-types monad-par monad-par-extras + mwc-probability pipes primitive text transformers vector + ]; + testHaskellDepends = [ base vector ]; + description = "Painless general-purpose sampling"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "flat-tex" = callPackage ({ mkDerivation, base, directory, parsec }: mkDerivation { @@ -93149,22 +93200,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "formatting_7_0_0_1" = callPackage - ({ mkDerivation, array, base, bytestring, clock, double-conversion - , ghc-prim, hspec, integer-gmp, old-locale, scientific, text, time - , transformers + "formatting_7_0_0_2" = callPackage + ({ mkDerivation, base, clock, double-conversion, ghc-prim, hspec + , integer-gmp, old-locale, scientific, text, time, transformers }: mkDerivation { pname = "formatting"; - version = "7.0.0.1"; - sha256 = "0vxp1xgg7py3s8lvs63c0961fca829b7mmvdbyhiwyqyyqy2wclg"; + version = "7.0.0.2"; + sha256 = "1yam1lniqlmvdq2nsg7hmw9mzpfv37ldyg0izi8869iwl63j87gh"; libraryHaskellDepends = [ - array base bytestring clock double-conversion ghc-prim integer-gmp - old-locale scientific text time transformers + base clock double-conversion ghc-prim integer-gmp old-locale + scientific text time transformers ]; testHaskellDepends = [ - array base bytestring clock double-conversion ghc-prim hspec - integer-gmp old-locale scientific text time transformers + base clock double-conversion ghc-prim hspec integer-gmp old-locale + scientific text time transformers ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; license = stdenv.lib.licenses.bsd3; @@ -123604,6 +123654,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_12_15" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, doctest, errors, exceptions, HTTP, HUnit, mtl, network + , network-uri, resource-pool, scanner, stm, test-framework + , test-framework-hunit, text, time, tls, unordered-containers + , vector + }: + mkDerivation { + pname = "hedis"; + version = "0.12.15"; + sha256 = "0zkavyx4nbdrwl5sywl2rn9lmakpfw2jgs8sjqzjsnnkbk62i33j"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing deepseq errors exceptions + HTTP mtl network network-uri resource-pool scanner stm text time + tls unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring doctest HUnit mtl stm test-framework + test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -124767,6 +124843,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "heterocephalus_1_0_5_4" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist + , doctest, Glob, mtl, parsec, shakespeare, template-haskell, text + , transformers + }: + mkDerivation { + pname = "heterocephalus"; + version = "1.0.5.4"; + sha256 = "06fv3bhnj80cjli1v2drkpkmx76i81cpawlci7agcxxd8fd8zplc"; + libraryHaskellDepends = [ + base blaze-html blaze-markup containers dlist mtl parsec + shakespeare template-haskell text transformers + ]; + testHaskellDepends = [ base doctest Glob ]; + description = "A type-safe template engine for working with front end development tools"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heterogeneous-list-literals" = callPackage ({ mkDerivation, base, Only }: mkDerivation { @@ -136793,20 +136888,21 @@ self: { }) {}; "hstar" = callPackage - ({ mkDerivation, archive-libarchive, archive-sig, base, brotli - , bytestring, bz2, cpphs, lz4-hs, lzlib, lzma, lzo - , optparse-applicative, zlib, zstd + ({ mkDerivation, base, brotli, bytestring, bz2, composition-prelude + , cpphs, dir-traverse, libarchive, lz4-hs, lzlib, lzma, lzo + , optparse-applicative, process, zlib, zstd }: mkDerivation { pname = "hstar"; - version = "0.1.0.4"; - sha256 = "1c28xbcg8lmh7zkpl8xpg30niv6adjk8zggwcxi72ylb9z2y3fqr"; + version = "0.1.0.5"; + sha256 = "1cp7g4c38psfb9nlq8481dqazl7shy8zswli7058mgyf2xbalw0y"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - archive-libarchive archive-sig base brotli bytestring bz2 lz4-hs - lzlib lzma lzo optparse-applicative zlib zstd + base brotli bytestring bz2 composition-prelude dir-traverse + libarchive lz4-hs lzlib lzma lzo optparse-applicative process zlib + zstd ]; executableToolDepends = [ cpphs ]; description = "Haskell version of tar CLI utility"; @@ -141237,20 +141333,20 @@ self: { }) {}; "hwk" = callPackage - ({ mkDerivation, base, directory, extra, filepath, hint, process + ({ mkDerivation, base, directory, extra, filepath, hint , simple-cmd-args }: mkDerivation { pname = "hwk"; - version = "0.2.0"; - sha256 = "1a83y1xgqcxkggbhbw0rpfnjwryl5h0fv6apw86h1ynq7dhf80rd"; + version = "0.3"; + sha256 = "16pi48bgxgh3qcbrhyjg6r477yn2qzyzx6gizwf8q6h0da4qzp8i"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base directory extra filepath hint process simple-cmd-args + base directory extra filepath hint simple-cmd-args ]; - description = "A modern Haskell based AWK replacement"; + description = "Simple Haskell-based awk-like tool"; license = stdenv.lib.licenses.mit; }) {}; @@ -145544,6 +145640,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inline-c_0_9_1_3" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq + , regex-posix, split, template-haskell, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "inline-c"; + version = "0.9.1.3"; + sha256 = "1b2dcyg6b15q5n7k9k391y78wblqlvkrwxr8hbnp0y6x8h8l8ma8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring containers hashable mtl parsec + parsers template-haskell transformers unordered-containers vector + ]; + testHaskellDepends = [ + ansi-wl-pprint base containers hashable hspec parsers QuickCheck + raw-strings-qq regex-posix split template-haskell transformers + unordered-containers vector + ]; + description = "Write Haskell source files including C code inline. No FFI required."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-c-cpp_0_1_0_0" = callPackage ({ mkDerivation, base, inline-c, template-haskell }: mkDerivation { @@ -164619,8 +164741,8 @@ self: { }: mkDerivation { pname = "longshot"; - version = "0.1.0.2"; - sha256 = "19njqqd4il5gg0pg2q05scm4may9gmfflq65gdilfwcxf6jzxin6"; + version = "0.1.0.3"; + sha256 = "1w3fkbz900aj6dwqnbg6miv1wv3vlka7ri94fny34gjyl1da30cl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191259,13 +191381,13 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_10_1" = callPackage + "pandoc_2_11" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , case-insensitive, commonmark, commonmark-extensions + , case-insensitive, citeproc, commonmark, commonmark-extensions , commonmark-pandoc, connection, containers, criterion , data-default, deepseq, Diff, directory, doclayout, doctemplates - , emojis, exceptions, executable-path, filepath, Glob + , emojis, exceptions, executable-path, file-embed, filepath, Glob , haddock-library, hslua, hslua-module-system, hslua-module-text , HsYAML, HTTP, http-client, http-client-tls, http-types, ipynb , jira-wiki-markup, JuicyPixels, mtl, network, network-uri @@ -191278,24 +191400,24 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.10.1"; - sha256 = "16i2sc5nf2gx5aykbd0jmbjcj2ivj5941bvkdj4dxlvy1adlr2lk"; + version = "2.11"; + sha256 = "1d0rywdwcr81h45ha53x35jjj8lyzwdc3wang395wxwxbl811l7w"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base base64-bytestring binary - blaze-html blaze-markup bytestring case-insensitive commonmark - commonmark-extensions commonmark-pandoc connection containers - data-default deepseq directory doclayout doctemplates emojis - exceptions filepath Glob haddock-library hslua hslua-module-system - hslua-module-text HsYAML HTTP http-client http-client-tls - http-types ipynb jira-wiki-markup JuicyPixels mtl network - network-uri pandoc-types parsec process random safe scientific SHA - skylighting skylighting-core split syb tagsoup temporary texmath - text text-conversions time unicode-transforms unix - unordered-containers xml zip-archive zlib + blaze-html blaze-markup bytestring case-insensitive citeproc + commonmark commonmark-extensions commonmark-pandoc connection + containers data-default deepseq directory doclayout doctemplates + emojis exceptions file-embed filepath Glob haddock-library hslua + hslua-module-system hslua-module-text HsYAML HTTP http-client + http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mtl + network network-uri pandoc-types parsec process random safe + scientific SHA skylighting skylighting-core split syb tagsoup + temporary texmath text text-conversions time unicode-transforms + unix unordered-containers xml zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -191721,23 +191843,24 @@ self: { broken = true; }) {}; - "pandoc-plot_0_9_4_0" = callPackage + "pandoc-plot_1_0_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, directory, filepath, githash, hashable, hspec - , hspec-expectations, lifted-async, mtl, optparse-applicative - , pandoc, pandoc-types, shakespeare, tagsoup, tasty, tasty-hspec - , tasty-hunit, template-haskell, text, typed-process, yaml + , hspec-expectations, lifted-async, lifted-base, mtl + , optparse-applicative, pandoc, pandoc-types, shakespeare, tagsoup + , tasty, tasty-hspec, tasty-hunit, template-haskell, text + , typed-process, yaml }: mkDerivation { pname = "pandoc-plot"; - version = "0.9.4.0"; - sha256 = "0fa4aka5niydhm3jhiywjycj5hwhsy6nlg0nwy1n459pdr93ivyc"; + version = "1.0.0.0"; + sha256 = "1vls3xvj8zijl6sd698f8jljqslm4jnk07v8vzlm0s2gab2lcgmj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers data-default directory filepath hashable - lifted-async mtl pandoc pandoc-types shakespeare tagsoup text - typed-process yaml + lifted-async lifted-base mtl pandoc pandoc-types shakespeare + tagsoup text typed-process yaml ]; executableHaskellDepends = [ base containers directory filepath githash optparse-applicative @@ -194231,8 +194354,8 @@ self: { ({ mkDerivation, base, dhall, either, path, text }: mkDerivation { pname = "path-dhall-instance"; - version = "0.2.0.0"; - sha256 = "084vwqp8qmz0llwdfhls4sg9qbyn17mhbsxskjq4cpjk08xp10d5"; + version = "0.2.1.0"; + sha256 = "17igz9936lfivph9rr04075sp7ik5k8byljw2vj0zx8lnznjwn6a"; libraryHaskellDepends = [ base dhall either path text ]; description = "ToDhall and FromDhall instances for Path"; license = stdenv.lib.licenses.mit; @@ -206430,14 +206553,14 @@ self: { , optparse-applicative, parallel, parser-combinators, path-pieces , QuickCheck, quickcheck-instances, random, random-shuffle , resourcet, rset, scotty, semigroups, stm, stm-containers - , template-haskell, temporary, text, time, transformers, unix - , unordered-containers, uuid, vector, vector-binary-instances - , websockets, zlib + , template-haskell, temporary, text, text-manipulate, time + , transformers, unix, unordered-containers, uuid, vector + , vector-binary-instances, websockets, zlib }: mkDerivation { pname = "project-m36"; - version = "0.8"; - sha256 = "0rc5vixyaakh9avsn4xwf1phqm1298z8d81xwxllas0wq5cbyvl3"; + version = "0.8.1"; + sha256 = "10by97f23pbl7hdwgc0609qxfyl7fak28n0nvvzb51q282w7f22h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206451,8 +206574,8 @@ self: { MonadRandom mtl network-transport network-transport-tcp old-locale optparse-applicative parallel path-pieces QuickCheck quickcheck-instances random-shuffle resourcet rset semigroups stm - stm-containers temporary text time transformers unix - unordered-containers uuid vector vector-binary-instances zlib + stm-containers temporary text text-manipulate time transformers + unix unordered-containers uuid vector vector-binary-instances zlib ]; executableHaskellDepends = [ aeson attoparsec base base64-bytestring binary blaze-html @@ -263362,6 +263485,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-fun_0_1_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "type-fun"; + version = "0.1.2"; + sha256 = "1qb9h6x1npq1pc8h7n6ism5a6jccysn76czqym1f69x0qh1jjlay"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Collection of widely reimplemented type families"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-functions" = callPackage ({ mkDerivation, base, kinds }: mkDerivation { @@ -266755,6 +266891,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unliftio-path" = callPackage + ({ mkDerivation, base, exceptions, path, time, unliftio }: + mkDerivation { + pname = "unliftio-path"; + version = "0.0.2.0"; + sha256 = "1ila58yyk2vfshaz6d5kp4vdcgjrlnwnqnrjm949qlcv36srvzg9"; + libraryHaskellDepends = [ base exceptions path time unliftio ]; + description = "UnliftIO using well-typed Paths"; + license = stdenv.lib.licenses.mit; + }) {}; + "unliftio-pool" = callPackage ({ mkDerivation, base, resource-pool, time, transformers , unliftio-core From 8c5302f58d73bb76f1137cda8f3ff7a2f89efd9a Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 4 Oct 2020 22:37:55 -0400 Subject: [PATCH 09/23] Unbreak haskellPackages.hpack-dhall --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 92319cc27f02..4fb510efed0b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -137,6 +137,14 @@ self: super: { then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit else super.halive; + # Test suite fails due golden tests checking text representation + # of normalized dhall expressions, and newer dhall versions format + # differently. + hpack-dhall = + if pkgs.lib.versionOlder "0.5.2" super.hpack-dhall.version + then throw "Drop dontCheck override for hpack-dhall > 0.5.2" + else dontCheck super.hpack-dhall; + barbly = addBuildDepend super.barbly pkgs.darwin.apple_sdk.frameworks.AppKit; # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c77ce2f87421..59258182b994 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6357,7 +6357,6 @@ broken-packages: - hp2any-graph - hp2any-manager - hpack-convert - - hpack-dhall - hpaco - hpaco-lib - hpage From de1a1ca07309be774e5f697cf0bcc1a465572012 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 14 Oct 2020 21:41:10 +0200 Subject: [PATCH 10/23] haskellPackages.optparse-applicative: Fix for compgen error --- .../development/haskell-modules/configuration-common.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4fb510efed0b..e17a1217d466 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -77,6 +77,15 @@ self: super: { hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; }; + # Backport fix for bash: compgen: command not found + # which happens in nix-shell when a non-interactive bash is on PATH + # PR to master: https://github.com/pcapriotti/optparse-applicative/pull/408 + optparse-applicative = appendPatch super.optparse-applicative (pkgs.fetchpatch { + name = "optparse-applicative-0.15.1-hercules-ci-compgen.diff"; + url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff"; + sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql"; + }); + # Fix test trying to access /home directory shell-conduit = overrideCabal super.shell-conduit (drv: { postPatch = "sed -i s/home/tmp/ test/Spec.hs"; From 8ff4da09f3072bb6a2c71e70962adc5bcf99f72b Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 15 Oct 2020 23:09:17 +0200 Subject: [PATCH 11/23] haskellPackages.pandoc: Update to 2.11 --- .../haskell-modules/configuration-common.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e17a1217d466..6ecb4e016897 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1393,12 +1393,6 @@ self: super: { # https://github.com/jgm/commonmark-hs/issues/55 commonmark-extensions = dontCheck super.commonmark-extensions; - - # 2020-10-11: reflex-dom-pandoc and neuron require skylighting >= 9, which we - # can‘t support, because there is no pandoc release compatible with this. - reflex-dom-pandoc = doJailbreak super.reflex-dom-pandoc; - neuron = doJailbreak super.neuron; - # Testsuite trying to run `which haskeline-examples-Test` haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0; @@ -1470,11 +1464,14 @@ self: super: { cryptonite = doDistribute self.cryptonite_0_27; # We want the latest version of Pandoc. + skylighting = doDistribute super.skylighting_0_10_0_2; + skylighting-core = doDistribute super.skylighting-core_0_10_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-types = doDistribute self.pandoc-types_1_21; + pandoc = doDistribute self.pandoc_2_11; + # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc + pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2); + pandoc-types = doDistribute self.pandoc-types_1_22; rfc5051 = doDistribute self.rfc5051_0_2; # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. From c6843cc858b6c0b64f6dddbc6da392eef843b2bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 02:30:27 +0200 Subject: [PATCH 12/23] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-17-g25ee725 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/bf92981c5ae231d05d4942efee77c9fb073d0019. --- .../haskell-modules/hackage-packages.nix | 1016 +++++++++++++---- 1 file changed, 778 insertions(+), 238 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 559bd7537986..8112e540e612 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -21914,15 +21914,15 @@ self: { ({ mkDerivation, base, case-insensitive, deepseq, ghc-prim , hashable, hspec, hspec-discover, HUnit, integer-gmp, primitive , QuickCheck, quickcheck-instances, scientific, tagged - , template-haskell, time, unordered-containers, word8 + , template-haskell, unordered-containers, word8 }: mkDerivation { pname = "Z-Data"; - version = "0.1.6.0"; - sha256 = "1mj36swz2fqqch2m08pzy222ml49qvb2nr75sj6v8cmxwis07a5q"; + version = "0.1.7.0"; + sha256 = "1n34zck9z53yga1yak4k8chva6kilfbkaghzkxwif112k1qxgv4a"; libraryHaskellDepends = [ base case-insensitive deepseq ghc-prim hashable integer-gmp - primitive QuickCheck scientific tagged template-haskell time + primitive QuickCheck scientific tagged template-haskell unordered-containers ]; libraryToolDepends = [ hspec-discover ]; @@ -21941,8 +21941,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.1.4.0"; - sha256 = "16a7bc8zm7ws3kmhrpjnvc284qq71v5y7r4x8yv268bay7q1bjga"; + version = "0.1.5.2"; + sha256 = "05dkfbnj1kry6c32xdiv1fdlxd2a2z7ma4zk5gisnx5kmshyw75p"; libraryHaskellDepends = [ base exceptions primitive stm time Z-Data ]; @@ -23878,6 +23878,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ad_4_4_1" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad + , containers, criterion, data-reify, directory, doctest, erf + , filepath, free, nats, reflection, semigroups, transformers + }: + mkDerivation { + pname = "ad"; + version = "4.4.1"; + sha256 = "1afpqk0my4n50xvq9f0rhcs8kzy3w1xxjql462xc0mvvhsgp6s6g"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base comonad containers data-reify erf free nats reflection + semigroups transformers + ]; + testHaskellDepends = [ base directory doctest filepath ]; + benchmarkHaskellDepends = [ base criterion erf ]; + description = "Automatic Differentiation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "adaptive-containers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -24470,6 +24491,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-commit" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, containers, hspec, mtl + , some, tasty, tasty-hspec, text, transformers + }: + mkDerivation { + pname = "aeson-commit"; + version = "1.1"; + sha256 = "09rshnxziav4kwvalq2p059bgv9q2lqdac6f4ks8s7lxgmsmyh3z"; + libraryHaskellDepends = [ aeson base mtl text ]; + testHaskellDepends = [ + aeson aeson-qq base containers hspec mtl some tasty tasty-hspec + text transformers + ]; + description = "Parse Aeson data with commitment"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-compat" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base , base-compat, base-orphans, bytestring, containers, exceptions @@ -37508,8 +37546,8 @@ self: { ({ mkDerivation, barbies, base, split, template-haskell }: mkDerivation { pname = "barbies-th"; - version = "0.1.4"; - sha256 = "0pzlak3fdbqjs8q5wr11sra3gkjsp2z22b6yy38pmrlzs1phln91"; + version = "0.1.5"; + sha256 = "0bjbvamihrwh4l5zs8fnk2iq98fd1d2xkfbsvp6spfcp1ynqlj6k"; libraryHaskellDepends = [ barbies base split template-haskell ]; testHaskellDepends = [ barbies base ]; description = "Create strippable HKD via TH"; @@ -45671,8 +45709,8 @@ self: { pname = "broadcast-chan"; version = "0.2.1.1"; sha256 = "01r57v2ghfkv37cwh64zs1lrz1rd7is3pa5k7y8h16ws1ddglirg"; - revision = "1"; - editedCabalFile = "1kmnsnyb4gz70bka30l35lgm5k131d8lc1hm4b23aml2yskx3m54"; + revision = "2"; + editedCabalFile = "0zpbfdgxs3b7wx2qgvrs5y01z8lzvww2b7bmyrg5cj6p5xznllk1"; libraryHaskellDepends = [ base transformers unliftio-core ]; benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; @@ -45687,6 +45725,8 @@ self: { pname = "broadcast-chan-conduit"; version = "0.2.1.1"; sha256 = "0w0f4skprhnm1x4vzchkgjgjljzqizpb678251jgj65jsg1mnyfc"; + revision = "1"; + editedCabalFile = "0pk09frf24jg2id13l1nx47wwvf2z4qjqv17y7ji036iwp9xk6nw"; libraryHaskellDepends = [ base broadcast-chan conduit resourcet transformers unliftio-core ]; @@ -45705,6 +45745,8 @@ self: { pname = "broadcast-chan-pipes"; version = "0.2.1"; sha256 = "0yifpd97cihagflmh0xs0wcl541k89hick4h9hh8zrah72g71fqr"; + revision = "1"; + editedCabalFile = "0zz05sc0ny5czzyw71c1fdzlfawjwhznbr8z683bf83821ra5fcv"; libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ]; testHaskellDepends = [ base broadcast-chan-tests containers foldl pipes pipes-safe @@ -45723,6 +45765,8 @@ self: { pname = "broadcast-chan-tests"; version = "0.2.1.1"; sha256 = "0qx8j9sfky5qvrxrn4is9sja4qh6jh7jahq3zkyyq3a54jkwc8d3"; + revision = "2"; + editedCabalFile = "0dc7drwischhs0k95hjrlssxlqdg3ickrbbrki7wjslmk8k00bki"; libraryHaskellDepends = [ async base broadcast-chan clock containers optparse-applicative paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis @@ -46365,14 +46409,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bugsnag-hs_0_2_0_2" = callPackage + "bugsnag-hs_0_2_0_3" = callPackage ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client , text, time, unordered-containers }: mkDerivation { pname = "bugsnag-hs"; - version = "0.2.0.2"; - sha256 = "0rai920g05g6gs8svi10av73ynd5m6kqc5428h55nb3hgb4hm6dh"; + version = "0.2.0.3"; + sha256 = "0jxanklslf0gjw4gb01yz03p2haxmnrmr5wry451lff17azxwlg5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring http-client text time unordered-containers @@ -47185,11 +47229,11 @@ self: { }: mkDerivation { pname = "byteslice"; - version = "0.2.3.0"; - sha256 = "1xbsnlryx9ggvp46kv6m0f4hf9vs0bc2ia13jym9aji5rd7qvyfp"; + version = "0.2.4.0"; + sha256 = "0f2dw5kf9gg41ns5hb0aarrv24yqv9cdzgl9hgdcf8jj5j3qj6di"; libraryHaskellDepends = [ - base primitive primitive-addr primitive-unlifted run-st tuples - vector + base bytestring primitive primitive-addr primitive-unlifted run-st + tuples vector ]; testHaskellDepends = [ base bytestring primitive quickcheck-classes tasty tasty-hunit @@ -49941,8 +49985,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.20.1"; - sha256 = "0nh9x2w8xrmbrkadawq0ab6pvp4v14pr49x18sq9qhi0m922b0p0"; + version = "0.1.21.0"; + sha256 = "0hh3kfcs2wjmkz8ggzshb1535rz13nl1d9yaa73rm2arn73jfsi1"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-core di-polysemy @@ -50523,8 +50567,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.6.0.2"; - sha256 = "15dgnrwwsjkf8kis4yknmk6bcxwsyxhabik5j3s0mx4fniabdymc"; + version = "0.6.0.3"; + sha256 = "0zrga41zk41881kr79grdwzl5caawv3khnvpbkhmhfzq3snmnhgd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54162,15 +54206,17 @@ self: { "churros" = callPackage ({ mkDerivation, async, base, containers, doctest, random, stm - , time + , time, unagi-chan }: mkDerivation { pname = "churros"; - version = "0.1.0.2"; - sha256 = "0vqr16bwhi3rhj29s213y9xyzaankihf23m7gj6zhk7yqdqwibwv"; - libraryHaskellDepends = [ async base containers random stm time ]; + version = "0.1.2.0"; + sha256 = "0djfcvr81gl6lcz8pb3v0432jh49v8phwp513ca1fz1i75a2nx43"; + libraryHaskellDepends = [ + async base containers random stm time unagi-chan + ]; testHaskellDepends = [ - async base containers doctest random stm time + async base containers doctest random stm time unagi-chan ]; description = "Channel/Arrow based streaming computation library"; license = stdenv.lib.licenses.mit; @@ -54602,8 +54648,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.1"; - sha256 = "1j1jlarqgv0q8c4vvys62n8p6hsgw26xm7n83w66ab4m5wwrgn5g"; + version = "0.1.0.2"; + sha256 = "184d633d186sa9rshh8im6xxars0x26623sym9pw2h2h709xsg4n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55348,24 +55394,24 @@ self: { , blaze-html, bytestring, cereal, containers, directory, filepath , happstack-authenticate, happstack-hsp, happstack-jmacro , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs - , ixset, jmacro, lens, mtl, network, network-uri, old-locale - , openssl, process, random, reform, reform-happstack, reform-hsp - , safecopy, stm, text, time, time-locale-compat + , http-types, ixset, jmacro, lens, mtl, network, network-uri + , old-locale, openssl, process, random, reform, reform-happstack + , reform-hsp, safecopy, stm, text, time, time-locale-compat , unordered-containers, userid, utf8-string, uuid-orphans , uuid-types, vector, web-plugins, web-routes, web-routes-happstack , web-routes-hsp, web-routes-th, xss-sanitize }: mkDerivation { pname = "clckwrks"; - version = "0.26.1"; - sha256 = "1n37gllcgq05wgvq4f10vwz7lll6q8an1gak69m50n6fwx8zpb5i"; + version = "0.26.2.2"; + sha256 = "1m6a043y72da9nyr8x35v5lrh12is49rwarj5dlrm8clp8n987dp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate happstack-hsp happstack-jmacro happstack-server - happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl - network network-uri old-locale process random reform + happstack-server-tls hsp hsx-jmacro hsx2hs http-types ixset jmacro + lens mtl network network-uri old-locale process random reform reform-happstack reform-hsp safecopy stm text time time-locale-compat unordered-containers userid utf8-string uuid-orphans uuid-types vector web-plugins web-routes @@ -55513,8 +55559,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.16.9"; - sha256 = "025zxvb3qynqsl39rnsvfyr7wrpfymmhc120nspd46sv4pvqmgvb"; + version = "0.6.17"; + sha256 = "1yaga5g4r9rngc4f8hz4mndrjd6xnksw2vs916ccx2b5dn6i871c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers @@ -55538,8 +55584,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.22"; - sha256 = "00ad6ricd8jrjs7l5l2pg3k87x1cjm0x5zlgppzknns4xzjldips"; + version = "0.4.3.23"; + sha256 = "0mk6vz98l2xxhk8w457mbgbcjslnbv34swjrwfjjqk9jhmcnmxss"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -55561,8 +55607,8 @@ self: { }: mkDerivation { pname = "clckwrks-theme-bootstrap"; - version = "0.4.2.3"; - sha256 = "1a00rrb49m358ds408wzm40f6g98w1lnd70rhp4jpkirj94bmaz4"; + version = "0.4.2.4"; + sha256 = "0ay3rb6vfzvb43mwhjzgdf3cp7dcya0l9sl7msns0niak4xmnz1l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro @@ -57035,6 +57081,29 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "co-log-polysemy-formatting" = callPackage + ({ mkDerivation, ansi-terminal, base, co-log, co-log-core + , co-log-polysemy, formatting, polysemy, polysemy-plugin, text + , time + }: + mkDerivation { + pname = "co-log-polysemy-formatting"; + version = "0.1.0.0"; + sha256 = "17dajk3d23xa1fj8qs896szs00vvwpdgcgjibvkw9mm160yvrlxi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base co-log co-log-core co-log-polysemy formatting + polysemy text time + ]; + executableHaskellDepends = [ + ansi-terminal base co-log co-log-core co-log-polysemy formatting + polysemy polysemy-plugin text time + ]; + description = "A Polysemy logging effect for high quality (unstructured) logs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "co-log-sys" = callPackage ({ mkDerivation, aeson, base, co-log-core, fmt, microlens , monad-control, mtl, network, universum, unix @@ -57110,8 +57179,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.6"; - sha256 = "0ry01h9vkr5zyiwp60vqb8mp2lfg3yhfbaz0c7jammk034dszkf1"; + version = "0.1.3.7"; + sha256 = "04861j2g4pa05p788inkyvgwqjn1c6jsalkrlmin8j3nd0gw2ggq"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -57439,6 +57508,8 @@ self: { pname = "coercible-subtypes"; version = "0.1.0.0"; sha256 = "1z5fmdgv52x410x2z4gxyac18f98226dymzdvhcvkx7mw2k9q44x"; + revision = "1"; + editedCabalFile = "05bd9lp5jp31ac039vq0p58kr03g5ai3cyymc4ikhbnl3x44hx4d"; libraryHaskellDepends = [ base profunctors ]; description = "Coercible but only in one direction"; license = stdenv.lib.licenses.bsd3; @@ -69343,6 +69414,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-reify_0_6_3" = callPackage + ({ mkDerivation, base, base-compat, containers, hashable, hspec + , hspec-discover, unordered-containers + }: + mkDerivation { + pname = "data-reify"; + version = "0.6.3"; + sha256 = "1sacbil9xn1n2085wpa0dq7ikf1wvh2kkddnvmwsp22ssx059h55"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers hashable unordered-containers + ]; + testHaskellDepends = [ base base-compat hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Reify a recursive data structure into an explicit graph"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-reify-cse" = callPackage ({ mkDerivation, base, containers, data-reify }: mkDerivation { @@ -71533,6 +71624,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "deferred-folds_0_9_11" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, hashable + , primitive, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "deferred-folds"; + version = "0.9.11"; + sha256 = "02j1akzjdi73l7adlhv49sln5saq2j53pziqwzw6zw0bsf53q00k"; + libraryHaskellDepends = [ + base bytestring containers foldl hashable primitive transformers + unordered-containers vector + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Abstractions over deferred folds"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "definitive-base" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector @@ -79165,8 +79279,8 @@ self: { pname = "dual-game"; version = "0.1.0.1"; sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; - revision = "6"; - editedCabalFile = "10hj6snshirfx6apbrdb2jm45xsgvsis0c7i5a33wwl0lnklxwj2"; + revision = "7"; + editedCabalFile = "04hi455i82y7nf30chnkbvgfz5fzn050nb3r916abr7s205jfzkq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -80979,8 +81093,8 @@ self: { }: mkDerivation { pname = "effet"; - version = "0.2.0.0"; - sha256 = "1fh6pyjalrns01sg1rnz2h462xgcmnj6xfg6xg61cdb4zh5i9gpp"; + version = "0.3.0.1"; + sha256 = "18cmgap4a3qnglmysh2l8pmag0vx8nqrrzx52zn9zrb54l1ldgm2"; libraryHaskellDepends = [ base containers monad-control template-haskell transformers transformers-base @@ -81039,6 +81153,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "egison_4_1_0" = callPackage + ({ mkDerivation, array, base, containers, criterion, directory + , exceptions, filepath, ghc, ghc-paths, Glob, hashable, haskeline + , HUnit, megaparsec, mtl, optparse-applicative, parsec + , parser-combinators, prettyprinter, process, random, regex-tdfa + , split, sweet-egison, test-framework, test-framework-hunit, text + , transformers, unicode-show, unordered-containers, vector + }: + mkDerivation { + pname = "egison"; + version = "4.1.0"; + sha256 = "0qhan5mlb9pvdwbjk0pl59z8y6dn2kbcl21k7rnzhqwf5a5l556d"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base containers directory ghc ghc-paths hashable haskeline + megaparsec mtl optparse-applicative parsec parser-combinators + prettyprinter process random regex-tdfa split sweet-egison text + transformers unicode-show unordered-containers vector + ]; + executableHaskellDepends = [ + array base containers directory exceptions filepath ghc ghc-paths + haskeline mtl optparse-applicative parsec prettyprinter process + regex-tdfa split text transformers unordered-containers vector + ]; + testHaskellDepends = [ + base filepath Glob HUnit mtl test-framework test-framework-hunit + transformers + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Programming language with non-linear pattern-matching against non-free data"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "egison-pattern-src" = callPackage ({ mkDerivation, base, containers, free, megaparsec, mtl , parser-combinators, prettyprinter, recursion-schemes, tasty @@ -83570,6 +83720,26 @@ self: { broken = true; }) {}; + "epi-sim" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, hspec + , mwc-random, primitive, statistics, trifecta, vector + }: + mkDerivation { + pname = "epi-sim"; + version = "0.2.2.0"; + sha256 = "17pri7fynx5zi6hacglv2xww41837nrq0d355pv7rkvmqz5f8y3a"; + libraryHaskellDepends = [ + aeson base bytestring cassava hspec mwc-random primitive statistics + trifecta vector + ]; + testHaskellDepends = [ + aeson base bytestring cassava hspec mwc-random primitive statistics + trifecta vector + ]; + description = "A library for simulating epidemics as birth-death processes"; + license = stdenv.lib.licenses.mit; + }) {}; + "epic" = callPackage ({ mkDerivation, array, base, Cabal, directory, mtl, process }: mkDerivation { @@ -87649,6 +87819,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fakedata-quickcheck" = callPackage + ({ mkDerivation, base, fakedata, hspec, hspec-core, QuickCheck + , random, regex-tdfa, text + }: + mkDerivation { + pname = "fakedata-quickcheck"; + version = "0.1.0"; + sha256 = "0al5brin9bs0553rrw073za4jzw2whrf05yj6h34lmx4kxzciv6s"; + libraryHaskellDepends = [ base fakedata QuickCheck random ]; + testHaskellDepends = [ + base fakedata hspec hspec-core QuickCheck random regex-tdfa text + ]; + description = "Fake a -> Gen a"; + license = stdenv.lib.licenses.mit; + }) {}; + "fakefs" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, mtl , QuickCheck @@ -91338,6 +91524,34 @@ self: { broken = true; }) {}; + "flashblast" = callPackage + ({ mkDerivation, attoparsec, base, composite-base, dhall + , formatting, lucid, megaparsec, path, path-dhall-instance + , path-utils, polysemy, polysemy-video, replace-megaparsec, rio + , semialign, subtitleParser, these, turtle, unliftio-path, vinyl + }: + mkDerivation { + pname = "flashblast"; + version = "0.0.1.1"; + sha256 = "0syqfjg373sq3326nxqaq4zipb342df8av78cm63j78mnl7xjq0x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base composite-base dhall formatting lucid megaparsec + path path-dhall-instance path-utils polysemy polysemy-video + replace-megaparsec rio semialign subtitleParser these turtle + unliftio-path vinyl + ]; + executableHaskellDepends = [ + attoparsec base composite-base dhall formatting lucid megaparsec + path path-dhall-instance path-utils polysemy polysemy-video + replace-megaparsec rio semialign subtitleParser these turtle + unliftio-path vinyl + ]; + description = "Generate language learning flashcards from video"; + license = stdenv.lib.licenses.mit; + }) {}; + "flat" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, filepath, ghc-prim, hashable, mono-traversable, pretty @@ -93200,14 +93414,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "formatting_7_0_0_2" = callPackage + "formatting_7_1_1" = callPackage ({ mkDerivation, base, clock, double-conversion, ghc-prim, hspec , integer-gmp, old-locale, scientific, text, time, transformers }: mkDerivation { pname = "formatting"; - version = "7.0.0.2"; - sha256 = "1yam1lniqlmvdq2nsg7hmw9mzpfv37ldyg0izi8869iwl63j87gh"; + version = "7.1.1"; + sha256 = "1abqyd2k46vrr8xxk6sgcjfm8h7x3d2hk11p8kypi85zplab4rsp"; libraryHaskellDepends = [ base clock double-conversion ghc-prim integer-gmp old-locale scientific text time transformers @@ -93536,8 +93750,8 @@ self: { }: mkDerivation { pname = "fourmolu"; - version = "0.2.0.0"; - sha256 = "1jak0xgd6gcbw7icyrblvqnvzjyyakpw2zfnqj1z958qyg763v52"; + version = "0.3.0.0"; + sha256 = "0v89dvcr8l0swj23kkakc39q6lyxjz90rqgwy7m6a5p6iv3h2wms"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -102202,6 +102416,30 @@ self: { broken = true; }) {gtk-mac-integration-gtk3 = null;}; + "gi-gtksheet" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-glib, gi-gobject, gi-gtk, gi-pango, gtksheet + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gtksheet"; + version = "4.0.1"; + sha256 = "19fyjymh5b1q1ln0nnqwwwf0zsdjy0bfn5nhi133q9j195bhb7l9"; + setupHaskellDepends = [ + base Cabal gi-atk gi-cairo gi-gdk gi-glib gi-gobject gi-gtk + gi-pango haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-glib + gi-gobject gi-gtk gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtksheet ]; + description = "GtkSheet bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {gtksheet = null;}; + "gi-gtksource" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject @@ -102982,8 +103220,8 @@ self: { }: mkDerivation { pname = "git-brunch"; - version = "1.4.1.0"; - sha256 = "0jq2i115djl5skkjzxxqdkp2rnw6871xn4aj4ryx9mgfnsd6dfgi"; + version = "1.4.2.0"; + sha256 = "0zbbd3hga2qh043xw6igsjk14wh0d3hq5naxich88wg1ig4w28j5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103202,8 +103440,8 @@ self: { }: mkDerivation { pname = "git-mediate"; - version = "1.0.8"; - sha256 = "0g81v358vqlfsz5bx8arnzjn0bnjd9k835mn8z0kp4d341z0y8l1"; + version = "1.0.8.1"; + sha256 = "0ry437v01vc3d462zgg0jn113l24lcry5lgdv2y0rmyy6wfq8i7f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119407,8 +119645,8 @@ self: { }: mkDerivation { pname = "haskellish"; - version = "0.2.3"; - sha256 = "188sfmb9rcp0k75x94ld0jv91kxbyfqkk7hnw5wyw8ln5y0fmr3w"; + version = "0.2.3.1"; + sha256 = "0285mk3s1gl0xxwcqd22v800pcg75ml676nzs5pb96ybfniqksl0"; libraryHaskellDepends = [ base containers haskell-src-exts mtl template-haskell ]; @@ -120991,8 +121229,8 @@ self: { }: mkDerivation { pname = "hasql-dynamic-statements"; - version = "0.3"; - sha256 = "13f0gkgjn7bcxarwz8vyzfdmrz1yqh9xnard6304v4y4zhqjfyjn"; + version = "0.3.1"; + sha256 = "1fs5bfxk0yd2j4iygc8m0nx9hwfmvsxyhdanclass0dxr40pqyhc"; libraryHaskellDepends = [ base bytestring containers hasql hasql-implicits ptr ]; @@ -128495,8 +128733,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.2"; - sha256 = "0g3ay30dwr2v22bybapryl0ykjyqs5ym1i1p7jfky7lp20ri9x1z"; + version = "3.2.1"; + sha256 = "16r2s65238yaqkiqhc31zwgv5r9743d5qrdwkahn9zpwj0x0sp5f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -131475,8 +131713,6 @@ self: { ]; description = "hpack's dhalling"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hpaco" = callPackage @@ -135915,6 +136151,8 @@ self: { pname = "hspec-hedgehog"; version = "0.0.1.2"; sha256 = "17gbr4ssnzjk7nvpsnh47av6vd9wz27ax92xvr4jwyw0z7h2wn13"; + revision = "1"; + editedCabalFile = "1qv2gap0775d2zg8wbd3kq4ypziz05qlz5jfisvl3jfd6jzcf2ad"; libraryHaskellDepends = [ base hedgehog hspec hspec-core HUnit QuickCheck splitmix ]; @@ -138467,18 +138705,16 @@ self: { }) {}; "http-conduit-downloader" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection - , data-default, HsOpenSSL, http-client, http-conduit, http-types - , mtl, network, network-uri, resourcet, text, time, zlib + ({ mkDerivation, base, bytestring, data-default, HsOpenSSL + , http-client, http-types, network, network-uri, text, time, zlib }: mkDerivation { pname = "http-conduit-downloader"; - version = "1.0.33"; - sha256 = "07pn2p143rfmvax3zx53hlgh0rfynn60g0z6cw6vazrxap4v3pr3"; + version = "1.1.2"; + sha256 = "188rhadf1dya2iyvcvfp1xvnhjmhkf06i606mrkrlmzbds2kb8hh"; libraryHaskellDepends = [ - base bytestring conduit connection data-default HsOpenSSL - http-client http-conduit http-types mtl network network-uri - resourcet text time zlib + base bytestring data-default HsOpenSSL http-client http-types + network network-uri text time zlib ]; description = "HTTP downloader tailored for web-crawler needs"; license = stdenv.lib.licenses.bsd3; @@ -139916,20 +140152,22 @@ self: { "hurl" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring - , connection, containers, directory, filepath, http-client - , http-client-tls, http-types, network-uri, process, text + , containers, directory, filepath, HsOpenSSL, http-client + , http-client-openssl, http-types, io-streams, network-uri + , openssl-streams, process, regex, regex-tdfa, text, time , xml-conduit, zlib }: mkDerivation { pname = "hurl"; - version = "1.4.1.1"; - sha256 = "0h4fzkdpsjsph6685sg78kwvajf7615y8dbcn9n88jwdq6j8j522"; + version = "1.4.2.0"; + sha256 = "19qf4akwx7aazzy86zhkm5z60342hz07msqxir6ism98dd33fpwl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base base64-bytestring bytestring connection containers - directory filepath http-client http-client-tls http-types - network-uri process text xml-conduit zlib + async base base64-bytestring bytestring containers directory + filepath HsOpenSSL http-client http-client-openssl http-types + io-streams network-uri openssl-streams process regex regex-tdfa + text time xml-conduit zlib ]; executableHaskellDepends = [ base directory network-uri ]; description = "Haskell URL resolver"; @@ -141338,15 +141576,15 @@ self: { }: mkDerivation { pname = "hwk"; - version = "0.3"; - sha256 = "16pi48bgxgh3qcbrhyjg6r477yn2qzyzx6gizwf8q6h0da4qzp8i"; + version = "0.5"; + sha256 = "1nn8021nf7pwr8r0ffvsr3yjvjgv4f15l7j8s9pisi4n280lv8h0"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base directory extra filepath hint simple-cmd-args ]; - description = "Simple Haskell-based awk-like tool"; + description = "Commandline text processing with Haskell functions"; license = stdenv.lib.licenses.mit; }) {}; @@ -143113,8 +143351,8 @@ self: { pname = "identicon-style-squares"; version = "0.1.0.1"; sha256 = "1x456v7fb211f7ciipp2bfn9fvh5w4i34bl5mjw7bkn7hgsaa3x6"; - revision = "2"; - editedCabalFile = "1bi5sn62z23j9n7bxlaz5qiwk52v7sfr70bk0by9vk6nlylli8r1"; + revision = "3"; + editedCabalFile = "0jri78n8xggipikhp6p4l4i2zwjn4fdydbv730w01linfg1h6w68"; libraryHaskellDepends = [ base identicon JuicyPixels polyvariadic ]; @@ -144185,38 +144423,41 @@ self: { }) {}; "imm" = callPackage - ({ mkDerivation, aeson, async, atom-conduit, avro, base-noprelude - , binary, blaze-html, blaze-markup, bytestring, conduit, containers - , dhall, directory, fast-logger, filepath, hashable, microlens - , mime-mail, monad-time, opml-conduit, optparse-applicative, pipes - , pipes-bytestring, prettyprinter, prettyprinter-ansi-terminal - , refined, relude, rss-conduit, safe, safe-exceptions, stm - , stm-chans, text, time, timerep, typed-process, uri-bytestring + ({ mkDerivation, aeson, aeson-pretty, async, atom-conduit + , base-noprelude, beam-core, beam-sqlite, blaze-html, blaze-markup + , bytestring, chronos, co-log, conduit, containers, dhall + , directory, filepath, http-client, http-types, microlens + , mime-mail, monad-time, optparse-applicative, parsec, parsers + , pipes, pipes-bytestring, pipes-http, prettyprinter + , prettyprinter-ansi-terminal, refined, relude, rss-conduit, safe + , safe-exceptions, sqlite-simple, stm, stm-chans, streamly, text + , time, timerep, typed-process, typerep-map, uri-bytestring , xml-conduit, xml-types }: mkDerivation { pname = "imm"; - version = "1.10.0.0"; - sha256 = "0kjh6j1lw4ixgz5jkmaqfxi4rmmd5k2nq4wdr4c0yw26kwvgv003"; + version = "2.0.0.0"; + sha256 = "1qkq80iiv1yql59a8vly1nv36isnh2wkdzxgawjh22xqn9xn0csd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson async atom-conduit avro base-noprelude binary conduit - containers dhall directory filepath hashable microlens monad-time - pipes pipes-bytestring prettyprinter prettyprinter-ansi-terminal - refined relude rss-conduit safe-exceptions text time timerep + aeson aeson-pretty atom-conduit base-noprelude conduit containers + dhall directory filepath http-client microlens parsec parsers pipes + pipes-bytestring prettyprinter prettyprinter-ansi-terminal refined + relude rss-conduit safe safe-exceptions text time timerep typed-process uri-bytestring xml-conduit xml-types ]; executableHaskellDepends = [ - aeson async atom-conduit avro base-noprelude blaze-html - blaze-markup bytestring conduit containers dhall directory - fast-logger filepath mime-mail opml-conduit optparse-applicative - pipes pipes-bytestring prettyprinter prettyprinter-ansi-terminal - refined relude rss-conduit safe safe-exceptions stm stm-chans text - time typed-process uri-bytestring xml-conduit xml-types + aeson async base-noprelude beam-core beam-sqlite blaze-html + blaze-markup bytestring chronos co-log conduit containers dhall + directory filepath http-types microlens mime-mail monad-time + optparse-applicative pipes pipes-bytestring pipes-http + prettyprinter prettyprinter-ansi-terminal refined relude safe + safe-exceptions sqlite-simple stm stm-chans streamly text time + typed-process typerep-map uri-bytestring xml-conduit xml-types ]; - description = "Execute arbitrary callbacks for each element of RSS/Atom feeds"; + description = "Execute arbitrary actions for each item from RSS/Atom feeds"; license = stdenv.lib.licenses.cc0; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -144403,8 +144644,8 @@ self: { }: mkDerivation { pname = "implicit-hie"; - version = "0.1.1.0"; - sha256 = "048y1wbwcp1vs4shgfzvcmbgg8fnm0pw2i7a8488b5kshfzf9syb"; + version = "0.1.2.0"; + sha256 = "0scg27iz2yhkfrsj5hw11qi1gdivgnskmcl4v4111zlvyy14lhc9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149223,10 +149464,8 @@ self: { }: mkDerivation { pname = "j"; - version = "0.1.0.0"; - sha256 = "1jscbh7riqkfks72xfgqmf04zhr0l8mncnmxmxv53l8v4ymigmvl"; - revision = "1"; - editedCabalFile = "1hx5gz8l12q8kswy59pwyp49a226nxvbg8jkwj746l8wgxp692sy"; + version = "0.1.1.0"; + sha256 = "0a3xl4sr5s7436z8fnjg6vknk7wi202b8ryvswxrv1ks49h2zg8s"; libraryHaskellDepends = [ base bytestring repa unix ]; testHaskellDepends = [ base bytestring repa tasty tasty-hunit ]; description = "J in Haskell"; @@ -151493,6 +151732,24 @@ self: { broken = true; }) {}; + "jsonifier" = callPackage + ({ mkDerivation, aeson, base, bytestring, gauge, hedgehog + , numeric-limits, ptr-poker, rerebase, scientific, text + , text-builder + }: + mkDerivation { + pname = "jsonifier"; + version = "0.1.0.2"; + sha256 = "1vm7qp38wkv2l3wi32kv2hcbzpzk7yf9xffh09ani395dggw94hx"; + libraryHaskellDepends = [ + base bytestring ptr-poker scientific text + ]; + testHaskellDepends = [ aeson hedgehog numeric-limits rerebase ]; + benchmarkHaskellDepends = [ aeson gauge rerebase text-builder ]; + description = "Fast and simple JSON encoding toolkit"; + license = stdenv.lib.licenses.mit; + }) {}; + "jsonpath" = callPackage ({ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring , file-embed, hspec, hspec-attoparsec, hspec-discover, text @@ -152581,8 +152838,8 @@ self: { }: mkDerivation { pname = "katip-datadog"; - version = "0.1.0.0"; - sha256 = "04gj1svwlndid1j0c14q82y42gad40l0wn2mr5mbhc9b921mncsl"; + version = "0.2.0.0"; + sha256 = "0qcbg2nvm2ig02x05invjzdrrdgxcq06gask28vzg6g72qc48ar3"; libraryHaskellDepends = [ aeson base binary bytestring connection katip network resource-pool retry safe-exceptions text time @@ -152607,8 +152864,8 @@ self: { }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.6.0.0"; - sha256 = "05pvmx2p2h34qig392z6k0ar3dk6cc3vgzsvxhijwp5xfja52ha4"; + version = "0.7.0.0"; + sha256 = "0m0snqxnaaqy33vbfyrcnbpc6vls3p8jby69z3wcyb2d5lxwm8d9"; libraryHaskellDepends = [ aeson async base bloodhound bytestring exceptions http-client http-types katip retry safe-exceptions scientific semigroups stm @@ -157474,8 +157731,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "2.0.1"; - sha256 = "19jp9809jrh3swvsji5zgbqg4qg5gayv6bj0svq00wyzaisns3dd"; + version = "2.0.2"; + sha256 = "01c42wyjvnd1wp665p2khjsm1apc9kw3gw6mnlwbdgsimhj8v4z0"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring bytestring-conversion clock containers cryptohash exceptions extra @@ -162815,17 +163072,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "little-rio_0_2_1" = callPackage - ({ mkDerivation, base, exceptions, microlens, microlens-mtl, mtl - , primitive, resourcet, unliftio-core + "little-rio_0_2_2" = callPackage + ({ mkDerivation, base, deepseq, exceptions, microlens + , microlens-mtl, mtl, primitive, resourcet, unliftio-core }: mkDerivation { pname = "little-rio"; - version = "0.2.1"; - sha256 = "1fywk5nva88365p9qv866mf1j4jksarv7d9i39m5xxi764wwpzjp"; + version = "0.2.2"; + sha256 = "1cbadsbhhgls6p46gga4l32b0fhmvp6r9mycaj2srsfdcnwkydr9"; libraryHaskellDepends = [ - base exceptions microlens microlens-mtl mtl primitive resourcet - unliftio-core + base deepseq exceptions microlens microlens-mtl mtl primitive + resourcet unliftio-core ]; description = "When you need just the RIO monad"; license = stdenv.lib.licenses.bsd3; @@ -164741,8 +164998,8 @@ self: { }: mkDerivation { pname = "longshot"; - version = "0.1.0.3"; - sha256 = "1w3fkbz900aj6dwqnbg6miv1wv3vlka7ri94fny34gjyl1da30cl"; + version = "0.1.0.5"; + sha256 = "1xgdkfykiwzscq91z7xg1dgsh9ma6bg03d82f58r297c7fzivvak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165215,6 +165472,36 @@ self: { broken = true; }) {}; + "lsp" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, dependent-map, directory, filepath + , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl + , network-uri, QuickCheck, quickcheck-instances, random + , rope-utf16-splay, scientific, sorted-list, stm, text, time + , transformers, unliftio-core, unordered-containers, uuid + }: + mkDerivation { + pname = "lsp"; + version = "1.0.0.0"; + sha256 = "05m9kxcf7g2xb4bhbn08bfbf09b8vvvw3nvpcfldpx180yz3n02r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + dependent-map directory filepath hashable hslogger lens lsp-types + mtl network-uri random scientific sorted-list stm text time + transformers unliftio-core unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + rope-utf16-splay sorted-list stm text unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = stdenv.lib.licenses.mit; + }) {}; + "lsp-test" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -165268,6 +165555,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lsp-types" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , data-default, deepseq, dependent-sum-template, directory + , filepath, hashable, hslogger, lens, network-uri, rope-utf16-splay + , scientific, some, template-haskell, temporary, text + , unordered-containers + }: + mkDerivation { + pname = "lsp-types"; + version = "1.0.0.0"; + sha256 = "1cf07hdzgh5inskabdyli3zg95grc3qlw9d5xiqf1hwlspsyxis9"; + libraryHaskellDepends = [ + aeson base binary bytestring containers data-default deepseq + dependent-sum-template directory filepath hashable hslogger lens + network-uri rope-utf16-splay scientific some template-haskell + temporary text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = stdenv.lib.licenses.mit; + }) {}; + "lss" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , hspec2, language-css, language-css-attoparsec, text, xmlhtml @@ -168506,8 +168814,8 @@ self: { }: mkDerivation { pname = "matchable-th"; - version = "0.1.1.0"; - sha256 = "0hmdy38k1il2b0j6bkr3m4f1c8d8rvw21k3rlrd0q345xjx8y8p1"; + version = "0.1.1.1"; + sha256 = "0q6bvdfmdil68van4cmhy6kj2w0x1kf2kgs2f3wzz6m723ach30v"; libraryHaskellDepends = [ base matchable template-haskell th-abstraction ]; @@ -169038,21 +169346,20 @@ self: { , config-ini, connection, containers, data-clist, directory , filepath, gitrev, hashable, Hclip, mattermost-api , mattermost-api-qc, microlens-platform, mtl, network-uri, process - , quickcheck-text, random, semigroups, skylighting-core, split, stm - , stm-delay, strict, string-conversions, tasty, tasty-hunit - , tasty-quickcheck, temporary, text, text-zipper, time - , timezone-olson, timezone-series, transformers, Unique, unix - , unordered-containers, utf8-string, uuid, vector, vty, word-wrap - , xdg-basedir + , random, semigroups, skylighting-core, split, stm, stm-delay + , strict, tasty, tasty-hunit, tasty-quickcheck, temporary, text + , text-zipper, time, timezone-olson, timezone-series, transformers + , Unique, unix, unordered-containers, utf8-string, uuid, vector + , vty, word-wrap, xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "50200.10.2"; - sha256 = "1yla2wjhv093l3pngbk1ph0sl3ib7qmns2i0c1k8kgxrz4yj2gfb"; - isLibrary = false; + version = "50200.11.0"; + sha256 = "0wvw3wbv2sii1bjc8nmwyb1k0hzixfkfvpkmlkwa2my564vvmgz8"; + isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ aeson aspell-pipe async base base-compat brick brick-skylighting bytestring cheapskate config-ini connection containers data-clist directory filepath gitrev hashable Hclip mattermost-api @@ -169062,14 +169369,11 @@ self: { unordered-containers utf8-string uuid vector vty word-wrap xdg-basedir ]; + executableHaskellDepends = [ base text ]; testHaskellDepends = [ - base base-compat brick bytestring cheapskate checkers config-ini - connection containers directory filepath hashable Hclip - mattermost-api mattermost-api-qc microlens-platform mtl process - quickcheck-text semigroups stm strict string-conversions tasty - tasty-hunit tasty-quickcheck text text-zipper time timezone-olson - timezone-series transformers Unique unordered-containers uuid - vector vty xdg-basedir + base bytestring cheapskate checkers containers mattermost-api + mattermost-api-qc tasty tasty-hunit tasty-quickcheck text time + Unique uuid ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; @@ -169086,8 +169390,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.8.0"; - sha256 = "1x1wrf7yvwhwfn10207qv5ljpa1jwfm1ck67bwjzh3pcgq0d6x5w"; + version = "50200.9.0"; + sha256 = "08whhlkr3ayimn66lwinvv0ci8zbhk5i7sz1fk5r1dp7mg2jzgig"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169111,8 +169415,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.8.0"; - sha256 = "17d914dirzvpg3l4qly56y8y5yv18pc6qxngvi8sl410xnbx5p31"; + version = "50200.9.0"; + sha256 = "0rcbsf5hrp2fd9jqmcr07gg2y0xg4ksasrqfxrc7n4mgw0a409i6"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -173325,8 +173629,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "mmsyn2"; - version = "0.1.8.0"; - sha256 = "1qdbf89i5yx6ag9k4a9scc6wbm765b8zhq0gi12zx0bq75jjz3qz"; + version = "0.2.0.0"; + sha256 = "1lxfl6gr42x9rhy4jpig9hwl0bnbidrv65i8f4fr39ifrx43fgxw"; libraryHaskellDepends = [ base vector ]; description = "The library that can be used for multiple (Ord a) => a -> b transformations"; license = stdenv.lib.licenses.mit; @@ -177698,18 +178002,19 @@ self: { "mu-avro" = callPackage ({ mkDerivation, aeson, avro, base, bytestring, containers, deepseq , language-avro, mu-rpc, mu-schema, sop-core, tagged - , template-haskell, text, time, unordered-containers, uuid, vector + , template-haskell, text, time, transformers, unordered-containers + , uuid, vector }: mkDerivation { pname = "mu-avro"; - version = "0.3.0.0"; - sha256 = "0p5j3pzx2b8hj7zn7gdj7xg2n99yhzvbkhbr5cv6jwcd5gpz3pkn"; + version = "0.4.0.0"; + sha256 = "08hkw54llgyc7gmr3srx0im6im3x23cc0fkgmfv541ak6sq7by3h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson avro base bytestring containers deepseq language-avro mu-rpc - mu-schema sop-core tagged template-haskell text time + mu-schema sop-core tagged template-haskell text time transformers unordered-containers uuid vector ]; executableHaskellDepends = [ avro base bytestring mu-schema ]; @@ -177721,7 +178026,7 @@ self: { "mu-graphql" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , conduit, graphql-parser, http-types, list-t, mtl, mu-rpc + , conduit, foldl, graphql-parser, http-types, list-t, mtl, mu-rpc , mu-schema, parsers, regex-tdfa, scientific, sop-core, stm , stm-chans, stm-conduit, stm-containers, template-haskell, text , unordered-containers, uuid, wai, wai-extra, wai-websockets, warp @@ -177729,13 +178034,13 @@ self: { }: mkDerivation { pname = "mu-graphql"; - version = "0.3.0.0"; - sha256 = "1371h6w3v10qcmp8zp3mjxfhvknk39qgcn9laslssci4yrrr5a09"; + version = "0.4.0.0"; + sha256 = "0vww6kv76sfi4931265gmbmyd67qlijxwiyl2z0lbcj1gs95j6x2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson async attoparsec base bytestring conduit graphql-parser + aeson async attoparsec base bytestring conduit foldl graphql-parser http-types list-t mtl mu-rpc mu-schema parsers scientific sop-core stm stm-chans stm-conduit stm-containers template-haskell text unordered-containers uuid wai wai-websockets warp warp-tls @@ -177755,17 +178060,17 @@ self: { , http2-client, http2-client-grpc, http2-grpc-types, mu-grpc-common , mu-optics, mu-protobuf, mu-rpc, mu-schema, optics-core, sop-core , stm, stm-chans, stm-conduit, template-haskell, text - , th-abstraction + , th-abstraction, tracing }: mkDerivation { pname = "mu-grpc-client"; - version = "0.3.0.0"; - sha256 = "08z92rm1dcr02qwmd92inplzb1hgari0bsmw19xlmkdlsjldj5v0"; + version = "0.4.0.0"; + sha256 = "0j1dn2c95rzm8h6yzw5h5r3yhk5p1i51kx4px668hb3m9wss5qdr"; libraryHaskellDepends = [ async avro base bytestring conduit http2 http2-client http2-client-grpc http2-grpc-types mu-grpc-common mu-optics mu-protobuf mu-rpc mu-schema optics-core sop-core stm stm-chans - stm-conduit template-haskell text th-abstraction + stm-conduit template-haskell text th-abstraction tracing ]; description = "gRPC clients from Mu definitions"; license = stdenv.lib.licenses.asl20; @@ -177780,8 +178085,8 @@ self: { }: mkDerivation { pname = "mu-grpc-common"; - version = "0.3.0.0"; - sha256 = "1ipqzg799lfy2apl3galhgnqqpf5z9nr0dvb9gp9cmv0y9bn3iv6"; + version = "0.4.0.0"; + sha256 = "0rn0gkvxfd8j6ayzixapm3nagjszf50xjr8d59v7vfqh61kwrx83"; libraryHaskellDepends = [ avro base binary bytestring http2-grpc-proto3-wire http2-grpc-types mu-avro mu-protobuf mu-rpc mu-schema @@ -177800,8 +178105,8 @@ self: { }: mkDerivation { pname = "mu-grpc-server"; - version = "0.3.0.0"; - sha256 = "1z8mhychrr5y6zrxg3xx398x221cwyyw7yss8gfn0f5c7j64r693"; + version = "0.4.0.0"; + sha256 = "0wnqalcsj7j2ny999nw818ncy292f3kmmbwc2ci14d43zgrjdi3v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177838,6 +178143,21 @@ self: { broken = true; }) {}; + "mu-lens" = callPackage + ({ mkDerivation, base, containers, generic-lens, lens, mu-rpc + , mu-schema, sop-core, text + }: + mkDerivation { + pname = "mu-lens"; + version = "0.3.0.0"; + sha256 = "02awv7xm361wcag5ghv103fa6qid4kfqn5zjw14wcmqvanwy19f4"; + libraryHaskellDepends = [ + base containers generic-lens lens mu-rpc mu-schema sop-core text + ]; + description = "Lenses for @mu-schema@ terms"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mu-optics" = callPackage ({ mkDerivation, base, containers, mu-schema, optics-core, sop-core }: @@ -177867,6 +178187,22 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "mu-prometheus" = callPackage + ({ mkDerivation, base, lifted-base, monad-control, mu-rpc + , prometheus-client, text, wai, wai-middleware-prometheus + }: + mkDerivation { + pname = "mu-prometheus"; + version = "0.4.0.0"; + sha256 = "060fx3svjiwzyfifmwrzcvm23xp332yb91fb4hh7whcmi2q415c8"; + libraryHaskellDepends = [ + base lifted-base monad-control mu-rpc prometheus-client text wai + wai-middleware-prometheus + ]; + description = "Metrics support for Mu using Prometheus"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mu-protobuf" = callPackage ({ mkDerivation, base, bytestring, compendium-client, http-client , http2-grpc-proto3-wire, language-protobuf, mu-rpc, mu-schema @@ -177875,8 +178211,8 @@ self: { }: mkDerivation { pname = "mu-protobuf"; - version = "0.3.0.0"; - sha256 = "02wk2bhx6lflgri9fm4dq09yz07xsm82fbxgm130zs7s6015chxf"; + version = "0.4.0.0"; + sha256 = "13323mk6maj4fn1vg98nkb80k1975mqaszbj67a4mr5n2s9vrlz2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -177895,15 +178231,16 @@ self: { }) {}; "mu-rpc" = callPackage - ({ mkDerivation, base, conduit, mtl, mu-schema, sop-core - , template-haskell, text + ({ mkDerivation, aeson, base, conduit, http-types, mtl, mu-schema + , sop-core, template-haskell, text, wai }: mkDerivation { pname = "mu-rpc"; - version = "0.3.0.0"; - sha256 = "02m19ddp8q3khp8j6cgax24srf6dlpakq2wkjpqsa31vawn06a9g"; + version = "0.4.0.0"; + sha256 = "06aly31vqf4i96p62i7pjp9xr9rwvnrmg31qpvirjzgn6jq5dyk3"; libraryHaskellDepends = [ - base conduit mtl mu-schema sop-core template-haskell text + aeson base conduit http-types mtl mu-schema sop-core + template-haskell text wai ]; description = "Protocol-independent declaration of services and servers"; license = stdenv.lib.licenses.asl20; @@ -177912,20 +178249,56 @@ self: { "mu-schema" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, sop-core , template-haskell, text, th-abstraction, unordered-containers - , vector + , uuid, vector }: mkDerivation { pname = "mu-schema"; - version = "0.3.0.0"; - sha256 = "0b943w2mfrgrc2cgq4vjg1wgyb5ijdqfq9argv0k6i6b3hj97kqg"; + version = "0.3.1.0"; + sha256 = "1kl62ask8cvjimjcb9f3y3vpvk544m3zlzp4jn1yrvbmzn3px0d1"; libraryHaskellDepends = [ aeson base bytestring containers sop-core template-haskell text - th-abstraction unordered-containers vector + th-abstraction unordered-containers uuid vector ]; description = "Format-independent schemas for serialization"; license = stdenv.lib.licenses.asl20; }) {}; + "mu-servant-server" = callPackage + ({ mkDerivation, aeson, async, base, conduit, generic-aeson + , ghc-prim, mtl, mu-rpc, mu-schema, servant, servant-server + , servant-swagger, stm, swagger2, text, utf8-string, warp + }: + mkDerivation { + pname = "mu-servant-server"; + version = "0.4.0.0"; + sha256 = "0iwcrqbldfvjg9g7pq1r9gw8avhrl4m9fxjcr7gbci2fwalx7901"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base conduit generic-aeson ghc-prim mtl mu-rpc + mu-schema servant servant-server servant-swagger stm swagger2 + utf8-string + ]; + executableHaskellDepends = [ + aeson base conduit mu-rpc mu-schema servant-server text warp + ]; + description = "Servant servers for Mu definitions"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "mu-tracing" = callPackage + ({ mkDerivation, base, containers, mu-rpc, text, tracing-control }: + mkDerivation { + pname = "mu-tracing"; + version = "0.4.0.0"; + sha256 = "0bc6xxhnaswq0pyq9qjhrig978gb25a0gxkhlah7iim5y09fxmaw"; + libraryHaskellDepends = [ + base containers mu-rpc text tracing-control + ]; + description = "Tracing support for Mu"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mucipher" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -185582,8 +185955,8 @@ self: { }: mkDerivation { pname = "nri-prelude"; - version = "0.1.0.3"; - sha256 = "19rbcdv21j327lffvj43jyp0wa2zbbljfs7zd842szfffzq59bkg"; + version = "0.1.0.4"; + sha256 = "0x8jvrp2kcj9a23g370fj9v6mmp3c3vi05dg3arq1ri5in4y6psa"; libraryHaskellDepends = [ aeson ansi-terminal async auto-update base bytestring concurrent-output containers directory exceptions filepath hedgehog @@ -186141,6 +186514,22 @@ self: { broken = true; }) {}; + "numhask-free" = callPackage + ({ mkDerivation, attoparsec, base, containers, doctest, free + , numhask, text + }: + mkDerivation { + pname = "numhask-free"; + version = "0.0.1"; + sha256 = "1n786zg3sbc9zjr4972b837p459qx8yc1jqh0qlq1yw50yd9ic79"; + libraryHaskellDepends = [ + attoparsec base containers free numhask text + ]; + testHaskellDepends = [ base doctest numhask ]; + description = "See readme.md"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "numhask-hedgehog" = callPackage ({ mkDerivation, base, hedgehog, numhask, numhask-prelude , numhask-space @@ -191381,7 +191770,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_11" = callPackage + "pandoc_2_11_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -191400,8 +191789,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.11"; - sha256 = "1d0rywdwcr81h45ha53x35jjj8lyzwdc3wang395wxwxbl811l7w"; + version = "2.11.0.1"; + sha256 = "195g1y1i4n11qfk2mmgfnhvdcraf937ipvb7swb6fvyv5qlwj4w9"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -191538,8 +191927,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.8.1"; - sha256 = "15h484xq015jy65mzaqjqyi4ppnqfrdvvj1llmp8k00vb2xcrzrr"; + version = "0.3.8.2"; + sha256 = "15rvyxn05wq7k06v3k4z0wbl85id7vmjkyy92zdp8vcvqbayjm3a"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -193067,8 +193456,8 @@ self: { pname = "paramtree"; version = "0.1.1.1"; sha256 = "0ls9wzmz5lk7gyl8lx9cjs49zpwhrv955fs5q6ypv7bpbvjbchs1"; - revision = "1"; - editedCabalFile = "0p7zb0xvx88i72garnlihp2q1x5lpsr73jp2qh8lgasy12gy7g0q"; + revision = "2"; + editedCabalFile = "17wyi6q6azm2s04pm1alc183yp01a8qbvj1nymjxdzvrl2dkk2g6"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-hunit temporary @@ -201576,6 +201965,8 @@ self: { pname = "polyvariadic"; version = "0.3.0.4"; sha256 = "17895458cfciv5lkcd26b5a96d9mwklish8xjhn14bd2himyczx0"; + revision = "1"; + editedCabalFile = "1z4wg7cb4akanch7cdmmvr8ibrv7il63gi2mchq8pasqad6150f0"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "Creation and application of polyvariadic functions"; @@ -206679,6 +207070,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "prolens" = callPackage + ({ mkDerivation, base, doctest, hedgehog, hspec, hspec-hedgehog + , inspection-testing + }: + mkDerivation { + pname = "prolens"; + version = "0.0.0.0"; + sha256 = "1p4cl83knkvfa11ijw9qb2akz9n8lv9ixawgxwynypygg7vdg9j2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hedgehog hspec hspec-hedgehog inspection-testing + ]; + description = "Profunctor-based lightweight implementation of optics"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "prolog" = callPackage ({ mkDerivation, base, containers, mtl, parsec, syb , template-haskell, th-lift, transformers @@ -206762,8 +207169,8 @@ self: { }: mkDerivation { pname = "prolude"; - version = "0.0.0.1"; - sha256 = "1qk9i362z5mw5agxqvlpz2yvl5cq485nbfkl1kxanp36bkxigz6c"; + version = "0.0.0.2"; + sha256 = "01md9n18kwsm2myr1wfv16z404c4d92iz4g7nhixrkl6dvgq8fyc"; libraryHaskellDepends = [ aeson base bytestring mongoDB safe-exceptions scientific text time vector @@ -208052,6 +208459,21 @@ self: { broken = true; }) {}; + "ptr-poker" = callPackage + ({ mkDerivation, base, bytestring, gauge, hedgehog, numeric-limits + , rerebase, scientific, text + }: + mkDerivation { + pname = "ptr-poker"; + version = "0.1.1"; + sha256 = "09dklmyarwn4s3lp2l2i1641cs57r6jamqkbyn6qb91nl0f46z52"; + libraryHaskellDepends = [ base bytestring scientific text ]; + testHaskellDepends = [ hedgehog numeric-limits rerebase ]; + benchmarkHaskellDepends = [ gauge rerebase ]; + description = "Pointer poking action construction and composition toolkit"; + license = stdenv.lib.licenses.mit; + }) {}; + "pub" = callPackage ({ mkDerivation, base, bytestring, hedis, optparse-generic, pipes , pipes-bytestring, text @@ -218474,24 +218896,27 @@ self: { , doctest, exceptions, ghc, Glob, hlint, hspec, hspec-core , hspec-expectations, lens-aeson, mtl, QuickCheck , quickcheck-instances, rio, tasty, tasty-hspec, tasty-hunit - , tasty-rerun, tasty-smallcheck, text, transformers, world-peace - , yaml + , tasty-rerun, tasty-smallcheck, text, transformers + , transformers-base, world-peace, yaml }: mkDerivation { pname = "rescue"; - version = "0.2.1"; - sha256 = "1rb7apdlpm69695hcpimmyjn5ar8lld8q1hgag86jsww5dfn2mp7"; + version = "0.3.0"; + sha256 = "0lfvd5x845m2by8n67lgcybp22ppf7yxgglcqzwwfmmpa9qnchq2"; libraryHaskellDepends = [ - base exceptions ghc mtl text transformers world-peace + base exceptions ghc mtl text transformers transformers-base + world-peace ]; testHaskellDepends = [ base directory directory-tree doctest exceptions ghc Glob hlint hspec hspec-core hspec-expectations lens-aeson mtl QuickCheck quickcheck-instances rio tasty tasty-hspec tasty-hunit tasty-rerun - tasty-smallcheck text transformers world-peace yaml + tasty-smallcheck text transformers transformers-base world-peace + yaml ]; benchmarkHaskellDepends = [ - base criterion exceptions ghc mtl text transformers world-peace + base criterion exceptions ghc mtl text transformers + transformers-base world-peace ]; description = "More understandable exceptions"; license = stdenv.lib.licenses.asl20; @@ -241602,8 +242027,8 @@ self: { }: mkDerivation { pname = "stack"; - version = "2.3.3"; - sha256 = "1j2z8cgb9c56g39dh5ff2sri3r3vxddy6ymznkywn6d7c1z4j7qs"; + version = "2.5.1"; + sha256 = "1ffbgs5wgdcvvwbg3pkpgih5dqcbw8mpjj2p49fd8f79cfxmjq20"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -243767,6 +244192,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stm-incremental" = callPackage + ({ mkDerivation, base, hspec, stm }: + mkDerivation { + pname = "stm-incremental"; + version = "0.1.0.2"; + sha256 = "0fynnynx395r9mgm40w2nsb661vy9yaj7wxwfz206yrbpwrvd9vz"; + libraryHaskellDepends = [ base stm ]; + testHaskellDepends = [ base hspec stm ]; + description = "A library for constructing incremental computations"; + license = stdenv.lib.licenses.mit; + }) {}; + "stm-io-hooks" = callPackage ({ mkDerivation, array, base, mtl, stm }: mkDerivation { @@ -244701,6 +245138,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-bytestring_0_1_7" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl + , resourcet, smallcheck, streaming, tasty, tasty-hunit + , tasty-smallcheck, transformers, transformers-base + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.1.7"; + sha256 = "12fd0aqd6vxm8c6ccgqd99m1hh3z3nb155hairnddzix0v3r8zvd"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions mmorph mtl resourcet streaming + transformers transformers-base + ]; + testHaskellDepends = [ + base bytestring resourcet smallcheck streaming tasty tasty-hunit + tasty-smallcheck transformers + ]; + description = "Fast, effectful byte streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streaming-cassava" = callPackage ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck , quickcheck-instances, streaming, streaming-bytestring, text @@ -251085,6 +251544,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-ant-xml_1_1_7" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers + , xml + }: + mkDerivation { + pname = "tasty-ant-xml"; + version = "1.1.7"; + sha256 = "01br1jqmin3kislw59rdsgl4pggdf8miwddifj654dllfgg148vg"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving ghc-prim mtl + stm tagged tasty transformers xml + ]; + description = "Render tasty output to XML for Jenkins"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-auto" = callPackage ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec , tasty-hunit, tasty-quickcheck, tasty-smallcheck @@ -251802,8 +252279,8 @@ self: { pname = "tasty-travis"; version = "0.2.0.2"; sha256 = "0g1qwmr11rgpvm964367mskgrjzbi34lbxzf9c0knx5ij9565gfg"; - revision = "2"; - editedCabalFile = "0m8h9r1cv38sva9k5aws1l4py4xzzmlfwik2avhm8avdr0hl71dk"; + revision = "4"; + editedCabalFile = "10kvalx02kyx2dx6shw00s689hb1qgllpagwy6nxvah6cky438ks"; libraryHaskellDepends = [ base tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Fancy Travis CI output for tasty tests"; @@ -253403,8 +253880,8 @@ self: { }: mkDerivation { pname = "termonad"; - version = "4.0.1.0"; - sha256 = "1658xnsb59hpjj692zkd3rc72x10m83sk5irgiryy0b4yqp7s3hg"; + version = "4.0.1.1"; + sha256 = "1vjxq903jws85n6aihmgif1s168afg2v9ixdxri98mzjkww10sgl"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -255779,8 +256256,8 @@ self: { }: mkDerivation { pname = "th-lego"; - version = "0.1.0.3"; - sha256 = "1gzvvxxy77pz9hxgc3hmz87w17kpiwvzzb5d3ncn13zsyc5j1mcx"; + version = "0.1.0.4"; + sha256 = "16pls283c6r4rx9aiyqacfrq5cy8d1q964fnzzk62517nicb9xyv"; libraryHaskellDepends = [ base template-haskell template-haskell-compat-v0208 text ]; @@ -257235,19 +257712,20 @@ self: { broken = true; }) {}; - "time_1_10" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck, random, tasty - , tasty-hunit, tasty-quickcheck, unix + "time_1_11" = callPackage + ({ mkDerivation, base, criterion, deepseq, QuickCheck, random + , tasty, tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.10"; - sha256 = "1000fhgcvqagvyhm587zf6y9g2ffj517w0hsvvpbzj1sggyjc93s"; + version = "1.11"; + sha256 = "16kmc754gz73plwb7lnk206r9v99va8y4ilbm347h6xmi5z7avp9"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck unix ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; description = "A time library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -262069,8 +262547,8 @@ self: { }: mkDerivation { pname = "ttn"; - version = "0.1.0.0"; - sha256 = "1jk9jhhf2if199il0brwqzrkf7l1p9rszqk9c717wqhh5niy9aip"; + version = "0.2.0.0"; + sha256 = "1bi8ksidpvncs82s02m7314znj876acz0ia61gxgk7yzm2c7nwq0"; libraryHaskellDepends = [ aeson base bytestring text time timerep ]; @@ -262083,24 +262561,21 @@ self: { }) {}; "ttn-client" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , cayene-lpp, config-ini, directory, filepath, monad-logger - , mqtt-hs, pretty-simple, stm, text, ttn + ({ mkDerivation, async, base, base64-bytestring, binary, bytestring + , cayene-lpp, config-ini, directory, filepath, net-mqtt + , network-uri, stm, text, time, ttn }: mkDerivation { pname = "ttn-client"; - version = "0.1.0.1"; - sha256 = "1xyk1amfrsyflkrhb3xhdmszi3gcc9srw9d5zcnbdacgkzm3yn1j"; + version = "0.2.0.0"; + sha256 = "1rvnn57hr2yqj383rknnnpy4k073r8i8cjx6fg4xb1ywwk9v3i86"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base64-bytestring binary bytestring config-ini directory - filepath monad-logger mqtt-hs pretty-simple stm text ttn - ]; - executableHaskellDepends = [ - aeson base binary bytestring cayene-lpp mqtt-hs pretty-simple stm - text ttn + async base base64-bytestring binary bytestring cayene-lpp + config-ini directory filepath net-mqtt network-uri stm text ttn ]; + executableHaskellDepends = [ base text time ttn ]; description = "TheThingsNetwork client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -265820,6 +266295,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unicode-transforms_0_3_7_1" = callPackage + ({ mkDerivation, base, bytestring, deepseq, filepath, gauge + , getopt-generics, ghc-prim, hspec, path, path-io, QuickCheck + , split, text + }: + mkDerivation { + pname = "unicode-transforms"; + version = "0.3.7.1"; + sha256 = "1010sahi4mjzqmxqlj3w73rlymbl2370x5vizjqbx7mb86kxzx4f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ghc-prim text ]; + testHaskellDepends = [ + base deepseq getopt-generics hspec QuickCheck split text + ]; + benchmarkHaskellDepends = [ + base deepseq filepath gauge path path-io text + ]; + description = "Unicode normalization"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unicode-tricks" = callPackage ({ mkDerivation, base, data-default, hspec, hspec-discover , QuickCheck, text @@ -266141,8 +266639,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "uniqueness-periods-vector"; - version = "0.3.0.0"; - sha256 = "139xs292irnsw7574nsrpw5dqsg0g7j71p2jvq6h2bl9wnndsi8b"; + version = "0.3.1.1"; + sha256 = "0nl6rpxsmjw4zsw5x550wlifhrhy4pzkvjxhklb0183n9pl8nkkd"; libraryHaskellDepends = [ base vector ]; description = "Generalization of the uniqueness-periods and uniqueness-periods-general packages functionality"; license = stdenv.lib.licenses.mit; @@ -266152,8 +266650,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "uniqueness-periods-vector-common"; - version = "0.5.0.0"; - sha256 = "1xq5ikwfljbgxh09dp4z3hydz37zqigms9n11bqrmxhq3b6kzk0y"; + version = "0.5.1.1"; + sha256 = "1h7xv3g7rpa2bj7mlydvfn9g14j911jrarpl7665h3rfb6fdq4zq"; libraryHaskellDepends = [ base vector ]; description = "Generalization of the dobutokO-poetry-general package functionality"; license = stdenv.lib.licenses.mit; @@ -266170,14 +266668,14 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-examples"; - version = "0.12.1.0"; - sha256 = "03gk3lrfpn6cn2c2sb22x3baqr45alycv1y6xm26szikc6wa4w6c"; + version = "0.12.3.1"; + sha256 = "18k9my22zn2x6nf2adnwf340jnixzdkyyx2j24nqvcryxx9kagsi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base lists-flines uniqueness-periods-vector uniqueness-periods-vector-common - uniqueness-periods-vector-properties + uniqueness-periods-vector-properties vector ]; executableHaskellDepends = [ base lists-flines mmsyn6ukr parallel phonetic-languages-ukrainian @@ -266208,8 +266706,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-general"; - version = "0.5.0.0"; - sha256 = "1rxv50s8fwvhlz0264ylg8lph4ifdm3gc2by5v8ry8xqclgaxf7l"; + version = "0.5.1.0"; + sha256 = "1abqcxrlchhi5jag6rvaar48ip356p9r1zcndbja72z4dxg9b9q0"; libraryHaskellDepends = [ base print-info uniqueness-periods-vector-common vector ]; @@ -266225,8 +266723,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-properties"; - version = "0.5.4.0"; - sha256 = "0qn8pqny73lmd9al3mlsfzs91rs2y52q1mzpc8xf3bvixhbxvmwa"; + version = "0.5.5.0"; + sha256 = "08pzazvgg0nldybbj1558xvipn3wafqm9491fk2xcrf4na5pc42l"; libraryHaskellDepends = [ base mmsyn6ukr mmsyn7s phonetic-languages-rhythmicity phonetic-languages-ukrainian uniqueness-periods-vector @@ -269156,8 +269654,8 @@ self: { pname = "validated-literals"; version = "0.3.0"; sha256 = "1k77jp19kl7h4v9hl2jhsmbq8dhzl8z9sgkw1jxx1rblm3fszjx1"; - revision = "1"; - editedCabalFile = "1l6b488pnarmx4a1cysbx0lpcx0kvrs4x3bc4sinpnzv0r5az4z4"; + revision = "3"; + editedCabalFile = "0m7iggm5676nayzkj0ip866qg8d4ld6gv38krl02z020m96zax5b"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base bytestring deepseq tasty tasty-hunit tasty-travis @@ -271859,8 +272357,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.9"; - sha256 = "0h5b8sfd91yz09aws5dpwjz4vqcdsfkq4r7xk3jgc02v5f807iga"; + version = "3.6.10"; + sha256 = "028c6n6f62nnwszb4px5mhg2spqb2z4psm06fbc2r1qw6vpqhxn6"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -274587,8 +275085,8 @@ self: { }: mkDerivation { pname = "web-plugins"; - version = "0.3.0"; - sha256 = "08qv5770nq5nivl03q0bdz6v0x3vvyg12q4mgxrj2kds5hkn23nd"; + version = "0.4.0"; + sha256 = "1r3bvwlr7p5vfvibw2ghj7nxw4hgapqqpsrhr55ni8ivlrprs9fh"; libraryHaskellDepends = [ base binary bytestring containers http-types mtl stm text ]; @@ -280170,6 +280668,20 @@ self: { broken = true; }) {}; + "xmonad-dbus" = callPackage + ({ mkDerivation, base, dbus, utf8-string }: + mkDerivation { + pname = "xmonad-dbus"; + version = "0.1.0.0"; + sha256 = "18phy3wxags8cmgs9bdkhwb4gy8fr72j25b18nk44q8956a3060p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base dbus utf8-string ]; + executableHaskellDepends = [ base dbus utf8-string ]; + testHaskellDepends = [ base dbus utf8-string ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xmonad-entryhelper" = callPackage ({ mkDerivation, base, directory, extensible-exceptions, filepath , mtl, process, unix, X11, xmonad, xmonad-contrib @@ -281435,6 +281947,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yamlparse-applicative_0_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , genvalidity-aeson, genvalidity-containers, genvalidity-hspec + , genvalidity-scientific, genvalidity-text + , genvalidity-unordered-containers, hspec, optparse-applicative + , path, path-io, prettyprinter, QuickCheck, scientific, text + , unordered-containers, validity, validity-text, vector, yaml + }: + mkDerivation { + pname = "yamlparse-applicative"; + version = "0.1.0.2"; + sha256 = "1bzf3kbhccxzg88amyk3ys3bwfi99fhmfa843sxn53nrbgphdw09"; + libraryHaskellDepends = [ + aeson base bytestring containers optparse-applicative path path-io + prettyprinter scientific text unordered-containers validity + validity-text vector yaml + ]; + testHaskellDepends = [ + aeson base containers genvalidity-aeson genvalidity-containers + genvalidity-hspec genvalidity-scientific genvalidity-text + genvalidity-unordered-containers hspec QuickCheck scientific text + unordered-containers + ]; + description = "Declaritive configuration parsing with free docs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yampa-canvas" = callPackage ({ mkDerivation, base, blank-canvas, stm, time, Yampa }: mkDerivation { From 5c07a011657a75033f6fafd407abeae7d0f898d2 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 16 Oct 2020 11:36:38 +0200 Subject: [PATCH 13/23] haskellPackages.pandoc: Fix eval again --- 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 6ecb4e016897..4a7b13b53205 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1468,7 +1468,7 @@ self: super: { skylighting-core = doDistribute super.skylighting-core_0_10_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_11; + pandoc = doDistribute self.pandoc_2_11_0_1; # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2); pandoc-types = doDistribute self.pandoc-types_1_22; From 04715a1f0b3b01cf80027882c5e0845a0c41b30e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 13:38:53 +0200 Subject: [PATCH 14/23] LTS Haskell 16.18 --- .../configuration-hackage2nix.yaml | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 59258182b994..55b4c896ca61 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.17 + # LTS Haskell 16.18 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -378,14 +378,14 @@ default-package-overrides: - bytestring-mmap ==0.2.2 - bytestring-strict-builder ==0.4.5.3 - bytestring-to-vector ==0.3.0.1 - - bytestring-tree-builder ==0.2.7.4 + - bytestring-tree-builder ==0.2.7.5 - bz2 ==1.0.0.1 - bzlib-conduit ==0.3.0.2 - c2hs ==0.28.6 - cabal-appimage ==0.3.0.0 - cabal-debian ==5.0.3 - cabal-doctest ==1.0.8 - - cabal-rpm ==2.0.6 + - cabal-rpm ==2.0.7 - cache ==0.1.3.0 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 @@ -803,7 +803,7 @@ default-package-overrides: - flac-picture ==0.1.2 - flags-applicative ==0.1.0.2 - flat ==0.4.4 - - flat-mcmc ==1.5.1 + - flat-mcmc ==1.5.2 - FloatingHex ==0.4 - floatshow ==0.2.4 - flow ==1.0.21 @@ -1011,7 +1011,7 @@ default-package-overrides: - hasql-pool ==0.5.2 - hasql-transaction ==1.0.0.1 - hasty-hamiltonian ==1.3.3 - - HaTeX ==3.22.2.0 + - HaTeX ==3.22.3.0 - HaXml ==1.25.5 - haxr ==3000.11.4.1 - HCodecs ==0.5.2 @@ -1092,7 +1092,7 @@ 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.19 + - HsOpenSSL ==0.11.4.20 - hsp ==0.10.0 - hspec ==2.7.4 - hspec-attoparsec ==0.1.0.2 @@ -1138,7 +1138,7 @@ default-package-overrides: - http-client-tls ==0.3.5.3 - http-common ==0.8.2.1 - http-conduit ==2.3.7.3 - - http-date ==0.0.9 + - http-date ==0.0.10 - http-directory ==0.1.8 - http-download ==0.2.0.0 - httpd-shed ==0.4.1.1 @@ -1153,7 +1153,7 @@ default-package-overrides: - hunit-dejafu ==2.0.0.4 - hvect ==0.4.0.0 - hvega ==0.9.1.0 - - hw-balancedparens ==0.4.1.0 + - hw-balancedparens ==0.4.1.1 - hw-bits ==0.7.2.1 - hw-conduit ==0.2.1.0 - hw-conduit-merges ==0.2.1.0 @@ -1244,7 +1244,7 @@ default-package-overrides: - ipynb ==0.1.0.1 - ipython-kernel ==0.10.2.1 - irc ==0.6.1.0 - - irc-client ==1.1.1.1 + - irc-client ==1.1.2.0 - irc-conduit ==0.3.0.4 - irc-ctcp ==0.1.3.0 - isbn ==1.0.0.0 @@ -1954,7 +1954,6 @@ default-package-overrides: - serialise ==0.2.3.0 - servant ==0.16.2 - servant-auth ==0.3.2.0 - - servant-auth-docs ==0.2.10.0 - servant-auth-server ==0.4.5.1 - servant-auth-swagger ==0.2.10.0 - servant-blaze ==0.9 @@ -2010,7 +2009,7 @@ default-package-overrides: - signal ==0.1.0.4 - silently ==1.2.5.1 - simple-affine-space ==0.1.1 - - simple-cabal ==0.1.2 + - simple-cabal ==0.1.3 - simple-cmd ==0.2.2 - simple-cmd-args ==0.1.6 - simple-log ==0.9.12 @@ -2162,7 +2161,7 @@ default-package-overrides: - tasty ==1.2.3 - tasty-ant-xml ==1.1.6 - tasty-dejafu ==2.0.0.6 - - tasty-discover ==4.2.1 + - tasty-discover ==4.2.2 - tasty-expected-failure ==0.11.1.2 - tasty-golden ==2.3.3.2 - tasty-hedgehog ==1.0.0.2 @@ -2224,8 +2223,8 @@ default-package-overrides: - th-desugar ==1.10 - th-env ==0.1.0.2 - these ==1.1.1.1 - - these-lens ==1.0.0.1 - - these-optics ==1 + - these-lens ==1.0.1.1 + - these-optics ==1.0.1.1 - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.2 @@ -2309,7 +2308,7 @@ default-package-overrides: - type-map ==0.1.6.0 - type-natural ==0.8.3.1 - typenums ==0.1.2.1 - - type-of-html ==1.5.1.0 + - type-of-html ==1.5.2.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - typerep-map ==0.3.3.0 From 00a4f58ac2ae821b16436140d789d656288423a9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 13:40:38 +0200 Subject: [PATCH 15/23] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-20-g9bb4291 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/7c472f7b257e413dbc9ec8866a205f7f04f8ca66. --- .../haskell-modules/hackage-packages.nix | 368 ++++-------------- 1 file changed, 86 insertions(+), 282 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8112e540e612..62d8e927c0da 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9705,26 +9705,6 @@ self: { }) {}; "HaTeX" = callPackage - ({ mkDerivation, base, bibtex, bytestring, containers, hashable - , matrix, parsec, prettyprinter, QuickCheck, tasty - , tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "HaTeX"; - version = "3.22.2.0"; - sha256 = "0l2csqvyxl399p6jmp8nkabsn8bh4k94wblh7qbn13q8zrmzmmzp"; - libraryHaskellDepends = [ - base bibtex bytestring containers hashable matrix parsec - prettyprinter QuickCheck text transformers - ]; - testHaskellDepends = [ - base parsec QuickCheck tasty tasty-quickcheck text - ]; - description = "The Haskell LaTeX library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HaTeX_3_22_3_0" = callPackage ({ mkDerivation, base, bibtex, bytestring, containers, hashable , matrix, parsec, prettyprinter, QuickCheck, tasty , tasty-quickcheck, text, transformers @@ -9742,7 +9722,6 @@ self: { ]; description = "The Haskell LaTeX library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HaTeX-meta" = callPackage @@ -10852,20 +10831,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.4.19"; - sha256 = "0iy3qrir13kp1c7a0xwj2ngfwhqxqbc5j0vj5mi0w3arv7w0x6ds"; - 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_20" = callPackage ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; @@ -10877,7 +10842,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 @@ -24497,8 +24461,8 @@ self: { }: mkDerivation { pname = "aeson-commit"; - version = "1.1"; - sha256 = "09rshnxziav4kwvalq2p059bgv9q2lqdac6f4ks8s7lxgmsmyh3z"; + version = "1.2"; + sha256 = "09h0gjq9kg1krfsxsy1x697ndi6rajsyqk6j4kkcrq48ynq9vfxr"; libraryHaskellDepends = [ aeson base mtl text ]; testHaskellDepends = [ aeson aeson-qq base containers hspec mtl some tasty tasty-hspec @@ -39482,6 +39446,22 @@ self: { broken = true; }) {}; + "benchpress_0_2_2_15" = callPackage + ({ mkDerivation, base, bytestring, mtl, time }: + mkDerivation { + pname = "benchpress"; + version = "0.2.2.15"; + sha256 = "0bffchlwcyqgbnviqvm01lyj7zldvd3yj9yqnc8150lgxr29kvf9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl time ]; + executableHaskellDepends = [ base bytestring time ]; + description = "Micro-benchmarking with detailed statistics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "bencode" = callPackage ({ mkDerivation, base, binary, bytestring, containers, hspec , parsec, QuickCheck, transformers, transformers-compat @@ -47675,29 +47655,6 @@ self: { }) {}; "bytestring-tree-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq - , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "bytestring-tree-builder"; - version = "0.2.7.4"; - sha256 = "1j0jr2xnbqwnl6zwsi07hx9nbw9643xmamp7y3maqhha78h7x4mh"; - libraryHaskellDepends = [ - base base-prelude bytestring semigroups text - ]; - testHaskellDepends = [ - base-prelude bytestring QuickCheck quickcheck-instances tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base-prelude bytestring criterion deepseq - ]; - description = "A very efficient ByteString builder implementation based on the binary tree"; - license = stdenv.lib.licenses.mit; - }) {}; - - "bytestring-tree-builder_0_2_7_5" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq , QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text @@ -47716,7 +47673,6 @@ self: { ]; description = "A very efficient ByteString builder implementation based on the binary tree"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-trie" = callPackage @@ -48989,27 +48945,6 @@ self: { }) {}; "cabal-rpm" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, extra - , filepath, http-client, http-client-tls, http-conduit - , optparse-applicative, process, simple-cabal, simple-cmd - , simple-cmd-args, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; - version = "2.0.6"; - sha256 = "1f27arazgv65ripbcjirs4hl5ywr7a7s0vcr5s7jd7176h8dr35b"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal directory extra filepath http-client - http-client-tls http-conduit optparse-applicative process - simple-cabal simple-cmd simple-cmd-args time unix - ]; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "cabal-rpm_2_0_7" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, extra , filepath, http-client, http-client-tls, http-conduit , optparse-applicative, process, simple-cabal, simple-cmd @@ -49028,7 +48963,6 @@ self: { ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-scripts" = callPackage @@ -60583,6 +60517,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit_1_3_3" = 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.3"; + sha256 = "0jv3j1dc7iswi3kljn9y3jq7rn2aiq9d1vkn2xdpirc519ckxfnl"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, conduit-zstd, containers @@ -81153,7 +81116,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "egison_4_1_0" = callPackage + "egison_4_1_1" = callPackage ({ mkDerivation, array, base, containers, criterion, directory , exceptions, filepath, ghc, ghc-paths, Glob, hashable, haskeline , HUnit, megaparsec, mtl, optparse-applicative, parsec @@ -81163,8 +81126,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "4.1.0"; - sha256 = "0qhan5mlb9pvdwbjk0pl59z8y6dn2kbcl21k7rnzhqwf5a5l556d"; + version = "4.1.1"; + sha256 = "16z2zp3gjm3gwp884ab86g0vhkxkkfxma0p9h1as5fyc6kvnsdbn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -91594,24 +91557,6 @@ self: { }) {}; "flat-mcmc" = callPackage - ({ mkDerivation, base, formatting, mcmc-types, monad-par - , monad-par-extras, mwc-probability, pipes, primitive, text - , transformers, vector - }: - mkDerivation { - pname = "flat-mcmc"; - version = "1.5.1"; - sha256 = "1fi18hx6mz7qskhnnjviaghqz0vsbrvglyk16xzj3kywx70hakpb"; - libraryHaskellDepends = [ - base formatting mcmc-types monad-par monad-par-extras - mwc-probability pipes primitive text transformers vector - ]; - testHaskellDepends = [ base vector ]; - description = "Painless general-purpose sampling"; - license = stdenv.lib.licenses.mit; - }) {}; - - "flat-mcmc_1_5_2" = callPackage ({ mkDerivation, base, formatting, mcmc-types, monad-par , monad-par-extras, mwc-probability, pipes, primitive, text , transformers, vector @@ -91627,7 +91572,6 @@ self: { testHaskellDepends = [ base vector ]; description = "Painless general-purpose sampling"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flat-tex" = callPackage @@ -114168,6 +114112,17 @@ self: { broken = true; }) {}; + "hakyll-process" = callPackage + ({ mkDerivation, base, bytestring, hakyll, typed-process }: + mkDerivation { + pname = "hakyll-process"; + version = "0.0.1.0"; + sha256 = "00fiqlxj581gf5y0jva22kmssx6c152s8i7a9csb3hlssmbqmhj7"; + libraryHaskellDepends = [ base bytestring hakyll typed-process ]; + description = "Hakyll compiler for arbitrary external processes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hakyll-sass" = callPackage ({ mkDerivation, aeson-pretty, base, data-default-class, filepath , hakyll, hsass @@ -138721,24 +138676,6 @@ self: { }) {}; "http-date" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, doctest - , hspec, old-locale, time - }: - mkDerivation { - pname = "http-date"; - version = "0.0.9"; - sha256 = "0dxrlwaqdimgxr8nziyzgqsrg44dl9gxa060cg0k7ndpnlpcbjwa"; - revision = "1"; - editedCabalFile = "0pmmbxcqamyrg71vyfjqi0cvzv8wvnx12mw3yxw7fnqg55fmagy4"; - libraryHaskellDepends = [ array attoparsec base bytestring time ]; - testHaskellDepends = [ - base bytestring doctest hspec old-locale time - ]; - description = "HTTP Date parser/formatter"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-date_0_0_10" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, doctest , hspec, old-locale, time }: @@ -138752,7 +138689,6 @@ self: { ]; description = "HTTP Date parser/formatter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-directory" = callPackage @@ -140421,46 +140357,6 @@ self: { }) {}; "hw-balancedparens" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, directory - , doctest, doctest-discover, generic-lens, hedgehog, hspec - , hspec-discover, hw-bits, hw-excess, hw-fingertree - , hw-hspec-hedgehog, hw-int, hw-prim, hw-rankselect-base, lens - , mmap, optparse-applicative, transformers, vector - }: - mkDerivation { - pname = "hw-balancedparens"; - version = "0.4.1.0"; - sha256 = "1ddxg00pwjvlrd4zdx9b9y7hm8rgxsxkvzzvwc34p2y75rivp21l"; - revision = "1"; - editedCabalFile = "0mc9lmjc3xrad4jlc9v66078362a791hnrrg9bclg1nq7jicfxgx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-int - hw-prim hw-rankselect-base vector - ]; - executableHaskellDepends = [ - base bytestring generic-lens hw-bits hw-prim lens mmap - optparse-applicative vector - ]; - testHaskellDepends = [ - base directory doctest doctest-discover hedgehog hspec hw-bits - hw-hspec-hedgehog hw-int hw-prim hw-rankselect-base transformers - vector - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ - base criterion deepseq directory generic-lens hedgehog hw-bits - hw-prim lens vector - ]; - doHaddock = false; - description = "Balanced parentheses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hw-balancedparens_0_4_1_1" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , doctest, doctest-discover, generic-lens, hedgehog, hspec , hspec-discover, hw-bits, hw-excess, hw-fingertree @@ -148043,26 +147939,6 @@ self: { }) {}; "irc-client" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, containers - , contravariant, exceptions, irc-conduit, irc-ctcp, mtl - , network-conduit-tls, old-locale, profunctors, stm, stm-chans - , text, time, tls, transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "irc-client"; - version = "1.1.1.1"; - sha256 = "08s1qb9dc6icz9fxfp5swcx817685vj833l8ijpf1gdgyzw6wfdq"; - libraryHaskellDepends = [ - base bytestring conduit connection containers contravariant - exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale - profunctors stm stm-chans text time tls transformers x509 - x509-store x509-validation - ]; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-client_1_1_2_0" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl , network-conduit-tls, old-locale, profunctors, stm, stm-chans @@ -148080,7 +147956,6 @@ self: { ]; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-colors" = callPackage @@ -191770,7 +191645,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_11_0_1" = callPackage + "pandoc_2_11_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -191789,8 +191664,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.11.0.1"; - sha256 = "195g1y1i4n11qfk2mmgfnhvdcraf937ipvb7swb6fvyv5qlwj4w9"; + version = "2.11.0.2"; + sha256 = "0lnzypad3jfix7h78gk4fvyl0x3n7f77i8bn6dn2lzdsf6wasy8x"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -191929,6 +191804,8 @@ self: { pname = "pandoc-crossref"; version = "0.3.8.2"; sha256 = "15rvyxn05wq7k06v3k4z0wbl85id7vmjkyy92zdp8vcvqbayjm3a"; + revision = "1"; + editedCabalFile = "0r0cj58yn4mkzpq8inzlwp86kmwgz11b2iindcf10rrdqx5c5vrf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -211878,6 +211755,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "radius_0_7_1_0" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptonite, iproute + , lens, memory + }: + mkDerivation { + pname = "radius"; + version = "0.7.1.0"; + sha256 = "1q7dz40n97z5kajn60fszdhq7yb5m33dbd34j94218iqshz844ql"; + libraryHaskellDepends = [ + base binary bytestring cryptonite iproute lens memory + ]; + description = "Remote Authentication Dial In User Service (RADIUS)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "radix" = callPackage ({ mkDerivation, base, filepath }: mkDerivation { @@ -215517,8 +215410,8 @@ self: { }: mkDerivation { pname = "refinery"; - version = "0.2.0.0"; - sha256 = "0nsfmb5y8y0hanh3h03v0n8wa5frgj85gz8ycl8h5z045j2kk3wq"; + version = "0.3.0.0"; + sha256 = "1bsbnxf75prw153c3k02jk84h3sravdi1c1sl75c7sx4xq81qhlp"; libraryHaskellDepends = [ base exceptions logict mmorph mtl ]; testHaskellDepends = [ base checkers exceptions hspec logict mmorph mtl QuickCheck @@ -234080,19 +233973,6 @@ self: { }) {}; "simple-cabal" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath }: - mkDerivation { - pname = "simple-cabal"; - version = "0.1.2"; - sha256 = "1a834zrj58m7nqvwiwfvqi696dib7h69qlb96vh93zqjn9ndv6hz"; - libraryHaskellDepends = [ - base bytestring Cabal directory filepath - ]; - description = "Cabal file wrapper library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cabal_0_1_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath }: mkDerivation { pname = "simple-cabal"; @@ -234103,7 +233983,6 @@ self: { ]; description = "Cabal file wrapper library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-cmd" = callPackage @@ -248509,8 +248388,8 @@ self: { }: mkDerivation { pname = "sweet-egison"; - version = "0.1.1.0"; - sha256 = "1zd1l2gbg7dp53d4jzki6k8jqxdvqgy5gl6jdy325hx1fycrixql"; + version = "0.1.1.2"; + sha256 = "0cf4wq7lmp5y40niwvlmj5l2bvjl16vbv2dx03m86mg1n16jb30y"; libraryHaskellDepends = [ backtracking base egison-pattern-src egison-pattern-src-th-mode haskell-src-exts haskell-src-meta logict template-haskell @@ -251623,32 +251502,6 @@ self: { }) {}; "tasty-discover" = callPackage - ({ mkDerivation, base, containers, directory, filepath, Glob - , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit - , tasty-quickcheck, tasty-smallcheck - }: - mkDerivation { - pname = "tasty-discover"; - version = "4.2.1"; - sha256 = "0ghxrjkqp4w6i47pvdsd25zs6sj10rw4ybkf0pxr598l8qw5nv5y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filepath Glob - ]; - executableHaskellDepends = [ - base containers directory filepath Glob - ]; - testHaskellDepends = [ - base containers directory filepath Glob hedgehog tasty - tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck - tasty-smallcheck - ]; - description = "Test discovery for the tasty framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-discover_4_2_2" = callPackage ({ mkDerivation, base, containers, directory, filepath, Glob , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit , tasty-quickcheck, tasty-smallcheck @@ -251672,7 +251525,6 @@ self: { ]; description = "Test discovery for the tasty framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-expected-failure" = callPackage @@ -256723,17 +256575,6 @@ self: { }) {}; "these-lens" = callPackage - ({ mkDerivation, base, lens, these }: - mkDerivation { - pname = "these-lens"; - version = "1.0.0.1"; - sha256 = "15c05lgmlfm1pijsa3gfvmrsgmbfl5f7mpzzqasm72ip7y8la696"; - libraryHaskellDepends = [ base lens these ]; - description = "Lenses for These"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "these-lens_1_0_1_1" = callPackage ({ mkDerivation, base, lens, these }: mkDerivation { pname = "these-lens"; @@ -256742,23 +256583,9 @@ self: { libraryHaskellDepends = [ base lens these ]; description = "Lenses for These"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "these-optics" = callPackage - ({ mkDerivation, base, optics-core, these }: - mkDerivation { - pname = "these-optics"; - version = "1"; - sha256 = "0gmsykzcjx5h6dbfny4dw3jrm33ykcw6rpngf5awwdpg3a4cfgi7"; - revision = "4"; - editedCabalFile = "1wdh7l300ckmx72ky0qjgmfv075rnzj78zv5hlgna0f9df7ib3yw"; - libraryHaskellDepends = [ base optics-core these ]; - description = "Optics for These"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "these-optics_1_0_1_1" = callPackage ({ mkDerivation, base, optics-core, these }: mkDerivation { pname = "these-optics"; @@ -256767,7 +256594,6 @@ self: { libraryHaskellDepends = [ base optics-core these ]; description = "Optics for These"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "these-skinny" = callPackage @@ -264254,27 +264080,6 @@ self: { }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, containers - , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim - , hspec, QuickCheck, random, text, weigh - }: - mkDerivation { - pname = "type-of-html"; - version = "1.5.1.0"; - sha256 = "14bz0gjf6rfnrisffp9lvvyzdimdhdcg5mwy5n9mrzlg4nv5pi2c"; - libraryHaskellDepends = [ - base bytestring containers double-conversion ghc-prim text - ]; - testHaskellDepends = [ base bytestring hspec QuickCheck ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring criterion deepseq ghc ghc-paths random - text weigh - ]; - description = "High performance type driven html generation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "type-of-html_1_5_2_0" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim , hspec, QuickCheck, random, text, weigh @@ -264293,7 +264098,6 @@ self: { ]; description = "High performance type driven html generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-of-html-static" = callPackage From 8f038f237045db5fff401a5241736c05e328cfba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 13:45:18 +0200 Subject: [PATCH 16/23] haskell-pandoc: update override for the latest 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 4a7b13b53205..79e0c1e220af 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1468,7 +1468,7 @@ self: super: { skylighting-core = doDistribute super.skylighting-core_0_10_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_11_0_1; + pandoc = doDistribute self.pandoc_2_11_0_2; # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2); pandoc-types = doDistribute self.pandoc-types_1_22; From 4a0857e650243455c0e414c500935f09e889faa1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 13:48:15 +0200 Subject: [PATCH 17/23] hackage2nix: disable failing builds to fix evaluation --- .../haskell-modules/configuration-hackage2nix.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 55b4c896ca61..f1bb7a2fbc59 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3905,6 +3905,7 @@ broken-packages: - cmv - cnc-spec-compiler - co-log + - co-log-polysemy-formatting - co-log-sys - Coadjute - coalpit @@ -5688,6 +5689,7 @@ broken-packages: - hakyll-filestore - hakyll-images - hakyll-ogmarkup + - hakyll-process - hakyll-R - hakyll-sass - hakyll-series @@ -7495,6 +7497,7 @@ broken-packages: - lol-typing - loli - longboi + - longshot - lookup-tables - loop-effin - loop-while @@ -7932,6 +7935,7 @@ broken-packages: - mu-grpc-server - mu-kafka - mu-protobuf + - mu-servant-server - MuCheck - MuCheck-Hspec - MuCheck-HUnit From 0e580ae2469727bdd4ac15e9391d0ff8618251b3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 13:49:04 +0200 Subject: [PATCH 18/23] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-20-g9bb4291 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/7c472f7b257e413dbc9ec8866a205f7f04f8ca66. --- pkgs/development/haskell-modules/hackage-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 62d8e927c0da..ab357a276d56 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -57036,6 +57036,8 @@ self: { ]; description = "A Polysemy logging effect for high quality (unstructured) logs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "co-log-sys" = callPackage @@ -114121,6 +114123,8 @@ self: { libraryHaskellDepends = [ base bytestring hakyll typed-process ]; description = "Hakyll compiler for arbitrary external processes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-sass" = callPackage @@ -164894,6 +164898,8 @@ self: { ]; description = "Fast Brute-force search using parallelism"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lookup-tables" = callPackage @@ -178159,6 +178165,8 @@ self: { ]; description = "Servant servers for Mu definitions"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mu-tracing" = callPackage From eca97e3a980d449fc3db8129d235db6d6f8ca9cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 20:58:12 +0200 Subject: [PATCH 19/23] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-20-g9bb4291 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/888f7caec360792719c839f83dccf0a5f354987b. --- .../haskell-modules/hackage-packages.nix | 144 ++++++++++++------ 1 file changed, 96 insertions(+), 48 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ab357a276d56..bc446d912bc5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -21882,8 +21882,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.1.7.0"; - sha256 = "1n34zck9z53yga1yak4k8chva6kilfbkaghzkxwif112k1qxgv4a"; + version = "0.1.7.1"; + sha256 = "1yz2bh7mvhc8v4rjzx5wc89x10xnhp0hn40y8n9id982c256vfgm"; libraryHaskellDepends = [ base case-insensitive deepseq ghc-prim hashable integer-gmp primitive QuickCheck scientific tagged template-haskell @@ -82427,8 +82427,8 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.4.0"; - sha256 = "0qhq3h1va7pfcz58mkdw690v88jr3ynk2rrwl0s5qdz8xxvs5n3a"; + version = "0.4.1"; + sha256 = "0pz4s53mn1511hda16qi7l28whq05fcyrf1s8ywq42a3mbayw964"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -82448,8 +82448,8 @@ self: { }: mkDerivation { pname = "elynx-markov"; - version = "0.4.0"; - sha256 = "0ikk9xk71xyn1fmhzx59lfyk9skjkvhg19xb2afhcylnbg41f3wz"; + version = "0.4.1"; + sha256 = "1qzyfxzg6qq7ajm7b3v62qqychhzh4ms2677acvzjgvc51syk1fq"; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-seq hmatrix integration math-functions mwc-random parallel primitive statistics @@ -82468,8 +82468,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.4.0"; - sha256 = "02g67w8xracbasnkha383vz0ls1haxr78ia27k292lx572l17dvv"; + version = "0.4.1"; + sha256 = "0p2kww6fqmfv3bmd5z0c3n8s0rhfbm480jqh16s794xndbbxd15i"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; @@ -82485,8 +82485,8 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.4.0"; - sha256 = "03dh4rjdgn580niljgrl0cfw5h2mah8q1252jq3jx8349jxgpcmh"; + version = "0.4.1"; + sha256 = "1mdl7fzzax4dn68paxivms96jfxriladbkwkbq6hff1z5xdwvj2h"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers matrices mwc-random parallel primitive vector vector-th-unbox word8 @@ -82509,8 +82509,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.4.0"; - sha256 = "0n8rf7y4qxhx35fhbhj4yc541ydsx8qvy66d11sl5a836gmsv0rr"; + version = "0.4.1"; + sha256 = "0dxhwmpaf9r8kr67sa2kn1i7w06skcl1hvxkcranw0xvijwm8g5r"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptohash-sha256 deepseq directory fast-logger hmatrix @@ -82527,23 +82527,23 @@ self: { "elynx-tree" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, deepseq, double-conversion, elynx-nexus - , elynx-tools, hspec, math-functions, mwc-random, primitive - , QuickCheck, statistics + , elynx-tools, hspec, math-functions, mwc-random, parallel + , primitive, QuickCheck, statistics }: mkDerivation { pname = "elynx-tree"; - version = "0.4.0"; - sha256 = "1j22gkg1971wrih4gs4bxzkghvd3ddj85s6s5mcqhrfxmdnpsn2c"; + version = "0.4.1"; + sha256 = "1yd2gk0y55vjaw6b2m6cm25qidmznmvhrb3ypr4rb3bg4yck5ydh"; libraryHaskellDepends = [ aeson attoparsec base bytestring comonad containers deepseq - double-conversion elynx-nexus math-functions mwc-random primitive - statistics + double-conversion elynx-nexus math-functions mwc-random parallel + primitive statistics ]; testHaskellDepends = [ attoparsec base bytestring containers elynx-tools hspec QuickCheck ]; benchmarkHaskellDepends = [ - base bytestring criterion elynx-tools + base bytestring criterion deepseq elynx-tools mwc-random parallel ]; description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3Plus; @@ -114118,8 +114118,8 @@ self: { ({ mkDerivation, base, bytestring, hakyll, typed-process }: mkDerivation { pname = "hakyll-process"; - version = "0.0.1.0"; - sha256 = "00fiqlxj581gf5y0jva22kmssx6c152s8i7a9csb3hlssmbqmhj7"; + version = "0.0.2.0"; + sha256 = "03s51ql10g6vjsrzwxa2jwff4wckp7vf3sg9r6hdsbh30l4720il"; libraryHaskellDepends = [ base bytestring hakyll typed-process ]; description = "Hakyll compiler for arbitrary external processes"; license = stdenv.lib.licenses.bsd3; @@ -135313,15 +135313,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lua5_3;}; - "hslua_1_2_0" = callPackage + "hslua_1_3_0" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3 , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "1.2.0"; - sha256 = "0a295zqpbrv8a2hw7msz5p7brlswag16sg08dyz399ij6b7q5x0h"; + version = "1.3.0"; + sha256 = "1dfh1jax6yrk5sf9q8qnq1qgr541xkwwnz9y3q6r8wflvwlj7cal"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base bytestring containers exceptions mtl text @@ -135408,6 +135408,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hslua-module-system_0_2_2_1" = callPackage + ({ mkDerivation, base, containers, directory, exceptions, hslua + , tasty, tasty-hunit, tasty-lua, temporary, text + }: + mkDerivation { + pname = "hslua-module-system"; + version = "0.2.2.1"; + sha256 = "0hk2splyasbplnggknjhlb423axc5b32xq8aq8zal4vvwlqhzvf1"; + libraryHaskellDepends = [ + base containers directory exceptions hslua temporary + ]; + testHaskellDepends = [ + base hslua tasty tasty-hunit tasty-lua text + ]; + description = "Lua module wrapper around Haskell's System module"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hslua-module-text" = callPackage ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text }: @@ -135421,14 +135440,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hslua-module-text_0_3_0" = callPackage + "hslua-module-text_0_3_0_1" = callPackage ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit , tasty-lua, text }: mkDerivation { pname = "hslua-module-text"; - version = "0.3.0"; - sha256 = "1y15b38r0xiwcwpzsdr8x8i4y8all2jd3z0j7fvny6lsbna2hf7r"; + version = "0.3.0.1"; + sha256 = "1vmd15n905i2pcsx748hz3h9kv5nnv74y663rj57q8mp0b40cbfl"; libraryHaskellDepends = [ base bytestring hslua text ]; testHaskellDepends = [ base hslua tasty tasty-hunit tasty-lua text @@ -165716,8 +165735,8 @@ self: { ({ mkDerivation, base, lucid }: mkDerivation { pname = "lucid-cdn"; - version = "0.2.1.0"; - sha256 = "09g98hnw1mf9wih7jpwkvy8iavas8zg672yqj406zwvg786088jf"; + version = "0.2.2.0"; + sha256 = "119d92xc047r98pw0phxplm57nc2jdjz6smkas9hr95mck0d16db"; libraryHaskellDepends = [ base lucid ]; description = "Curated list of CDN imports for lucid"; license = stdenv.lib.licenses.mit; @@ -169627,8 +169646,8 @@ self: { }: mkDerivation { pname = "mcmc"; - version = "0.2.3"; - sha256 = "14xf8l3ka7s34sa4rs4xsy7h5jxpl3fhsn959dvf17nsv252s6p8"; + version = "0.2.4"; + sha256 = "17ahxp7p1klg1j416gvs76a3x1hii5j0fv80rxfrw0w076gn3yy1"; libraryHaskellDepends = [ aeson base bytestring containers data-default directory double-conversion log-domain microlens mwc-random statistics time @@ -191810,10 +191829,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.8.2"; - sha256 = "15rvyxn05wq7k06v3k4z0wbl85id7vmjkyy92zdp8vcvqbayjm3a"; - revision = "1"; - editedCabalFile = "0r0cj58yn4mkzpq8inzlwp86kmwgz11b2iindcf10rrdqx5c5vrf"; + version = "0.3.8.3"; + sha256 = "0x6l3318g2x3q69drbnk2dkzn8l6c5m0msfnmwzbq6g6952gnsam"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -209288,15 +209305,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell_2_0_0_1" = callPackage + "pusher-http-haskell_2_0_0_2" = 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.1"; - sha256 = "05f4p4rnx2gy1f17d83sfpnxrfniq710pyai97gwi4ks3f4avk5a"; + version = "2.0.0.2"; + sha256 = "0ci2wg0y3762n1in8jyw1dpjljdynhl4bfp9506kfkc6ym9j2q1a"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -226377,24 +226394,25 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) secp256k1;}; - "secp256k1-haskell_0_4_0" = callPackage + "secp256k1-haskell_0_5_0" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cereal , deepseq, entropy, hashable, hspec, hspec-discover, HUnit , monad-par, mtl, QuickCheck, secp256k1, string-conversions - , unliftio + , unliftio-core }: mkDerivation { pname = "secp256k1-haskell"; - version = "0.4.0"; - sha256 = "07hgfrr98g42sia5bssch7lrajx7y6fz98f13ly5rjkm5brw0zba"; + version = "0.5.0"; + sha256 = "18mp6ljqwrymvk5gl7v09xq0r7c2fhkvjfs8gdlzwgql35di5g7d"; libraryHaskellDepends = [ base base16-bytestring bytestring cereal deepseq entropy hashable - QuickCheck string-conversions unliftio + QuickCheck string-conversions unliftio-core ]; libraryPkgconfigDepends = [ secp256k1 ]; testHaskellDepends = [ base base16-bytestring bytestring cereal deepseq entropy hashable - hspec HUnit monad-par mtl QuickCheck string-conversions unliftio + hspec HUnit monad-par mtl QuickCheck string-conversions + unliftio-core ]; testToolDepends = [ hspec-discover ]; description = "Bindings for secp256k1"; @@ -236392,8 +236410,8 @@ self: { }: mkDerivation { pname = "slynx"; - version = "0.4.0"; - sha256 = "10a6nqpr422c80vmzjx1r2wgbhkc2kjn7kvmavc0cx1752wn79kc"; + version = "0.4.1"; + sha256 = "1cmbk2ynyd5il0jlci5jbc2mn4vhwgrbr7041vgivnqg3p5mb1lx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -247096,6 +247114,17 @@ self: { broken = true; }) {}; + "subG" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "subG"; + version = "0.1.1.1"; + sha256 = "0726w12aqjmbdvqp8lpv68dh4h98bzv13ng41831ljdr76c3lrsy"; + libraryHaskellDepends = [ base ]; + description = "Some extension to the Foldable and Monoid classes"; + license = stdenv.lib.licenses.mit; + }) {}; + "subcategories" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, foldl , hashable, inspection-testing, mono-traversable, pointed @@ -251911,6 +251940,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-lua_0_2_3_1" = callPackage + ({ mkDerivation, base, bytestring, directory, file-embed, filepath + , hslua, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "tasty-lua"; + version = "0.2.3.1"; + sha256 = "1dw9wbwhyklc2lkpvhj12kdq7kyq6lv9w2586szx3yr5qbpwaggm"; + libraryHaskellDepends = [ + base bytestring file-embed hslua tasty text + ]; + testHaskellDepends = [ + base directory filepath hslua tasty tasty-hunit + ]; + description = "Write tests in Lua, integrate into tasty"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-mgolden" = callPackage ({ mkDerivation, ansi-terminal, base, Diff, filepath, hlint, tasty , tasty-expected-failure, tasty-hunit, text, typed-process @@ -258920,8 +258968,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.4.0"; - sha256 = "1gsyyw8bvlc15z6hy7cd9w6v6wgjg9ra19w9vp6kajlyzyw5j1kw"; + version = "0.4.1"; + sha256 = "07fql189rm0xc7vx3ch86n5xrhd57zn2h80gxwmr9qaqc5p9b2qp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 9c9a8bd877e119bc70899b625ca639fa9217fa1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 20:57:28 +0200 Subject: [PATCH 20/23] hackag2nix: constrain fourmulu and refinery to older versions --- .../development/haskell-modules/configuration-hackage2nix.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f1bb7a2fbc59..2082da20618d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,6 +72,9 @@ 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 + # haskell-language-server 0.5.0.0 doesn't accept newer versions + - fourmolu ==0.2.* + - refinery ==0.2.* # LTS Haskell 16.18 - abstract-deque ==0.3 - abstract-par ==0.3.3 From 84022e0b1508f506a52671134032a8db111eb696 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 21:00:13 +0200 Subject: [PATCH 21/23] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-20-g9bb4291 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/888f7caec360792719c839f83dccf0a5f354987b. --- .../haskell-modules/hackage-packages.nix | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bc446d912bc5..74c6e3b92f9c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -93689,6 +93689,34 @@ self: { }) {}; "fourmolu" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec + , hspec-discover, HsYAML, HsYAML-aeson, mtl, optparse-applicative + , path, path-io, syb, text + }: + mkDerivation { + pname = "fourmolu"; + version = "0.2.0.0"; + sha256 = "1jak0xgd6gcbw7icyrblvqnvzjyyakpw2zfnqj1z958qyg763v52"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory dlist exceptions + filepath ghc-lib-parser HsYAML HsYAML-aeson mtl syb text + ]; + executableHaskellDepends = [ + base directory ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "fourmolu_0_3_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec , hspec-discover, HsYAML, HsYAML-aeson, mtl, optparse-applicative @@ -93714,6 +93742,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fpco-api" = callPackage @@ -215430,6 +215459,22 @@ self: { }) {}; "refinery" = callPackage + ({ mkDerivation, base, checkers, exceptions, hspec, logict, mmorph + , mtl, QuickCheck + }: + mkDerivation { + pname = "refinery"; + version = "0.2.0.0"; + sha256 = "0nsfmb5y8y0hanh3h03v0n8wa5frgj85gz8ycl8h5z045j2kk3wq"; + libraryHaskellDepends = [ base exceptions logict mmorph mtl ]; + testHaskellDepends = [ + base checkers exceptions hspec logict mmorph mtl QuickCheck + ]; + description = "Toolkit for building proof automation systems"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "refinery_0_3_0_0" = callPackage ({ mkDerivation, base, checkers, exceptions, hspec, logict, mmorph , mtl, QuickCheck }: @@ -215443,6 +215488,7 @@ self: { ]; description = "Toolkit for building proof automation systems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reflection" = callPackage From ee44940ee5c0f3d50e096ab00ae5d0064e098558 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 21:31:53 +0200 Subject: [PATCH 22/23] stack: override pantry to the latest version to fix the build --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ pkgs/development/haskell-modules/configuration-nix.nix | 1 + 2 files changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 79e0c1e220af..43753f147def 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1478,6 +1478,10 @@ self: super: { domain-auth = dontCheck super.domain-auth; # INSERT NEW OVERRIDES ABOVE THIS LINE + # stack-2.5.1 needs a more current version of pantry to compile + pantry = self.pantry_0_5_1_3; + + # haskell-language-server needs a more current version of pantry to compile } // (let inherit (self) hls-ghcide hls-brittany; hlsScopeOverride = self: super: { diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 68fb11657022..2158386629aa 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -645,6 +645,7 @@ self: super: builtins.intersectAttrs super { # Tests require internet http-download = dontCheck super.http-download; pantry = dontCheck super.pantry; + pantry_0_5_1_3 = dontCheck super.pantry_0_5_1_3; # gtk2hs-buildtools is listed in setupHaskellDepends, but we # need it during the build itself, too. From 4ec5eee6240d8214bdf65a2f0f75b7a28b977f28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Oct 2020 21:36:20 +0200 Subject: [PATCH 23/23] stylish-haskell: jailbreak build with ghc-8.10.x to support Cabal-3.2.x --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++ 1 file changed, 3 insertions(+) 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 5b4768829431..71680074b746 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -129,4 +129,7 @@ self: super: { executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; })); + # Break out of "Cabal < 3.2" constraint. + stylish-haskell = doJailbreak super.stylish-haskell; + }