From 2262ecdb5ef53fed93e4a93a4fafd66937277f0d Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Sat, 14 May 2022 13:57:27 +0800 Subject: [PATCH 01/21] all-cabal-hashes: 2022-05-10T13:45:20Z -> 2022-05-14T01:13:33Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 06bdca4f111..061704e9260 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "38aa99a1623af5371157721c2a4b033b828e9938", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/38aa99a1623af5371157721c2a4b033b828e9938.tar.gz", - "sha256": "0phak7cjg3nrj5i3ih2k95hcwx25s6zijbp81ycqd0yb108gvw34", - "msg": "Update from Hackage at 2022-05-10T13:45:20Z" + "commit": "2c56a18f7c408d4fd67a3667d93cab163692fc53", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2c56a18f7c408d4fd67a3667d93cab163692fc53.tar.gz", + "sha256": "0yvikmygrb6gb0lv4jp00rsqnagvkrc94sgmrn1gfjlmazss77z5", + "msg": "Update from Hackage at 2022-05-14T01:13:33Z" } From d386160e75b85de0275660496c2d2ab0ea2071ab Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Sat, 14 May 2022 13:58:15 +0800 Subject: [PATCH 02/21] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 843 +++++++++++++----- 1 file changed, 603 insertions(+), 240 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9c9c66bc38e..6b9abbcf955 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3032,8 +3032,8 @@ self: { pname = "Chart"; version = "1.9.3"; sha256 = "0p69kq5kh40gd4y8wqabypmw67pqh42vaaw64zv9sf8j075g85ry"; - revision = "2"; - editedCabalFile = "04mmsm54mdqcrypvgawhhbwjscmky3j7g5841bc71c0q6d33h2k4"; + revision = "3"; + editedCabalFile = "0lgfq5cmhx0q9wqnplw1xr5ql88jjffzc0i72v1lfiqsp9w3lppf"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -3050,8 +3050,8 @@ self: { pname = "Chart-cairo"; version = "1.9.3"; sha256 = "0clm68alzsakkn5m4h49dgx33crajacsykb4hry2fh9zxp9j743f"; - revision = "2"; - editedCabalFile = "0z93znn3dpgj80iiz3a67m90x0j9ljr0jd1ws9jkzj7rk88014gp"; + revision = "3"; + editedCabalFile = "1d48i6y0lzj066swdb3x56jipxwlx1szwn7j43d50hxmcfjrsgc9"; libraryHaskellDepends = [ array base cairo Chart colour data-default-class lens mtl old-locale operational time @@ -3070,8 +3070,8 @@ self: { pname = "Chart-diagrams"; version = "1.9.3"; sha256 = "075yzq50jpakgq6lb3anr660jydm68ry0di33icdacbdymq8avwn"; - revision = "3"; - editedCabalFile = "0gbmgvab7ggws65813xv9913g0jab8k6bcpdnwkri9s4y2pqsrk3"; + revision = "4"; + editedCabalFile = "0qsgg78plwr7wabc680x8qshv137vhplqqvs4730xb62z45r6kjl"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers @@ -3163,8 +3163,8 @@ self: { pname = "Chart-tests"; version = "1.9.3"; sha256 = "1xhjd400xf235m345mhn98hjrvvv5qdr90paq4kixh2g0aswnhrd"; - revision = "1"; - editedCabalFile = "1kpqix1wp8qy3ca9fbh3kpbqp48nchvqqjp4n8h4x2bhl80lgvvh"; + revision = "2"; + editedCabalFile = "1i8dxpy504mnf7phg40i5v1p31hbj5xdx0ldz5a5y6irjwy9mawf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -11066,6 +11066,28 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "HsYAML_0_2_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec + , QuickCheck, tasty, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "HsYAML"; + version = "0.2.1.1"; + sha256 = "0a7nbvpl4p8kwbbjfn1dj6s3fif5k8zhbckdvyz1k74pj3yb8ns6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers deepseq mtl parsec text transformers + ]; + testHaskellDepends = [ + base bytestring containers mtl QuickCheck tasty tasty-quickcheck + text + ]; + description = "Pure Haskell YAML 1.2 processor"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "HsYAML-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, HsYAML, mtl , scientific, text, unordered-containers, vector @@ -11074,8 +11096,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.1"; sha256 = "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r"; - revision = "1"; - editedCabalFile = "0d9gih7mkm0k47351539x9vdjvjjysk1rvba88r214qsjxnh4kym"; + revision = "2"; + editedCabalFile = "15j9w4ay9j2yzb14fywljrv8vsv91lhlxf2z3xvmmgmgj6wpf2n4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45908,6 +45930,8 @@ self: { pname = "bm"; version = "0.1.0.2"; sha256 = "1rpwlbhn5fkndw19ryksm9x2fcg7z7xscigi4zfs9v4w16skn7zj"; + revision = "1"; + editedCabalFile = "0jkl79smdm144qz074zshzl22cjhfr8mnddgwlj1hfn8anksv3yd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48050,6 +48074,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "buffer-builder_0_2_4_8" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances + , text, unordered-containers, vector + }: + mkDerivation { + pname = "buffer-builder"; + version = "0.2.4.8"; + sha256 = "14l70h4j1dmhm96fsxg1mhiw00h9jqw0wy02v31lsz0jwpdr2513"; + libraryHaskellDepends = [ + base bytestring mtl text unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring criterion deepseq HTF + quickcheck-instances text vector + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion deepseq http-types json-builder + text vector + ]; + description = "Library for efficiently building up buffers, one piece at a time"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "buffer-builder-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, buffer-builder , bytestring, criterion, deepseq, hashable, HUnit, integer-gmp @@ -48941,6 +48990,22 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "byte-count-reader_0_10_1_9" = callPackage + ({ mkDerivation, base, extra, hspec, parsec, parsec-numbers, text + }: + mkDerivation { + pname = "byte-count-reader"; + version = "0.10.1.9"; + sha256 = "0k9ayxy7snxp0wc9wqqb8yka4zyc6s3bkm98znzbpznhqld81x8v"; + libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; + testHaskellDepends = [ + base extra hspec parsec parsec-numbers text + ]; + description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "byte-order" = callPackage ({ mkDerivation, base, primitive, primitive-unaligned, wide-word }: mkDerivation { @@ -58327,22 +58392,20 @@ self: { }) {}; "cleveland" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base-noprelude - , bimap, bytestring, constraints, containers, criterion, cryptonite - , data-default, directory, either, exceptions, file-embed, filepath - , first-class-families, fmt, gauge, hedgehog, hex-text, hspec - , hspec-expectations, HUnit, lens, lorentz, megaparsec, MonadRandom + ({ mkDerivation, aeson, base-noprelude, bytestring, constraints + , containers, criterion, cryptonite, data-default, directory + , either, exceptions, file-embed, filepath, fmt, hedgehog, hex-text + , hspec, hspec-expectations, HUnit, lens, lorentz, MonadRandom , morley, morley-client, morley-prelude, mtl, named, o-clock , optparse-applicative, safe-exceptions, servant-client - , servant-client-core, silently, singletons, spoon, statistics, syb - , tagged, tasty, tasty-ant-xml, tasty-discover, tasty-hedgehog - , tasty-hspec, tasty-hunit-compat, template-haskell, temporary - , text, time, type-spec, unordered-containers, vinyl, with-utf8 + , servant-client-core, singletons, statistics, tagged, tasty + , tasty-ant-xml, tasty-discover, tasty-hedgehog, tasty-hunit-compat + , template-haskell, temporary, text, time, with-utf8 }: mkDerivation { pname = "cleveland"; - version = "0.1.1"; - sha256 = "0hwdcld5blhc1af2xc0d4qjj7vz7gh7989ckkbzfagkaz45d7rr7"; + version = "0.1.2"; + sha256 = "0fci9g9fw0lg6xzb6jxqql6nda0by6p89mxdmwncs6dsh7c2lsaw"; libraryHaskellDepends = [ aeson base-noprelude bytestring constraints containers criterion cryptonite data-default directory either exceptions file-embed fmt @@ -58353,20 +58416,12 @@ self: { tasty-hunit-compat template-haskell text time with-utf8 ]; testHaskellDepends = [ - aeson aeson-pretty aeson-qq base-noprelude bimap bytestring - constraints containers cryptonite data-default directory either - filepath first-class-families fmt hedgehog hex-text hspec - hspec-expectations HUnit lens lorentz megaparsec morley - morley-client morley-prelude mtl named o-clock servant-client - silently singletons spoon syb tasty tasty-hedgehog tasty-hspec - tasty-hunit-compat template-haskell temporary text time type-spec - unordered-containers vinyl with-utf8 + base-noprelude either filepath fmt hedgehog hspec-expectations lens + lorentz morley morley-client morley-prelude named o-clock + servant-client tasty tasty-hedgehog tasty-hunit-compat temporary + text time ]; testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base-noprelude data-default gauge megaparsec morley morley-prelude - with-utf8 - ]; description = "Testing framework for Morley"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -63812,6 +63867,8 @@ self: { pname = "conduit-extra"; version = "1.3.5"; sha256 = "1n8js1y1rdswvp0bkjmmz19fag19bdxgwsrqz93yc09w43p8sr4a"; + revision = "1"; + editedCabalFile = "0pkixzcwqfisn5dk44z67k5bwc60fr6d3fwjrlzpx6jdqsvbbbmg"; libraryHaskellDepends = [ async attoparsec base bytestring conduit directory filepath network primitive process resourcet stm streaming-commons text transformers @@ -63829,6 +63886,36 @@ self: { license = lib.licenses.mit; }) {}; + "conduit-extra_1_3_6" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring, conduit + , directory, exceptions, filepath, gauge, hspec, hspec-discover + , network, primitive, process, QuickCheck, resourcet, stm + , streaming-commons, text, transformers, transformers-base + , typed-process, unliftio-core + }: + mkDerivation { + pname = "conduit-extra"; + version = "1.3.6"; + sha256 = "0lzip3af77wxf3a3vilfymqhd26gkvabx2fkj22w74nq960c6l49"; + libraryHaskellDepends = [ + async attoparsec base bytestring conduit directory filepath network + primitive process resourcet stm streaming-commons text transformers + typed-process unliftio-core + ]; + testHaskellDepends = [ + async attoparsec base bytestring conduit directory exceptions + filepath hspec process QuickCheck resourcet stm streaming-commons + text transformers transformers-base + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring conduit gauge transformers + ]; + description = "Batteries included conduit: adapters for common libraries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "conduit-find" = callPackage ({ mkDerivation, attoparsec, base, conduit, conduit-combinators , conduit-extra, directory, doctest, either, exceptions, filepath @@ -63923,8 +64010,30 @@ self: { pname = "conduit-parse"; version = "0.2.1.0"; sha256 = "1qfs61qhbr5gc0ch0mmqcqdm4wvs5pkx2z6rki588fhy1kfdp1dm"; + revision = "2"; + editedCabalFile = "0134k9wi1ladmzd1rmb1gad6ig82pqsyb9d30z301anvb99473kz"; + libraryHaskellDepends = [ + base conduit dlist mtl parsers safe safe-exceptions text + transformers + ]; + testHaskellDepends = [ + base conduit mtl parsers resourcet safe-exceptions tasty + tasty-hunit + ]; + description = "Parsing framework based on conduit"; + license = lib.licenses.publicDomain; + }) {}; + + "conduit-parse_0_2_1_1" = callPackage + ({ mkDerivation, base, conduit, dlist, mtl, parsers, resourcet + , safe, safe-exceptions, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "conduit-parse"; + version = "0.2.1.1"; + sha256 = "1xdc04m88lk9183ky020670hj2ilfff3q0zxnphva5p0ij32iyq7"; revision = "1"; - editedCabalFile = "1bgxjn9lbx67584xpwl2k9jrwvlgyqf4vkv0s7vs1nnc1h6qk7qw"; + editedCabalFile = "102y5wad007bz8iqv1nrz38gb24q15k9snl7l7zq9k7pisdxnans"; libraryHaskellDepends = [ base conduit dlist mtl parsers safe safe-exceptions text transformers @@ -63935,6 +64044,7 @@ self: { ]; description = "Parsing framework based on conduit"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; }) {}; "conduit-resumablesink" = callPackage @@ -66713,6 +66823,28 @@ self: { license = lib.licenses.mit; }) {}; + "core-program_0_4_6_4" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-text, directory, exceptions, filepath, fsnotify, hashable + , hourglass, mtl, prettyprinter, safe-exceptions, stm + , template-haskell, terminal-size, text, text-short, transformers + , typed-process, unix + }: + mkDerivation { + pname = "core-program"; + version = "0.4.6.4"; + sha256 = "0bkjb9lpcnkj1lkpw309q3chd9aw5s5gvdprr335121xpjbgl33m"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-text directory + exceptions filepath fsnotify hashable hourglass mtl prettyprinter + safe-exceptions stm template-haskell terminal-size text text-short + transformers typed-process unix + ]; + description = "Opinionated Haskell Interoperability"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-telemetry" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-program, core-text, exceptions, http-streams, io-streams @@ -66771,8 +66903,8 @@ self: { }: mkDerivation { pname = "core-webserver-servant"; - version = "0.1.0.0"; - sha256 = "1d888qpm9g867czdhyv65302badpwg275xran5n3mapfjvk1zbqd"; + version = "0.1.1.0"; + sha256 = "1a5wzw0v5wfkqr856r04pj2l47d0v6n7va7qcx66skkz8q4q3lkl"; libraryHaskellDepends = [ base core-program core-telemetry core-webserver-warp mtl safe-exceptions servant servant-server vault wai @@ -66789,8 +66921,8 @@ self: { }: mkDerivation { pname = "core-webserver-warp"; - version = "0.1.1.3"; - sha256 = "1yjy5y0lvwkjyribhqavcda57s30jc7xjacng2g3p256kfp7mc2r"; + version = "0.1.1.4"; + sha256 = "03jsb8x41v62l065lkdy2zr6cwk80l84ai6lnbwxf1472f5p7619"; libraryHaskellDepends = [ async base bytestring core-data core-program core-telemetry core-text http-types http2 mtl safe-exceptions vault wai warp @@ -79789,19 +79921,19 @@ self: { ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , containers, data-default, emoji, http-client, iso8601-time , JuicyPixels, MonadRandom, mtl, req, safe-exceptions, scientific - , text, time, unliftio, unordered-containers, websockets, wuss + , text, time, unliftio, websockets, wuss }: mkDerivation { pname = "discord-haskell"; - version = "1.12.5"; - sha256 = "1pciyjmgqnv4ra12fshmjb65phgs1l6jsn0ffvargv3gm92g079y"; + version = "1.13.0"; + sha256 = "1bj75kj9pzm0f6dyh8g60s9nvkbsfc80sqrsd7q6czwhi765nqy0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring containers data-default emoji http-client iso8601-time JuicyPixels MonadRandom - mtl req safe-exceptions scientific text time unliftio - unordered-containers websockets wuss + mtl req safe-exceptions scientific text time unliftio websockets + wuss ]; executableHaskellDepends = [ base text unliftio ]; description = "Write bots for Discord in Haskell"; @@ -90992,6 +91124,8 @@ self: { pname = "exceptions"; version = "0.10.5"; sha256 = "12xz2x16pv1a6csz64bpl22v40vykjwvdaiz39i8f8nkwasc1qv6"; + revision = "1"; + editedCabalFile = "0ix0ihq1wm9k24r7pisdpvnh5fysy03d0rxfyc6qx9m2bflk9imj"; libraryHaskellDepends = [ base mtl stm template-haskell transformers ]; @@ -105693,10 +105827,8 @@ self: { }: mkDerivation { pname = "ghc-debug-client"; - version = "0.2.0.0"; - sha256 = "1v0hmvf5larppyx52fhvpwjbzjhn6rl9f5naikqmljp37dv503na"; - revision = "1"; - editedCabalFile = "0m2dqp89zwl3hwyvbw71wzh2h939cch5rkx3h4aabcaqj71qi9gi"; + version = "0.2.1.0"; + sha256 = "0mjpq4rp9dp62dazhcasvggwmmhnn73z8xfxdyd29lh6n7yy2q4q"; libraryHaskellDepends = [ async base binary bitwise containers directory dom-lt eventlog2html filepath ghc-debug-common ghc-debug-convention ghc-prim hashable @@ -107618,8 +107750,8 @@ self: { }: mkDerivation { pname = "ghcup"; - version = "0.1.17.6"; - sha256 = "12paw1jpa0lr6as5a8zapakcisrjvrm0npm7h4xakksnzkbgv05y"; + version = "0.1.17.10"; + sha256 = "18vskipglwds41l1gr1ks7h1h30hasrjdhpmcdm4nhg0ifmjzsag"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110907,26 +111039,25 @@ self: { "glirc" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , bytestring, Cabal, config-schema, config-value, containers - , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL - , HUnit, irc-core, kan-extensions, lens, network, process, psqueues - , random, regex-tdfa, split, stm, template-haskell, text, time - , transformers, unix, unordered-containers, vector, vty + , curve25519, directory, filepath, free, githash, hashable, hookup + , HsOpenSSL, HUnit, irc-core, kan-extensions, lens, network + , process, psqueues, random, regex-tdfa, split, stm + , template-haskell, text, time, transformers, unix + , unordered-containers, vector, vty }: mkDerivation { pname = "glirc"; - version = "2.38"; - sha256 = "1azykkb9rc4q97v9xiqfjv0iys0wswa3nsy10smdkpp7yvv4mca7"; - revision = "2"; - editedCabalFile = "082ndcgp9z1w5pa3s5ss7kqhg66y01lbj57k14zq6zs6c54s4b5i"; + version = "2.39"; + sha256 = "1ws5hvz37lkf3bg4wlx4vfk5pdgf5hnkwzdlwgr22pfmr7p5nc2z"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ async attoparsec base base64-bytestring bytestring config-schema - config-value containers directory filepath free gitrev hashable - hookup HsOpenSSL irc-core kan-extensions lens network process - psqueues random regex-tdfa split stm template-haskell text time - transformers unix unordered-containers vector vty + config-value containers curve25519 directory filepath free githash + hashable hookup HsOpenSSL irc-core kan-extensions lens network + process psqueues random regex-tdfa split stm template-haskell text + time transformers unix unordered-containers vector vty ]; executableHaskellDepends = [ base lens text vty ]; testHaskellDepends = [ base HUnit ]; @@ -136039,8 +136170,8 @@ self: { pname = "hlrdb-core"; version = "0.1.6.2"; sha256 = "19pnwjlcg504kpvxq8r1hwb533adi2d919vgb1lr25c9bdyxc32n"; - revision = "1"; - editedCabalFile = "0d6bwxk390f00qsmhn71sssw47f53j2wgrwwarhs8vvz6kyvncmp"; + revision = "2"; + editedCabalFile = "1iqbd10hym2xh2ydslqpd4gvr6d4k06vmi4bj7d3xw8y4x9fmzaq"; libraryHaskellDepends = [ base bytestring hashable hedis lens mtl profunctors random time unordered-containers @@ -140081,23 +140212,20 @@ self: { "hpqtypes-extras" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers - , cryptohash, deepseq, exceptions, extra, fields-json, hpqtypes - , lifted-base, log-base, monad-control, mtl, QuickCheck, safe - , semigroups, tasty, tasty-bench, tasty-hunit, text, text-show - , time, transformers, transformers-base, uuid-types + , cryptohash, deepseq, exceptions, extra, hpqtypes, log-base, mtl + , tasty, tasty-bench, tasty-hunit, text, text-show, uuid-types }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.14.1.0"; - sha256 = "17ixli3w1ixa7hspvcgggyslpxgprl40vjjavi81c44crj7w4m4q"; + version = "1.15.0.0"; + sha256 = "00v1ig0py49xbwifk107284g8lx149x54nkfcfaj7mnyf7k9j214"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions - extra fields-json hpqtypes lifted-base log-base monad-control mtl - safe semigroups text text-show transformers-base + extra hpqtypes log-base mtl text text-show ]; testHaskellDepends = [ - base exceptions hpqtypes lifted-base log-base monad-control - QuickCheck tasty tasty-hunit text time transformers uuid-types + base containers exceptions hpqtypes log-base tasty tasty-hunit text + uuid-types ]; benchmarkHaskellDepends = [ base deepseq tasty-bench ]; description = "Extra utilities for hpqtypes library"; @@ -144454,14 +144582,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_9_7" = callPackage + "hspec_2_10_0" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.9.7"; - sha256 = "092sfqjkargxxszp9jjqa8ldjz0xv34jwn6k21q59ys5ckvsrpc1"; + version = "2.10.0"; + sha256 = "1l440vdlm7q8rzjz0kqw688l159qiplfgsvhz81snqgn1ja5wk4m"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -144581,7 +144709,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_9_7" = callPackage + "hspec-core_2_10_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, clock, deepseq, directory, filepath, ghc, ghc-boot-th , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -144590,8 +144718,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.9.7"; - sha256 = "040rzqiqwkp373jjpij8lkmv08pp2ya92zzcf95bw8px215rp08n"; + version = "2.10.0"; + sha256 = "1hkr0npvysqby6qy0fnsq1dv1svp42jgn1isd2b6nn4l6a29k95g"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath ghc ghc-boot-th hspec-expectations HUnit QuickCheck @@ -144670,14 +144798,14 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "hspec-discover_2_9_7" = callPackage + "hspec-discover_2_10_0" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.9.7"; - sha256 = "0536kdxjw6p8b6gcwvmr22jbmb6cgzbddi0fkd01b2m847z37sb5"; + version = "2.10.0"; + sha256 = "0r3zi40g5y85z8n3n2wyiicv5gsp9isjx4gap0m400nxr8cqgmxm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -144721,6 +144849,24 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-expectations-json_1_0_0_7" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, Diff, hspec + , HUnit, scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "hspec-expectations-json"; + version = "1.0.0.7"; + sha256 = "0042xf11w74bx7mlly2ca98778jqyb4p2l9iy92gyys85zn5219v"; + libraryHaskellDepends = [ + aeson aeson-pretty base Diff HUnit scientific text + unordered-containers vector + ]; + testHaskellDepends = [ aeson-qq base hspec ]; + description = "Hspec expectations for JSON Values"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-expectations-lens" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, HUnit, lens , silently @@ -145103,6 +145249,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "hspec-need-env_0_1_0_9" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover + , hspec-expectations, setenv, transformers + }: + mkDerivation { + pname = "hspec-need-env"; + version = "0.1.0.9"; + sha256 = "00w4zmb7kzyb5py3kxpx6xwwjy6vz1qb95q8cgk575ipysqskmfj"; + libraryHaskellDepends = [ base hspec-core hspec-expectations ]; + testHaskellDepends = [ base hspec hspec-core setenv transformers ]; + testToolDepends = [ hspec-discover ]; + description = "Read environment variables for hspec tests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-parsec" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, parsec }: mkDerivation { @@ -145236,6 +145398,27 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-smallcheck_0_5_3" = callPackage + ({ mkDerivation, base, base-orphans, call-stack, hspec, hspec-core + , hspec-discover, HUnit, QuickCheck, smallcheck + }: + mkDerivation { + pname = "hspec-smallcheck"; + version = "0.5.3"; + sha256 = "0cjhmhpdll3zg3cy1alqghw86msgafi9b67w5vhd73w7wi5hm0gm"; + libraryHaskellDepends = [ + base call-stack hspec-core HUnit smallcheck + ]; + testHaskellDepends = [ + base base-orphans call-stack hspec hspec-core HUnit QuickCheck + smallcheck + ]; + testToolDepends = [ hspec-discover ]; + description = "SmallCheck support for the Hspec testing framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-snap" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , digestive-functors, directory, HandsomeSoup, hspec, hspec-core @@ -146629,6 +146812,20 @@ self: { license = lib.licenses.mit; }) {}; + "html-entities_1_1_4_6" = callPackage + ({ mkDerivation, attoparsec, base, text, unordered-containers }: + mkDerivation { + pname = "html-entities"; + version = "1.1.4.6"; + sha256 = "16b1n73qg7sv5is18i0zyg5x1i68zw2h9nh115zlqnavmdj913yv"; + libraryHaskellDepends = [ + attoparsec base text unordered-containers + ]; + description = "A codec library for HTML-escaped text and HTML-entities"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "html-entity" = callPackage ({ mkDerivation, attoparsec, base, Cabal, cabal-doctest, doctest , text, unordered-containers @@ -162221,6 +162418,42 @@ self: { license = lib.licenses.bsd3; }) {}; + "katip_0_8_7_1" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , bytestring, containers, criterion, deepseq, directory, either + , filepath, hostname, microlens, microlens-th, monad-control, mtl + , old-locale, quickcheck-instances, regex-tdfa, resourcet + , safe-exceptions, scientific, semigroups, stm, string-conv, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell + , text, time, time-locale-compat, transformers, transformers-base + , transformers-compat, unix, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "katip"; + version = "0.8.7.1"; + sha256 = "157mc5w05j82020g0f65bdjz839fs6cd263xz5z7p00h0y576vg6"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring containers either hostname + microlens microlens-th monad-control mtl old-locale resourcet + safe-exceptions scientific semigroups stm string-conv + template-haskell text time transformers transformers-base + transformers-compat unix unliftio-core unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory microlens + quickcheck-instances regex-tdfa safe-exceptions stm tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + time time-locale-compat unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson async base blaze-builder criterion deepseq directory filepath + safe-exceptions text time transformers unix + ]; + description = "A structured logging framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "katip-datadog" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring , conduit, conduit-extra, connection, containers, katip, network @@ -163112,25 +163345,25 @@ self: { }) {inherit (pkgs) SDL_mixer;}; "keid-core" = callPackage - ({ mkDerivation, adjunctions, base, binary, bytestring - , cryptohash-md5, derive-storable, derive-storable-plugin - , distributive, file-embed, foldl, geomancy, GLFW-b, ktx-codec - , neat-interpolation, optparse-applicative, optparse-simple - , resourcet, rio, rio-app, serialise, StateVar, tagged - , template-haskell, text, transformers, unagi-chan, unliftio - , vector, vulkan, vulkan-utils, VulkanMemoryAllocator, zstd + ({ mkDerivation, base, binary, bytestring, cryptohash-md5 + , derive-storable, derive-storable-plugin, file-embed, foldl + , geomancy, GLFW-b, ktx-codec, neat-interpolation + , optparse-applicative, optparse-simple, resourcet, rio, rio-app + , serialise, StateVar, tagged, template-haskell, text, transformers + , unagi-chan, unliftio, vector, vulkan, vulkan-utils + , VulkanMemoryAllocator, zstd }: mkDerivation { pname = "keid-core"; - version = "0.1.6.0"; - sha256 = "1aa46qwniq9j14axqhijf1zx1v8kay55f1mawvnfcry85jf0iqhm"; + version = "0.1.6.1"; + sha256 = "0r0gkq8hn3gkfpc9c982fhncdfbbk2y06lll515ycs55456bqdnh"; libraryHaskellDepends = [ - adjunctions base binary bytestring cryptohash-md5 derive-storable - derive-storable-plugin distributive file-embed foldl geomancy - GLFW-b ktx-codec neat-interpolation optparse-applicative - optparse-simple resourcet rio rio-app serialise StateVar tagged - template-haskell text transformers unagi-chan unliftio vector - vulkan vulkan-utils VulkanMemoryAllocator zstd + base binary bytestring cryptohash-md5 derive-storable + derive-storable-plugin file-embed foldl geomancy GLFW-b ktx-codec + neat-interpolation optparse-applicative optparse-simple resourcet + rio rio-app serialise StateVar tagged template-haskell text + transformers unagi-chan unliftio vector vulkan vulkan-utils + VulkanMemoryAllocator zstd ]; description = "Core parts of Keid engine"; license = lib.licenses.bsd3; @@ -163142,14 +163375,29 @@ self: { broken = true; }) {}; + "keid-frp-banana" = callPackage + ({ mkDerivation, base, geomancy, keid-core, reactive-banana + , resourcet, rio, these, vulkan + }: + mkDerivation { + pname = "keid-frp-banana"; + version = "0.1.0.0"; + sha256 = "1d0il5v7chn9gyr5gs15d35pyls1ynnn6jfysx7rqhzhglgvc164"; + libraryHaskellDepends = [ + base geomancy keid-core reactive-banana resourcet rio these vulkan + ]; + description = "Reactive Banana integration for Keid engine"; + license = lib.licenses.bsd3; + }) {}; + "keid-geometry" = callPackage ({ mkDerivation, base, geomancy, keid-core, mtl, rio, vector , vulkan }: mkDerivation { pname = "keid-geometry"; - version = "0.1.1.1"; - sha256 = "1jicgdkxwmi16a7bqc3qh9qr2a691nlxk87b5kh674jnhsr59db2"; + version = "0.1.1.2"; + sha256 = "0pyszmw5h9qgsxx76lgc65i75fgimwg8bwwkk5slsk0ggnadwj6w"; libraryHaskellDepends = [ base geomancy keid-core mtl rio vector vulkan ]; @@ -163163,21 +163411,20 @@ self: { }) {}; "keid-render-basic" = callPackage - ({ mkDerivation, adjunctions, aeson, base, bytestring - , derive-storable, derive-storable-plugin, distributive, file-embed - , geomancy, keid-core, keid-geometry, neat-interpolation, resourcet - , rio, tagged, text, unliftio, vector, vulkan, vulkan-utils + ({ mkDerivation, aeson, base, bytestring, derive-storable + , derive-storable-plugin, file-embed, geomancy, keid-core + , keid-geometry, neat-interpolation, resourcet, rio, tagged, text + , unliftio, vector, vulkan, vulkan-utils }: mkDerivation { pname = "keid-render-basic"; - version = "0.1.6.0"; - sha256 = "1dqrx8kvm0hkm0xwgkpihs6bkzgl24rm4jw0kb7ld9j4c8j5gllm"; + version = "0.1.6.1"; + sha256 = "0rp06ap82ky70qhp8prhyi3vkynrn3c2wilr2lmlh2gv64q2ri0g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - adjunctions aeson base bytestring derive-storable - derive-storable-plugin distributive file-embed geomancy keid-core - keid-geometry neat-interpolation resourcet rio tagged text unliftio - vector vulkan vulkan-utils + aeson base bytestring derive-storable derive-storable-plugin + file-embed geomancy keid-core keid-geometry neat-interpolation + resourcet rio tagged text unliftio vector vulkan vulkan-utils ]; description = "Basic rendering programs for Keid engine"; license = lib.licenses.bsd3; @@ -163233,8 +163480,8 @@ self: { }: mkDerivation { pname = "keid-ui-dearimgui"; - version = "0.1.1.0"; - sha256 = "10ivrkbhnd9kwrwywspaj0z2agrddjrf4cv4rxpij28xrhj5jbav"; + version = "0.1.1.1"; + sha256 = "0qxkgrayb365mj7sknzq7w9cxs5ppfzg272cah632bvs70qkl7xl"; libraryHaskellDepends = [ base binary bytestring dear-imgui GLFW-b keid-core resourcet rio rio-app unliftio vector vulkan vulkan-utils VulkanMemoryAllocator @@ -163357,33 +163604,34 @@ self: { "keter" = callPackage ({ mkDerivation, aeson, array, async, attoparsec, base , blaze-builder, bytestring, case-insensitive, conduit - , conduit-extra, containers, data-default, directory, filepath - , fsnotify, hspec, http-client, http-conduit, http-reverse-proxy - , http-types, HUnit, indexed-traversable, lifted-base, mtl, network + , conduit-extra, containers, directory, filepath, fsnotify + , http-client, http-conduit, http-reverse-proxy, http-types, HUnit + , indexed-traversable, lifted-base, mtl, network , optparse-applicative, process, random, regex-tdfa, stm, tar - , template-haskell, text, time, tls, tls-session-manager - , transformers, unix, unix-compat, unordered-containers, vector - , wai, wai-app-static, wai-extra, warp, warp-tls, yaml, zlib + , tasty, tasty-hunit, template-haskell, text, time, tls + , tls-session-manager, transformers, unix, unix-compat + , unordered-containers, vector, wai, wai-app-static, wai-extra + , warp, warp-tls, yaml, zlib }: mkDerivation { pname = "keter"; - version = "1.9"; - sha256 = "00mgh6447p0gsvm7agy1i9a874afirirx2a7qdqnbw1m14j3mzfl"; + version = "2.0"; + sha256 = "0njwkpcsg450ix8h5ciygigphddkx6axnkiilsgwj3b70khxj68i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array async attoparsec base blaze-builder bytestring - case-insensitive conduit conduit-extra containers data-default - directory filepath fsnotify http-client http-conduit - http-reverse-proxy http-types indexed-traversable lifted-base mtl - network optparse-applicative process random regex-tdfa stm tar + case-insensitive conduit conduit-extra containers directory + filepath fsnotify http-client http-conduit http-reverse-proxy + http-types indexed-traversable lifted-base mtl network + optparse-applicative process random regex-tdfa stm tar template-haskell text time tls tls-session-manager transformers unix unix-compat unordered-containers vector wai wai-app-static wai-extra warp warp-tls yaml zlib ]; - executableHaskellDepends = [ base data-default filepath ]; + executableHaskellDepends = [ base filepath ]; testHaskellDepends = [ - base bytestring conduit hspec HUnit transformers unix + base bytestring conduit HUnit tasty tasty-hunit transformers unix ]; description = "Web application deployment manager, focusing on Haskell web frameworks"; license = lib.licenses.mit; @@ -164179,8 +164427,8 @@ self: { }: mkDerivation { pname = "koji-tool"; - version = "0.8.5"; - sha256 = "1zkvw8fibav9n8x7dvw7mcns6zc00il5ajcwsvb1ycbb3pqj82ps"; + version = "0.8.6"; + sha256 = "0743a9badhw1r8sk15b85li3kdksa53njmz39sdd19dfh4hmk8rc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -165324,6 +165572,34 @@ self: { license = "GPL"; }) {}; + "lambdabot-telegram-plugins" = callPackage + ({ mkDerivation, base, containers, dependent-map, dependent-sum + , directory, edit-distance, haskell-src-exts-simple, lambdabot-core + , lambdabot-haskell-plugins, lifted-base, monad-control, mtl + , pretty-simple, process, regex-tdfa, split, stm + , telegram-bot-simple, text, transformers, utf8-string + }: + mkDerivation { + pname = "lambdabot-telegram-plugins"; + version = "0.2.0"; + sha256 = "1fm4amq0a0aqi2mvd0sxj5r3jziy98i2kj7qqin2q6rq0didh0y5"; + revision = "1"; + editedCabalFile = "0ag8pbnz4q9gpdd20axmz90ww260gh7i266pgfylqslz1dlmvirz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers dependent-map dependent-sum directory edit-distance + haskell-src-exts-simple lambdabot-core lifted-base monad-control + mtl pretty-simple process regex-tdfa split stm telegram-bot-simple + text transformers utf8-string + ]; + executableHaskellDepends = [ + base lambdabot-core lambdabot-haskell-plugins mtl + ]; + description = "Lambdabot for Telegram"; + license = lib.licenses.gpl2Plus; + }) {}; + "lambdabot-trusted" = callPackage ({ mkDerivation, base, oeis, QuickCheck, QuickCheck-safe }: mkDerivation { @@ -169420,8 +169696,8 @@ self: { pname = "lentil"; version = "1.5.4.0"; sha256 = "0xfsf7g9r2w30qkp4829w77hsja562jvx4n9i880j9qngi2ms2h1"; - revision = "1"; - editedCabalFile = "15dr5jlb6b18j2brxji4k1g12zwvhpjq96nqb27pjkznm59c4x19"; + revision = "2"; + editedCabalFile = "1n88rdsf5ayprgz1wnbx32gaff8kpixfkdkr6q4jvc896fhrhdzp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -171984,6 +172260,8 @@ self: { pname = "linebreak"; version = "1.1.0.1"; sha256 = "11vqz7zv8ihvhbyma9j6pvxainxfg4kml9fylfjy9jpfvilxq5vq"; + revision = "1"; + editedCabalFile = "0pg3r5zvb13sfyhskyadllxpd2l7xvzvjj8r8rvlq248riq78qdc"; libraryHaskellDepends = [ base hyphenation ]; testHaskellDepends = [ base hspec hyphenation ]; description = "breaks strings to fit width"; @@ -175758,8 +176036,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.13.3"; - sha256 = "158zbmyhia8dcr8fcqg7xqc3xfq6f3i73g7dqbidcysh6c0fwh0p"; + version = "0.13.4"; + sha256 = "10lldpp9618ybgwcy8zvcc8m2q5i0kslxfrd2yhis1d1gd40wglb"; libraryHaskellDepends = [ aeson-pretty base-noprelude bimap bytestring constraints containers cryptonite data-default first-class-families fmt lens morley @@ -176051,6 +176329,8 @@ self: { pname = "lsp"; version = "1.4.0.0"; sha256 = "18hnb4k3zwjxp3r5jrgrbakvqr2d16azp6jwmfv5lq5n8xn6mwgv"; + revision = "1"; + editedCabalFile = "01a4c4qr2zf0izawrkhbw831hawnl576ckw1an07lxvxdif68py4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176080,6 +176360,8 @@ self: { pname = "lsp-test"; version = "0.14.0.2"; sha256 = "1capjilca74cqiwmrhbl1an6ih3227n3g417dfvql0lffa3j6qsf"; + revision = "1"; + editedCabalFile = "0szqlr1brhr1z2m2fwqj98ghh73d2sim4r5mbqzm072f6iycl6ky"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath Glob @@ -187892,15 +188174,14 @@ self: { , haskeline, hex-text, lens, megaparsec, memory, MonadRandom , morley-prelude, mtl, named, optparse-applicative, pairing , parser-combinators, scientific, semigroups, show-type, singletons - , syb, template-haskell, text, text-manipulate, th-lift - , th-lift-instances, th-reify-many, time, timerep - , uncaught-exception, unordered-containers, vector, vinyl - , with-utf8, wl-pprint-text + , syb, template-haskell, text, text-manipulate, th-lift-instances + , th-reify-many, time, timerep, uncaught-exception + , unordered-containers, vector, vinyl, with-utf8, wl-pprint-text }: mkDerivation { pname = "morley"; - version = "1.16.3"; - sha256 = "0s0xkmgymcc8s4izyy094qbyfkvv1f95x8iv4bmmwgkqgjjrlqsp"; + version = "1.16.4"; + sha256 = "17ggz4h5byg81sgji2kmqamynrff27jzdx8g0xvzn6mjdc1frr4f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187910,7 +188191,7 @@ self: { galois-field generic-deriving gitrev hex-text lens megaparsec memory MonadRandom morley-prelude mtl named optparse-applicative pairing parser-combinators scientific semigroups show-type - singletons syb template-haskell text text-manipulate th-lift + singletons syb template-haskell text text-manipulate th-lift-instances th-reify-many time timerep uncaught-exception unordered-containers vector vinyl with-utf8 wl-pprint-text ]; @@ -187938,8 +188219,8 @@ self: { }: mkDerivation { pname = "morley-client"; - version = "0.1.1"; - sha256 = "0zwydp374aynavc0hgx3ab0m951pp4mmxi05gp9006882vndh6c7"; + version = "0.1.2"; + sha256 = "00lp0i2fjn0s4l53d71jkady9pwdg1ya2csjwvlb7xbcr5rmgl6i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189919,8 +190200,8 @@ self: { }: mkDerivation { pname = "mu-rpc"; - version = "0.5.0.1"; - sha256 = "0r5kbi378iwg5b578dydvv4smy2xqn4y33h015fp5nyphxz83173"; + version = "0.5.0.2"; + sha256 = "1fq0c9jymhmbs9nn4zl1s68diq9dixpxc7i726qazz8vvm836dcr"; libraryHaskellDepends = [ aeson base conduit http-types mtl mu-schema sop-core template-haskell text wai @@ -195389,14 +195670,14 @@ self: { license = lib.licenses.mit; }) {}; - "network-wait_0_1_2_0" = callPackage + "network-wait_0_2_0_0" = callPackage ({ mkDerivation, base, exceptions, network, network-simple, retry , tasty, tasty-hunit }: mkDerivation { pname = "network-wait"; - version = "0.1.2.0"; - sha256 = "1fgcp2didz7zp4jpkc9zap94sbd6ny8nyrx6nwnfai2ssw5rxpfq"; + version = "0.2.0.0"; + sha256 = "1g3fvpf91q31gbmla9r3zwm8n3r3v4n1dmznjhwc7wssfmk2jdh0"; libraryHaskellDepends = [ base exceptions network retry ]; testHaskellDepends = [ base exceptions network network-simple retry tasty tasty-hunit @@ -196364,17 +196645,17 @@ self: { "nix-graph" = callPackage ({ mkDerivation, algebraic-graphs, attoparsec, base, containers , hashable, nix-derivation, optparse-applicative, stm, text, ttrie - , unliftio + , unliftio, unordered-containers }: mkDerivation { pname = "nix-graph"; - version = "1.0.1.0"; - sha256 = "0m736px76d2q11m77n9kfw43sh9hqlj1z00ny5xihavxn7jja0xn"; + version = "1.0.2.0"; + sha256 = "0g6kay7j4klgpnd4qq1b0drfc17m4nkip3sks6fn4528r0i95xll"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ algebraic-graphs attoparsec base containers hashable nix-derivation - stm text ttrie unliftio + stm text ttrie unliftio unordered-containers ]; executableHaskellDepends = [ algebraic-graphs base optparse-applicative @@ -197702,10 +197983,8 @@ self: { ({ mkDerivation, base, containers, numeric-prelude, primes }: mkDerivation { pname = "np-extras"; - version = "0.3.1.2"; - sha256 = "1nah4gxagr02nhwbyq2zinx6nj93h40lyw6fv1bv16x8v3d8p69m"; - revision = "1"; - editedCabalFile = "1imcizgbckwcmxwjicads55g0v6abprz3g69b6blkkgmcq5r9x6b"; + version = "0.3.1.3"; + sha256 = "000i8lakkqg9yknqdbyasspmlc8zzpj15dqr8l9kqn5lkfhz1n59"; libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = lib.licenses.bsd3; @@ -200578,15 +200857,15 @@ self: { }: mkDerivation { pname = "open-witness"; - version = "0.5"; - sha256 = "1p3dd7s7zzjxp29w4n6yrfvlmcnrllz07lgnf2mjdv9lspynids0"; + version = "0.6"; + sha256 = "0zysnzp7zdmv9d03xnlcqdsnwjrw934gkz6ngahwaqpbx4pp1zmb"; libraryHaskellDepends = [ base constraints hashable random template-haskell transformers witness ]; testHaskellDepends = [ base mtl tasty tasty-hunit witness ]; description = "open witnesses"; - license = lib.licenses.bsd3; + license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203011,30 +203290,32 @@ self: { license = lib.licenses.bsd3; }) {}; - "ormolu_0_4_0_0" = callPackage - ({ mkDerivation, ansi-terminal, array, base, bytestring, Cabal - , containers, Diff, directory, dlist, exceptions, filepath - , ghc-lib-parser, gitrev, hspec, hspec-discover, mtl - , optparse-applicative, path, path-io, syb, temporary, text + "ormolu_0_5_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring + , Cabal, containers, Diff, directory, dlist, exceptions, filepath + , ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec + , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io + , QuickCheck, syb, template-haskell, temporary, text + , th-lift-instances }: mkDerivation { pname = "ormolu"; - version = "0.4.0.0"; - sha256 = "1alibf9ya2igwwjx23pjd0fi2kdaldrkfdpyr2w211irf9agy0j9"; - revision = "2"; - editedCabalFile = "11r9j19xiaf1kpzr1kz41i8ldchf6ygqp0zxrkgmrzvidpvh6q62"; + version = "0.5.0.0"; + sha256 = "1qfhn2vfg9rbddr93kc14dq40j38pas169cizrrdm507z6hnyc1w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal array base bytestring Cabal containers Diff directory - dlist exceptions filepath ghc-lib-parser mtl syb text + aeson ansi-terminal array base bytestring Cabal containers Diff + directory dlist exceptions filepath ghc-lib-parser megaparsec + MemoTrie mtl syb template-haskell text th-lift-instances ]; executableHaskellDepends = [ - base filepath ghc-lib-parser gitrev optparse-applicative text + base containers filepath ghc-lib-parser gitrev optparse-applicative + text ]; testHaskellDepends = [ - base containers directory filepath hspec path path-io temporary - text + base containers directory filepath ghc-lib-parser hspec + hspec-megaparsec megaparsec path path-io QuickCheck temporary text ]; testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; @@ -204754,9 +205035,9 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-plot_1_5_1" = callPackage + "pandoc-plot_1_5_3" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion - , data-default, directory, filepath, gitrev, hashable, hspec + , data-default, directory, filepath, gitrev, hashable , hspec-expectations, lifted-async, lifted-base, mtl , optparse-applicative, pandoc, pandoc-types, shakespeare, tagsoup , tasty, tasty-hspec, tasty-hunit, template-haskell, text @@ -204764,8 +205045,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.5.1"; - sha256 = "0n0kazc43j4q39r9fp3400clbnpm0nsghv07pv16lwdjbl67sv91"; + version = "1.5.3"; + sha256 = "0d73b9lnbm041an47sx0cmywga0p51dgbmh1gbfad90w6vi4cxpc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204778,8 +205059,8 @@ self: { pandoc pandoc-types template-haskell text typed-process ]; testHaskellDepends = [ - base containers directory filepath hspec hspec-expectations - pandoc-types tasty tasty-hspec tasty-hunit text + base containers directory filepath hspec-expectations pandoc-types + tasty tasty-hspec tasty-hunit text ]; benchmarkHaskellDepends = [ base criterion pandoc-types template-haskell text @@ -204942,8 +205223,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.5.4"; - sha256 = "0mhhjny7djyg8m49klk5kxf4w4nb3hfj3if0qqamyzy3qlpfzpva"; + version = "0.5.5"; + sha256 = "0kk9v6xl3ssfsnk0ng1ar9wm6qw7qln2qcilybldkp8dhy4fvmxq"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -207606,8 +207887,8 @@ self: { }: mkDerivation { pname = "patrol"; - version = "0.0.1"; - sha256 = "08rxyx01mamvc3mfyzyqajfj7239sklz30fw4z8rvi2jrgisbpy7"; + version = "0.0.2"; + sha256 = "183cyyj4d6y5k3rnmrycn6xvkqdkylgi8mrc3n67sv0pww1hl3z2"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-types network-uri text time uuid @@ -217326,8 +217607,8 @@ self: { pname = "postgresql-migration"; version = "0.2.1.3"; sha256 = "1qxkan5f328rv3nl31pvhz305k7b4ah98s0j1bc4hcaa5g5d3052"; - revision = "3"; - editedCabalFile = "1c2qdar418pcss64jkdlwqp1lk5bckaqjk46p4ph4gs73jgbrgvc"; + revision = "4"; + editedCabalFile = "1a7a5qmld6qhbvbjn53ld8pw77gashxhmzlfkhnqv7lwwnnxw8dn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221446,23 +221727,23 @@ self: { }) {}; "prolude" = callPackage - ({ mkDerivation, aeson, amazonka, base, bytestring, cassava - , containers, esqueleto, generic-random, lens, mongoDB, mtl - , network-uri, persistent, persistent-mongoDB, QuickCheck - , quickcheck-instances, safe-exceptions, scientific, servant, stm - , swagger2, text, time, uuid, vector, witch + ({ mkDerivation, aeson, base, bytestring, cassava, containers + , esqueleto, generic-random, lens, mongoDB, network-uri, persistent + , persistent-mongoDB, QuickCheck, quickcheck-instances + , safe-exceptions, scientific, servant, stm, swagger2, text, time + , uuid, vector, witch }: mkDerivation { pname = "prolude"; - version = "0.0.0.24"; - sha256 = "0sn5pxv8zylmg5915k08bxfcnmjd5227xlhmh2x9l1aqlqv7adsh"; + version = "0.0.0.25"; + sha256 = "05bd9qsa1p471yh7hy0s29jzp5shng0qdgj4xsannqfv7gzd995q"; libraryHaskellDepends = [ - aeson amazonka base bytestring cassava containers esqueleto - generic-random lens mongoDB mtl network-uri persistent - persistent-mongoDB QuickCheck quickcheck-instances safe-exceptions - scientific servant stm swagger2 text time uuid vector witch + aeson base bytestring cassava containers esqueleto generic-random + lens mongoDB network-uri persistent persistent-mongoDB QuickCheck + quickcheck-instances safe-exceptions scientific servant stm + swagger2 text time uuid vector witch ]; - description = "ITProTV's custom prelude"; + description = "ACI Learning's custom prelude"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; }) {}; @@ -223691,6 +223972,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "purview" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover + , QuickCheck, raw-strings-qq, scotty, stm, text, time, wai + , wai-extra, wai-websockets, warp, websockets + }: + mkDerivation { + pname = "purview"; + version = "0.1.0.0"; + sha256 = "1h3nyr3ka38vg9ydraa6yh0xzhh0nasj3d40l0jsfrvj2xpr72di"; + libraryHaskellDepends = [ + aeson base bytestring raw-strings-qq scotty stm text wai wai-extra + wai-websockets warp websockets + ]; + testHaskellDepends = [ + aeson base bytestring hspec QuickCheck raw-strings-qq scotty stm + text time wai wai-extra wai-websockets warp websockets + ]; + testToolDepends = [ hspec-discover ]; + description = "Build server rendered, interactive websites"; + license = lib.licenses.bsd3; + }) {}; + "push-notifications" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring , casing, conduit, convertible, data-default, HsOpenSSL @@ -227346,8 +227649,8 @@ self: { ({ mkDerivation, base, doctest, typecheck-plugin-nat-simple }: mkDerivation { pname = "ranged-list"; - version = "0.1.0.1"; - sha256 = "0xjl1fdzazccsk5b96fmsk49fid40w58dbd99cf7550dvwqbnihg"; + version = "0.1.1.1"; + sha256 = "0ky5jzp63565xc9qxq6717c5qbgcisgv9nadjfsqrcxwarp75i6y"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base typecheck-plugin-nat-simple ]; testHaskellDepends = [ base doctest typecheck-plugin-nat-simple ]; @@ -245201,12 +245504,12 @@ self: { }) {}; "servant-jsonrpc" = callPackage - ({ mkDerivation, aeson, base, servant }: + ({ mkDerivation, aeson, base, http-media, servant, text }: mkDerivation { pname = "servant-jsonrpc"; - version = "1.1.0"; - sha256 = "0qy2al8waycarh5973c43bdd9g4a9032waknjsbykhflwglvwmv5"; - libraryHaskellDepends = [ aeson base servant ]; + version = "1.1.1"; + sha256 = "0x5anjs6r7xgd2aqvs3fw4jr9yjz92a7pwa5ydpz63ijw2784j9z"; + libraryHaskellDepends = [ aeson base http-media servant text ]; description = "JSON-RPC messages and endpoints"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -245221,6 +245524,8 @@ self: { pname = "servant-jsonrpc-client"; version = "1.1.0"; sha256 = "0d18qajwpq6np0a61i5qm1z7iwvqrmgixg627diwr1xh4ws1ij8d"; + revision = "1"; + editedCabalFile = "18pnv3j61ah0dvk4pdkrgfv3862nmg2qn3nx8gica5qlbifdj2wm"; libraryHaskellDepends = [ aeson base servant servant-client-core servant-jsonrpc ]; @@ -245230,15 +245535,15 @@ self: { }) {}; "servant-jsonrpc-server" = callPackage - ({ mkDerivation, aeson, base, containers, mtl, servant - , servant-jsonrpc, servant-server + ({ mkDerivation, aeson, base, containers, servant, servant-jsonrpc + , servant-server }: mkDerivation { pname = "servant-jsonrpc-server"; - version = "2.1.0"; - sha256 = "09byg58qm4r9kbcxzr6jbyg5ziih58p0za8ihq4y8w60mznpb055"; + version = "2.1.1"; + sha256 = "1l26zqmxr89mip8znidj5lljl1kj7lpmhxnj8ranvinn3zgk3vck"; libraryHaskellDepends = [ - aeson base containers mtl servant servant-jsonrpc servant-server + aeson base containers servant servant-jsonrpc servant-server ]; description = "JSON-RPC servant servers"; license = lib.licenses.bsd3; @@ -256629,8 +256934,8 @@ self: { pname = "species"; version = "0.4.0.1"; sha256 = "0d9vkplg2lrwb34i2ziaa9hc8dnpkjkmwd5b27kigcqfigck6ym2"; - revision = "2"; - editedCabalFile = "03rzc0f11c60h899nxifz4300hlic2nnnya75rx2b5rigy41714r"; + revision = "3"; + editedCabalFile = "06grcm7m92idd3b33gln1j2mcvykam1h3pin9n2ikpvh3v2ahh18"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell @@ -257778,8 +258083,8 @@ self: { "squeal-postgresql" = callPackage ({ mkDerivation, aeson, async, base, binary, binary-parser - , bytestring, bytestring-strict-builder, deepseq, doctest - , exceptions, free-categories, gauge, generic-random, generics-sop + , bytestring, bytestring-strict-builder, deepseq, exceptions + , free-categories, gauge, generic-random, generics-sop, hashable , hedgehog, hspec, mmorph, monad-control, monad-loops, mtl , network-ip, postgresql-binary, postgresql-libpq, profunctors , QuickCheck, quickcheck-instances, records-sop, resource-pool @@ -257788,23 +258093,24 @@ self: { }: mkDerivation { pname = "squeal-postgresql"; - version = "0.8.1.1"; - sha256 = "13q7kfx6wyznqcjl9pxl07p1f2fh6kqmbgvnfa383q1gnhw8zxb9"; + version = "0.9.0.0"; + sha256 = "1gd421zkpd5lg1dl94297dslq43pjl274ahdd947jjvgr6gr193n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary binary-parser bytestring bytestring-strict-builder deepseq exceptions free-categories - generics-sop mmorph monad-control mtl network-ip postgresql-binary - postgresql-libpq profunctors records-sop resource-pool scientific - text time transformers transformers-base unliftio uuid-types vector + generics-sop hashable mmorph monad-control mtl network-ip + postgresql-binary postgresql-libpq profunctors records-sop + resource-pool scientific text time transformers transformers-base + unliftio uuid-types vector ]; executableHaskellDepends = [ base bytestring generics-sop mtl text transformers vector ]; testHaskellDepends = [ - async base bytestring doctest generics-sop hedgehog hspec mtl - scientific text time vector with-utf8 + async base bytestring generics-sop hedgehog hspec mtl scientific + text time vector with-utf8 ]; benchmarkHaskellDepends = [ base bytestring deepseq gauge generic-random generics-sop @@ -257822,8 +258128,8 @@ self: { }: mkDerivation { pname = "squeal-postgresql-ltree"; - version = "0.1.0.0"; - sha256 = "184y3ar72icxbnqasqvma0ri7s1qczmfsangcvqjjwjf3kpnbb87"; + version = "0.1.0.1"; + sha256 = "1dm5605p5rmh9gxjb84zn78jsqlakp1n9jcgagjmkmng8gnp49l9"; libraryHaskellDepends = [ base bytestring generics-sop mtl postgresql-binary postgresql-libpq squeal-postgresql text @@ -257837,8 +258143,8 @@ self: { ({ mkDerivation, base, squeal-postgresql }: mkDerivation { pname = "squeal-postgresql-uuid-ossp"; - version = "0.1.0.0"; - sha256 = "0b2z4rz3r3dikqa6w8rsi36gw6wvvj7b8rmh2drpp6lykykm8n2s"; + version = "0.1.0.1"; + sha256 = "15n888ja9r7x80m3skciqagjl9gvs3w2103lv3m0isz3bz3pgdvg"; libraryHaskellDepends = [ base squeal-postgresql ]; description = "UUID OSSP extension for Squeal"; license = lib.licenses.bsd3; @@ -259797,6 +260103,33 @@ self: { license = lib.licenses.bsd2; }) {}; + "statistics_0_16_1_0" = callPackage + ({ mkDerivation, aeson, async, base, binary, data-default-class + , deepseq, dense-linear-algebra, erf, ieee754, math-functions + , mwc-random, parallel, primitive, QuickCheck, random, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck, vector + , vector-algorithms, vector-binary-instances, vector-th-unbox + }: + mkDerivation { + pname = "statistics"; + version = "0.16.1.0"; + sha256 = "000rkq5niabbdq0adca81rd19pgazvbnpww8cakhxdh5frf2lj78"; + libraryHaskellDepends = [ + aeson async base binary data-default-class deepseq + dense-linear-algebra math-functions mwc-random parallel primitive + random vector vector-algorithms vector-binary-instances + vector-th-unbox + ]; + testHaskellDepends = [ + aeson base binary dense-linear-algebra erf ieee754 math-functions + primitive QuickCheck tasty tasty-expected-failure tasty-hunit + tasty-quickcheck vector vector-algorithms + ]; + description = "A library of statistical types, data, and functions"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "statistics-dirichlet" = callPackage ({ mkDerivation, base, deepseq, hmatrix-special , nonlinear-optimization, vector @@ -265444,8 +265777,8 @@ self: { }: mkDerivation { pname = "sydtest-hedgehog"; - version = "0.2.0.0"; - sha256 = "084nqzl1i5phy0hwdgcx0dvlajr8g1iva73f3j9y9rsgl08wh727"; + version = "0.3.0.0"; + sha256 = "17b80iar2zm61h27jv6fnzr8h6whi3k7a79ij1n71hhrm53b0420"; libraryHaskellDepends = [ base containers hedgehog stm sydtest ]; testHaskellDepends = [ base hedgehog sydtest ]; testToolDepends = [ sydtest-discover ]; @@ -268711,18 +269044,18 @@ self: { license = lib.licenses.mit; }) {}; - "tasty_1_4_2_2" = callPackage - ({ mkDerivation, ansi-terminal, base, clock, containers, mtl - , optparse-applicative, stm, tagged, unbounded-delays, unix - , wcwidth + "tasty_1_4_2_3" = callPackage + ({ mkDerivation, ansi-terminal, base, clock, containers + , optparse-applicative, stm, tagged, transformers, unbounded-delays + , unix, wcwidth }: mkDerivation { pname = "tasty"; - version = "1.4.2.2"; - sha256 = "1qqzrvmfnh2s0b3356wil1flzvvyrh5bvx3v65k9807wp9r5pxrq"; + version = "1.4.2.3"; + sha256 = "1inhrayiqhd3k14b9cnjcv5kdxb95sgk8b0ibbf37z4dlalsf569"; libraryHaskellDepends = [ - ansi-terminal base clock containers mtl optparse-applicative stm - tagged unbounded-delays unix wcwidth + ansi-terminal base clock containers optparse-applicative stm tagged + transformers unbounded-delays unix wcwidth ]; description = "Modern and extensible testing framework"; license = lib.licenses.mit; @@ -270248,7 +270581,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "telegram-bot-simple_0_5_1" = callPackage + "telegram-bot-simple_0_5_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron , filepath, hashable, http-api-data, http-client, http-client-tls , monad-control, mtl, pretty-show, profunctors, servant @@ -270258,8 +270591,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.5.1"; - sha256 = "0vkvnxfa9lmp6j2wc2s3yxvq6ilwjbb1xnrwk5kysrlsklvc86bs"; + version = "0.5.2"; + sha256 = "1fkpgdyrfa1ckaljmchha89mpqrkdwwj0pvcwvn38jg3y523n6k9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -274721,8 +275054,8 @@ self: { }: mkDerivation { pname = "threadscope"; - version = "0.2.14"; - sha256 = "0xcj8v6kyk8ss2sg6f32gx84vgx36hfaqb5p3sy3d4vkxan4xwcy"; + version = "0.2.14.1"; + sha256 = "0hfn90299mp18p2bjj2bgfi1pk3ndxz4nv2ac6z52kvh00sr9drq"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -275446,14 +275779,14 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "time_1_12_1" = callPackage + "time_1_12_2" = callPackage ({ mkDerivation, base, criterion, deepseq, QuickCheck, random , tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "time"; - version = "1.12.1"; - sha256 = "02fnl9jr028gn2vkky1mfvrqqzzy123b1gic1yamn8cnq7xgzsn0"; + version = "1.12.2"; + sha256 = "07mgxdqhn72i34hbfj61k7lfk8fh5in4lyq013727s1hl93v186v"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -276146,6 +276479,8 @@ self: { pname = "timers-tick"; version = "0.5.0.1"; sha256 = "1kv646l77bzjgs2v39axsi405zvapwks1vj4ff341r5agpwrfqlc"; + revision = "1"; + editedCabalFile = "1qsmzkm0k14z06czpbjgkbzb1liws3iass0rwsi5wp5i62jkhczs"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "tick based timers"; @@ -300025,8 +300360,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.42"; - sha256 = "16vnj9a5jnc2ddn158xwz7mh6zdicjvwg3j93bpk5ny3g5ns1x2k"; + version = "0.43"; + sha256 = "0r0ba8xv3f0jy4ycmhxhpd146bqzf7v97svxg6r3w9agva3l8454"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -304177,6 +304512,34 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-test_1_6_14" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, conduit, containers + , cookie, hspec, hspec-core, html-conduit, http-types, HUnit + , memory, mtl, network, pretty-show, text, time, transformers + , unliftio, unliftio-core, wai, wai-extra, xml-conduit, xml-types + , yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.14"; + sha256 = "1sb50n9x5xsisad6czxx1gazrjak9hj6mcpv3q147yhpgfnpay9k"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + bytestring case-insensitive conduit containers cookie hspec-core + html-conduit http-types HUnit memory mtl network pretty-show text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio unliftio-core wai wai-extra xml-conduit + yesod-core yesod-form + ]; + description = "integration testing for WAI/Yesod Applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test From 58bb9995a8a9f192d9e94ce842d728e8ab1d8332 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Sun, 15 May 2022 15:08:07 -0600 Subject: [PATCH 03/21] haskellPackages.debian: Fix test failures for ghc 9 --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 109ab8b9fe8..9a4d5ac6322 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2645,4 +2645,11 @@ self: super: { servant-cassava = assert super.servant-cassava.version == "0.10.1"; doJailbreak super.servant-cassava; + # Fix tests failure for ghc 9 (https://github.com/clinty/debian-haskell/pull/3) + debian = appendPatch (fetchpatch { + name = "debian-haskell.3.patch"; + url = "https://github.com/clinty/debian-haskell/pull/3/commits/47441c8e4a7a00a3c8825eec98bf7a823594f9be.patch"; + sha256 = "0wxpqazjnal9naibapg63nm7x6qz0lklcfw2m5mzjrh2q9x2cvnd"; + }) super.debian; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From f8e82bab5be86899d4d4b00abaf29ee2cd21fad9 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 16 May 2022 13:10:18 +0900 Subject: [PATCH 04/21] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index c388d703e3f..3c5ff07cb85 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1031,7 +1031,6 @@ broken-packages: - dead-code-detection - Deadpan-DDP - dead-simple-json - - debian - debug-me - debug-tracy - decepticons diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6b9abbcf955..241d866743d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74771,8 +74771,6 @@ self: { ]; description = "Modules for working with the Debian package system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "debian-binary" = callPackage From a4a51d9e454fae30f28b01e7d3913791b73bb157 Mon Sep 17 00:00:00 2001 From: Teo Camarasu Date: Mon, 16 May 2022 11:01:26 +0100 Subject: [PATCH 05/21] haskellPackages.threadscope: unmark as broken, remove jailbreak --- pkgs/development/haskell-modules/configuration-common.nix | 2 -- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9a4d5ac6322..a8ae26ecfb7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2003,8 +2003,6 @@ self: super: { haveibeenpwned = doJailbreak super.haveibeenpwned; # Too strict version bounds on ghc-events - # https://github.com/haskell/ThreadScope/issues/118 - threadscope = doJailbreak super.threadscope; # https://github.com/mpickering/hs-speedscope/issues/16 hs-speedscope = doJailbreak super.hs-speedscope; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 3c5ff07cb85..920a7ce3076 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5121,7 +5121,6 @@ broken-packages: - thorn - th-pprint - threadmanager - - threadscope - thread-supervisor - threepenny-editors - threepenny-gui-contextmenu diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 241d866743d..e40ff318ad3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -275064,8 +275064,6 @@ self: { ]; description = "A graphical tool for profiling parallel Haskell programs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "threefish" = callPackage From 4bf84c57e28bf63d0791b64ec5626c9d9ddeb2e6 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 15 May 2022 18:15:49 +0200 Subject: [PATCH 06/21] haskellPackages.squeal-postgresql: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a8ae26ecfb7..af633946cc8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -208,6 +208,7 @@ self: super: { persistent-zookeeper = dontCheck super.persistent-zookeeper; pocket-dns = dontCheck super.pocket-dns; postgresql-simple = dontCheck super.postgresql-simple; + squeal-postgresql = dontCheck super.squeal-postgresql; postgrest = dontCheck super.postgrest; postgrest-ws = dontCheck super.postgrest-ws; snowball = dontCheck super.snowball; @@ -2650,4 +2651,10 @@ self: super: { sha256 = "0wxpqazjnal9naibapg63nm7x6qz0lklcfw2m5mzjrh2q9x2cvnd"; }) super.debian; + # Raise version bounds for hspec + records-sop = appendPatch (fetchpatch { + url = "https://github.com/kosmikus/records-sop/pull/11/commits/d88831388ab3041190130fec3cdd679a4217b3c7.patch"; + sha256 = "sha256-O+v/OxvqnlWX3HaDvDIBZnJ+Og3xs/SJqI3gaouU3ZI="; + }) super.records-sop; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 920a7ce3076..2f3f618b7ee 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4216,7 +4216,6 @@ broken-packages: - record - record-encode - records - - records-sop - record-wrangler - recursion-schemes-ext - recursion-schemes-ix diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 9990e493bba..f27f89e873f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -188,6 +188,7 @@ package-maintainers: - hakyll - hakyll-contrib-hyphenation - webify + - squeal-postgresql Gabriel439: - annah - bench diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e40ff318ad3..4a42bb8b69b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -229732,8 +229732,6 @@ self: { ]; description = "Record subtyping and record utilities with generics-sop"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "records-th" = callPackage From 16ec961dc0be3f3816c4e97ced8525a954c81515 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 17 May 2022 23:34:42 +0200 Subject: [PATCH 07/21] haskellPackages: fix package pins --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index af633946cc8..de08b4f1149 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -851,7 +851,7 @@ self: super: { testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; }) (super.sensei.overrideScope (self: super: { hspec-meta = self.hspec-meta_2_9_3; - hspec = self.hspec_2_9_7; + hspec = self.hspec_2_10_0; hspec-core = dontCheck self.hspec-core_2_9_7; hspec-discover = self.hspec-discover_2_9_7; })); diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 93fe7ab26c7..dfa5e404e1f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -115,7 +115,7 @@ self: super: { lifted-async = doJailbreak super.lifted-async; lukko = doJailbreak super.lukko; lzma-conduit = doJailbreak super.lzma-conduit; - ormolu = self.ormolu_0_4_0_0; + ormolu = self.ormolu_0_5_0_0; parallel = doJailbreak super.parallel; path = doJailbreak super.path; polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse); From 5fab45719eb7a4b536216148addff3e7705f0ac7 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 17 May 2022 23:55:55 +0200 Subject: [PATCH 08/21] haskellPackages.hspec-core: bump version pin --- 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 de08b4f1149..b7a11370efe 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -852,7 +852,7 @@ self: super: { }) (super.sensei.overrideScope (self: super: { hspec-meta = self.hspec-meta_2_9_3; hspec = self.hspec_2_10_0; - hspec-core = dontCheck self.hspec-core_2_9_7; + hspec-core = dontCheck self.hspec-core_2_10_0; hspec-discover = self.hspec-discover_2_9_7; })); From 93aa55a2997bd70cf5ef376548e0d8180da1a7ab Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 18 May 2022 00:05:40 +0200 Subject: [PATCH 09/21] haskellPackages.hspec-discover: bump version pin --- 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 b7a11370efe..ce1ff5d66b5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -853,7 +853,7 @@ self: super: { hspec-meta = self.hspec-meta_2_9_3; hspec = self.hspec_2_10_0; hspec-core = dontCheck self.hspec-core_2_10_0; - hspec-discover = self.hspec-discover_2_9_7; + hspec-discover = self.hspec-discover_2_10_0; })); # Depends on broken fluid. From c9b8574c3e21e6236ca61f67f8c48814d9555877 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Mon, 16 May 2022 17:43:35 -0600 Subject: [PATCH 10/21] haskellPackages.polynomial: Fix build failures for ghc 9 --- .../haskell-modules/configuration-common.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ce1ff5d66b5..eeac38baf23 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2657,4 +2657,17 @@ self: super: { sha256 = "sha256-O+v/OxvqnlWX3HaDvDIBZnJ+Og3xs/SJqI3gaouU3ZI="; }) super.records-sop; + # Fix build failures for ghc 9 (https://github.com/mokus0/polynomial/pull/20) + polynomial = appendPatch (fetchpatch { + name = "haskell-polynomial.20.patch"; + url = "https://github.com/mokus0/polynomial/pull/20.diff"; + sha256 = "1bwivimpi2hiil3zdnl5qkds1inyn239wgxbn3y8l2pwyppnnfl0"; + }) + (overrideCabal (drv: { + revision = null; + editedCabalFile = null; + doCheck = false; # Source dist doesn't include the checks + }) + super.polynomial); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 23b890a3026e6654403822978a5d1268569e0200 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Tue, 17 May 2022 19:48:39 -0600 Subject: [PATCH 11/21] haskellPackages: Remove polynomial from the broken list --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 2f3f618b7ee..15002095d23 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3935,7 +3935,6 @@ broken-packages: - poly-control - polydata-core - polynom - - polynomial - polynomial-algebra - polysemy-check - polysemy-keyed-state From 6e028bd63297a2e49305d42d67b7be4c69c59c99 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Tue, 17 May 2022 20:00:50 -0600 Subject: [PATCH 12/21] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- pkgs/development/haskell-modules/hackage-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4a42bb8b69b..49aa598dd9a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -215436,8 +215436,6 @@ self: { ]; description = "Polynomials"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "polynomial-algebra" = callPackage @@ -258116,6 +258114,7 @@ self: { description = "Squeal PostgreSQL Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ erictapen ]; }) {}; "squeal-postgresql-ltree" = callPackage From 1e1823416675b5f3c3a8fe3daaa985ed0e476f1d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 19 May 2022 08:37:08 +0200 Subject: [PATCH 13/21] release-haskell.nix: include nixos tests for xmonad I've recently discovered they were broken by a recent XMonad upgrade, something we should keep tabs on in the future. --- pkgs/top-level/release-haskell.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ade95838efc..789d83c4be0 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -144,7 +144,14 @@ let tests.haskell = packagePlatforms pkgs.tests.haskell; - nixosTests.agda = (packagePlatforms pkgs.nixosTests).agda; + nixosTests = { + inherit (packagePlatforms pkgs.nixosTests) + agda + xmonad + xmonad-xdg-autostart + ; + }; + agdaPackages = packagePlatforms pkgs.agdaPackages; # top-level packages that depend on haskellPackages From 0520dda5ece08406e9e1c468ca292950b7177e3e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 19 May 2022 09:15:12 +0200 Subject: [PATCH 14/21] nixos/tests/xmonad: adjust to XMonad 0.17 --- nixos/tests/xmonad.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix index aa55f0e3ca6..ec48c3e1127 100644 --- a/nixos/tests/xmonad.nix +++ b/nixos/tests/xmonad.nix @@ -13,7 +13,9 @@ let import System.Environment (getArgs) import System.FilePath (()) - main = launch $ def { startupHook = startup } `additionalKeysP` myKeys + main = do + dirs <- getDirectories + launch (def { startupHook = startup } `additionalKeysP` myKeys) dirs startup = isSessionStart >>= \sessInit -> spawn "touch /tmp/${name}" @@ -23,14 +25,15 @@ let compiledConfig = printf "xmonad-%s-%s" arch os - compileRestart resume = - whenX (recompile True) $ + compileRestart resume = do + dirs <- asks directories + + whenX (recompile dirs True) $ when resume writeStateToFile *> catchIO ( do - dir <- getXMonadDataDir args <- getArgs - executeFile (dir compiledConfig) False args Nothing + executeFile (cacheDir dirs compiledConfig) False args Nothing ) ''; @@ -94,7 +97,7 @@ in { # set up the new config machine.succeed("mkdir -p ${user.home}/.xmonad") - machine.copy_from_host("${newConfig}", "${user.home}/.xmonad/xmonad.hs") + machine.copy_from_host("${newConfig}", "${user.home}/.config/xmonad/xmonad.hs") # recompile xmonad using the new config machine.send_key("alt-ctrl-q") From e2f8d2ebb0b4d156d12565fc6320382573e92ad4 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 19 May 2022 22:37:11 +0200 Subject: [PATCH 15/21] haskell.packages.ghc922.hls-ormolu-plugin: jailbreak --- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index dfa5e404e1f..f8180106499 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -209,6 +209,7 @@ self: super: { fourmolu = super.fourmolu_0_6_0_0; # hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0 hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.3.0"; doJailbreak super.hls-fourmolu-plugin; + hls-ormolu-plugin = assert super.hls-ormolu-plugin.version == "1.0.2.1"; doJailbreak super.hls-ormolu-plugin; implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables; From d8d447f9a89fb6d63b7d3c7c3b977209520f0405 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 19 May 2022 23:49:22 +0200 Subject: [PATCH 16/21] haskellPackages.sensei: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 394ff8bfe29..f80afc1c4de 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -863,6 +863,7 @@ self: super: { hspec = self.hspec_2_10_0; hspec-core = dontCheck self.hspec-core_2_10_0; hspec-discover = self.hspec-discover_2_10_0; + shelly = dontCheck super.shelly; # disable checks, because the newer hspec in this overrideScope doesn‘t work with newest hspec-contrib })); # Depends on broken fluid. From a4ae7b86c9dd77d6a14ec2a7073abf7414a86bdf Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 20 May 2022 11:28:02 +0200 Subject: [PATCH 17/21] haskellPackages.fast-tags: apply patch for nondeterministic tests Resolves #172843. --- .../development/haskell-modules/configuration-common.nix | 9 +++++++++ .../configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f80afc1c4de..349931a22c9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2680,4 +2680,13 @@ self: super: { }) super.polynomial); + fast-tags = appendPatches [ + (fetchpatch { + name = "fast-tags-ghc-9.0-fix-test-nondeterminism.patch"; + url = "https://github.com/elaforge/fast-tags/commit/af861acc2dd239fedd8b169ddc5e3fa694e7af57.patch"; + sha256 = "0ml678q1n29daqnxsb5p94s5lf7a6dk4lqbbgmiayxrbyxnlbi4f"; + excludes = [ ".github/**" ]; + }) + ] super.fast-tags; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 15002095d23..ba8efbcbae3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1403,7 +1403,6 @@ broken-packages: - fast-nats - fastpbkdf2 - FastPush - - fast-tags - FastxPipe - fathead-util - fb diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 49aa598dd9a..e48c1beb23e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -93306,8 +93306,6 @@ self: { ]; description = "Fast incremental vi and emacs tags"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fast-tagsoup" = callPackage From cb20a401772b4da7cd5c118b714f24aee3032b14 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 20 May 2022 21:27:31 +0200 Subject: [PATCH 18/21] maintainers/scripts/haskell/hydra-report.hs: fix outdated hydra-unstable reference --- maintainers/scripts/haskell/hydra-report.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 6f154d90f06..360b9f2058d 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -1,6 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])" -#! nix-shell -p hydra_unstable +#! nix-shell -p hydra-unstable #! nix-shell -i runhaskell {- From 0d4417d888a53c70147d06fadcabfba0e3716935 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 20 May 2022 21:31:53 +0200 Subject: [PATCH 19/21] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 1 + .../transitive-broken.yaml | 12 +----------- .../haskell-modules/hackage-packages.nix | 14 +++----------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ba8efbcbae3..8d093651f9b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2849,6 +2849,7 @@ broken-packages: - lagrangian - lambda2js - lambdaBase + - lambdabot-telegram-plugins - lambdabot-utils - lambdabot-xmpp - lambda-bridge diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e62cdd83090..951ca13a5c5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -873,7 +873,6 @@ dont-distribute-packages: - cabal-bounds - cabal-cache - cabal-cargs - - cabal-debian - cabal-query - cabal-test - cabal2arch @@ -1361,7 +1360,6 @@ dont-distribute-packages: - enumerator-tf - enumfun - ephemeral - - erf-native - eros-client - eros-http - error-message @@ -1546,7 +1544,6 @@ dont-distribute-packages: - funion - funnyprint - funsat - - fused-effects-squeal - fwgl-glfw - fwgl-javascript - fxpak @@ -2485,6 +2482,7 @@ dont-distribute-packages: - keera-hails-reactive-yampa - keera-hails-reactivelenses - keera-posture + - keid-frp-banana - keid-geometry - keid-render-basic - keid-resource-gltf @@ -2719,7 +2717,6 @@ dont-distribute-packages: - mangrove - manifold-random - manifolds - - marionetta - markdown-pap - markdown2svg - markov-processes @@ -3141,8 +3138,6 @@ dont-distribute-packages: - postgresql-simple-queue - postgresql-simple-typed - postgresql-tx-query - - postgresql-tx-squeal - - postgresql-tx-squeal-compat-simple - postgrest - postmark - potoki @@ -3691,7 +3686,6 @@ dont-distribute-packages: - sphinx-cli - spice - spike - - splines - sprinkles - sql-simple-mysql - sql-simple-pool @@ -3699,9 +3693,6 @@ dont-distribute-packages: - sql-simple-sqlite - sqlite-simple-typed - sqsd-local - - squeal-postgresql - - squeal-postgresql-ltree - - squeal-postgresql-uuid-ossp - sr-extra - sscgi - sshd-lint @@ -4063,7 +4054,6 @@ dont-distribute-packages: - viewprof - vigilance - vimeta - - vinyl-generics - vinyl-operational - vision - visual-graphrewrite diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e48c1beb23e..5a4e36dbfa8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -50467,7 +50467,6 @@ self: { executableHaskellDepends = [ base Cabal debian lens mtl pretty ]; description = "Create a Debianization for a Cabal package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "cabal-dependency-licenses" = callPackage @@ -88911,7 +88910,6 @@ self: { libraryHaskellDepends = [ base polynomial ]; description = "Native Haskell implementation of the interface from the erf package"; license = "GPL"; - hydraPlatforms = lib.platforms.none; }) {}; "erlang" = callPackage @@ -101891,7 +101889,6 @@ self: { ]; description = "A fused-effects adapter for squeal-postgresql"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-th" = callPackage @@ -163384,6 +163381,7 @@ self: { ]; description = "Reactive Banana integration for Keid engine"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "keid-geometry" = callPackage @@ -165594,6 +165592,8 @@ self: { ]; description = "Lambdabot for Telegram"; license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lambdabot-trusted" = callPackage @@ -179219,7 +179219,6 @@ self: { ]; description = "A study of marionetta movements"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "markdown" = callPackage @@ -218139,7 +218138,6 @@ self: { ]; description = "postgresql-tx interfacing for use with squeal-postgresql"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "postgresql-tx-squeal-compat-simple" = callPackage @@ -218153,7 +218151,6 @@ self: { ]; description = "Connection interop from postgresql-simple connections to postgresql-libpq connections"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "postgresql-typed" = callPackage @@ -257347,7 +257344,6 @@ self: { benchmarkHaskellDepends = [ base criterion polynomial vector ]; description = "B-Splines, other splines, and NURBS"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "splint" = callPackage @@ -258111,7 +258107,6 @@ self: { ]; description = "Squeal PostgreSQL Library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ erictapen ]; }) {}; @@ -258129,7 +258124,6 @@ self: { ]; description = "LTree extension for Squeal"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "squeal-postgresql-uuid-ossp" = callPackage @@ -258141,7 +258135,6 @@ self: { libraryHaskellDepends = [ base squeal-postgresql ]; description = "UUID OSSP extension for Squeal"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "squeather" = callPackage @@ -290758,7 +290751,6 @@ self: { ]; description = "Convert plain records to vinyl (and vice versa), generically"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "vinyl-gl" = callPackage From 5c42976597838a10f7d0bbb5a3c400ddeb7c9cfc Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 20 May 2022 21:41:30 +0200 Subject: [PATCH 20/21] maintainers/scripts/haskell/hydra-report.hs: remove redundant pragmas --- maintainers/scripts/haskell/hydra-report.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 360b9f2058d..60b57b97a2b 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -20,14 +20,12 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca {-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE LambdaCase #-} -{-# LANGUAGE MultiWayIf #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TupleSections #-} -{-# OPTIONS_GHC -Wall #-} {-# LANGUAGE ViewPatterns #-} -{-# LANGUAGE TupleSections #-} +{-# OPTIONS_GHC -Wall #-} import Control.Monad (forM_, (<=<)) import Control.Monad.Trans (MonadIO (liftIO)) From c68ebdc49638a3fbd503fc7c56ab4641f908972a Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 20 May 2022 22:04:20 +0200 Subject: [PATCH 21/21] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 4 ++++ .../configuration-hackage2nix/transitive-broken.yaml | 2 ++ pkgs/development/haskell-modules/hackage-packages.nix | 10 ++++++++++ 3 files changed, 16 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 8d093651f9b..5d0b0dafaff 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -525,6 +525,7 @@ broken-packages: - cabal-bundle-clib - cabal-constraints - cabal-db + - cabal-debian - cabal-dependency-licenses - cabal-detailed-quickcheck - cabal-dev @@ -1584,6 +1585,7 @@ broken-packages: - fused-effects-exceptions - fused-effects-mwc-random - fused-effects-resumable + - fused-effects-squeal - fusion - futhask - futun @@ -3977,6 +3979,7 @@ broken-packages: - postgresql-simple-sop - postgresql-transactional - postgresql-tx-simple + - postgresql-tx-squeal - postgresql-typed-lifted - postgres-tmp - postgrest-ws @@ -4771,6 +4774,7 @@ broken-packages: - spir-v - splay - splaytree + - splines - split-morphism - splitter - Spock-api-ghcjs diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 951ca13a5c5..051df85f4b2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2717,6 +2717,7 @@ dont-distribute-packages: - mangrove - manifold-random - manifolds + - marionetta - markdown-pap - markdown2svg - markov-processes @@ -3138,6 +3139,7 @@ dont-distribute-packages: - postgresql-simple-queue - postgresql-simple-typed - postgresql-tx-query + - postgresql-tx-squeal-compat-simple - postgrest - postmark - potoki diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5a4e36dbfa8..75c2417e0f9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -50467,6 +50467,8 @@ self: { executableHaskellDepends = [ base Cabal debian lens mtl pretty ]; description = "Create a Debianization for a Cabal package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cabal-dependency-licenses" = callPackage @@ -101889,6 +101891,8 @@ self: { ]; description = "A fused-effects adapter for squeal-postgresql"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fused-effects-th" = callPackage @@ -179219,6 +179223,7 @@ self: { ]; description = "A study of marionetta movements"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "markdown" = callPackage @@ -218138,6 +218143,8 @@ self: { ]; description = "postgresql-tx interfacing for use with squeal-postgresql"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "postgresql-tx-squeal-compat-simple" = callPackage @@ -218151,6 +218158,7 @@ self: { ]; description = "Connection interop from postgresql-simple connections to postgresql-libpq connections"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "postgresql-typed" = callPackage @@ -257344,6 +257352,8 @@ self: { benchmarkHaskellDepends = [ base criterion polynomial vector ]; description = "B-Splines, other splines, and NURBS"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "splint" = callPackage