From 62715875cddda4b931022c7baccead1a90346625 Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Tue, 30 Nov 2021 12:20:24 +0100 Subject: [PATCH 01/63] bump stackage (16.14 -> 18.18) --- libs/types-common/src/Data/Text/Ascii.hs | 4 +- stack.yaml | 84 ++- stack.yaml.lock | 847 ----------------------- 3 files changed, 51 insertions(+), 884 deletions(-) delete mode 100644 stack.yaml.lock diff --git a/libs/types-common/src/Data/Text/Ascii.hs b/libs/types-common/src/Data/Text/Ascii.hs index bb01459f60..9edd77b13c 100644 --- a/libs/types-common/src/Data/Text/Ascii.hs +++ b/libs/types-common/src/Data/Text/Ascii.hs @@ -339,9 +339,7 @@ encodeBase16 = unsafeFromByteString . B16.encode -- | Decode a text containing only hex characters. -- Decoding only succeeds if the text is a multiple of 2 bytes in length. decodeBase16 :: AsciiBase16 -> Maybe ByteString -decodeBase16 t = case B16.decode (toByteString' t) of - (b, r) | r == mempty -> Just b - (_, _) -> Nothing +decodeBase16 t = either (const Nothing) Just (B16.decode (toByteString' t)) -------------------------------------------------------------------------------- -- Safe Widening diff --git a/stack.yaml b/stack.yaml index 6c4c22a8e3..1518609eae 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,19 @@ -resolver: lts-16.14 +resolver: lts-18.18 + +# to bump blocks of custom dependencies to the latest version on hackage: +# +# /tmp/1.sh: +# #!/bin/bash +# cabal list "$1" | perl -ne '/^..'$1'$/ && { $x=1 }; /^$/ && { $x=0 }; if ($x) { /version: (.+)$/ && print "$1" }' +# +# /tmp/2.sh: +# #!/bin/bash +# perl -ne '/^- (\S+)-([01123456789\.]+)(\@\S+)?(.*)$/ && do { print "- $1-"; system("/tmp/1.sh $1"); print "$4\n" }' +# +# ... and then pipe the blocks of extra-deps through /tmp/2.sh. +# sorry for the hideous code, couldn't get it into one line (some +# limitation to perl that i don't want to have to understand). +# anyway it works! packages: - libs/api-bot @@ -137,27 +152,27 @@ extra-deps: # Dropped from upstream snapshot - template-0.2.0.10 -- HaskellNet-0.5.2 -- smtp-mail-0.2.0.0 -- stm-containers-1.1.0.4 # Latest: lts-15.16 +- HaskellNet-0.6 +- smtp-mail-0.3.0.0 +- stm-containers-1.2 - redis-resp-1.0.0 -- stm-hamt-1.2.0.4 # Latest: lts-15.16 -- primitive-unlifted-0.1.2.0 # Latest: lts-15.16 +- stm-hamt-1.2.0.6 +- primitive-unlifted-1.0.0.0 - prometheus-2.2.2 # Only in nightly so far # Not on stackage - currency-codes-3.0.0.1 - mime-0.4.0.2 - data-timeout-0.3.1 -- geoip2-0.4.0.1 -- stomp-queue-0.3.1 +- geoip2-0.4.1.0 +- stomp-queue-0.5.1 - text-icu-translit-0.1.0.7 - wai-middleware-gunzip-0.0.2 - cql-io-tinylog-0.1.0 - invertible-hxt-0.1 - base58-bytestring-0.1.0 -- stompl-0.5.0 -- pattern-trie-0.1.0 +- stompl-0.6.0 +- pattern-trie-0.1.1 - markov-chain-usage-model-0.0.0 - wai-predicates-1.0.0 - redis-io-1.1.0 @@ -167,12 +182,12 @@ extra-deps: - wai-route-0.4.0 # Not updated on Stackage yet -- QuickCheck-2.14 -- splitmix-0.0.4 # needed for QuickCheck +- QuickCheck-2.14.2 +- splitmix-0.1.0.4 # needed for QuickCheck - servant-mock-0.8.7 -- servant-swagger-ui-0.3.4.3.36.1 +- servant-swagger-ui-0.3.5.3.52.5 - tls-1.5.5 -- cryptonite-0.28 +- cryptonite-0.29 # For changes from #128 and #135, not released to hackage yet - git: https://github.com/haskell-servant/servant-swagger @@ -188,18 +203,18 @@ extra-deps: - servant-client - servant-client-core -- HsOpenSSL-x509-system-0.1.0.3@sha256:f4958ee0eec555c5c213662eff6764bddefe5665e2afcfd32733ce3801a9b687,1774 # Latest: lts-14.27 -- cql-4.0.2@sha256:a0006a5ac13d6f86d5eff28c11be80928246309f217ea6d5f5c8a76a5d16b48b,3157 # Latest: lts-14.27 -- cql-io-1.1.1@sha256:897ef0811b227c8b1a269b29b9c1ebfb09c46f00d66834e2e8c6f19ea7f90f7d,4611 # Latest: lts-14.27 -- primitive-extras-0.8@sha256:fca0310150496867f5b9421fe1541ecda87fae17eae44885a29f9c52dd00c8ff,2963 # Latest: lts-15.16 -- text-format-0.3.2@sha256:2a3fc17cf87120fcfdbca62a0da59759755549285841cdc1483081c35fb3d115,1814 # Latest: lts-14.27 -- hex-0.2.0@sha256:197d2561d2e216c4ead035b4911dabc6e678ac6257cb71b64e324c822f6f9f5a,726 # Latest: lts-14.27 +- HsOpenSSL-x509-system-0.1.0.4 +- cql-4.0.3 +- cql-io-1.1.1 +- primitive-extras-0.10.1.1 +- text-format-0.3.2 +- hex-0.2.0 # Not in the upstream snapshot and not using latest version on hackage due to # breaking change -- quickcheck-state-machine-0.6.0 -- servant-multipart-0.11.5@sha256:1633f715b5b53d648a1da69839bdc5046599f4f7244944d4bbf852dba38d8f4b,2319 +- quickcheck-state-machine-0.7.1 +- servant-multipart-0.12.1 # Dependencies on upstream source @@ -208,12 +223,12 @@ extra-deps: commit: ca84ef29a93eaef7673fa58056cdd8dae1568d2d # master (Sep 14, 2020) # mu -- mu-rpc-0.4.0.1 +- mu-rpc-0.5.0.1 - mu-optics-0.3.0.1 - mu-avro-0.4.0.4 - mu-protobuf-0.4.2.0 - mu-schema-0.3.1.2 -- mu-grpc-server-0.4.0.0 +- mu-grpc-server-0.5.0.0 - mu-grpc-client-0.4.0.1 - mu-grpc-common-0.4.0.0 - compendium-client-0.2.1.1 @@ -221,7 +236,7 @@ extra-deps: - http2-grpc-types-0.5.0.0 - http2-grpc-proto3-wire-0.1.0.0 - warp-grpc-0.4.0.1 -- proto3-wire-1.2.0 +- proto3-wire-1.2.2 - parameterized-0.5.0.0 # Unreleased master. @@ -236,12 +251,6 @@ extra-deps: subdirs: - http2-client-grpc -# Fix for issue #27: https://github.com/kazu-yamamoto/http2/issues/27 -# PR here: https://github.com/kazu-yamamoto/http2/pull/28 -# Note: the commit used here is based on version 2.0.6 of http2 -- git: https://github.com/wireapp/http2 # (2021-06-09) branch: header-encoding-0-size-table-backport - commit: 7c465be1201e0945b106f7cc6176ac1b1193be13 - # Fix in PR: https://github.com/bos/snappy/pull/7 - git: https://github.com/wireapp/snappy commit: b0e5c08af48911caecffa4fa6a3e74872018b258 # master (Sep 03, 2021) @@ -253,10 +262,17 @@ extra-deps: - x509-store # Not on stackage yet -- polysemy-1.7.0.0 +- polysemy-1.7.1.0 - polysemy-plugin-0.4.2.0 - polysemy-check-0.8.1.0 +# ad-hoc additions (on 2021-10-10) +- proto-lens-0.7.1.0 +- proto-lens-protoc-0.7.1.0 +- proto-lens-runtime-0.7.0.1 +- proto-lens-setup-0.4.0.5 +- tracing-0.0.7.2 + ############################################################ # Development tools ############################################################ @@ -264,5 +280,5 @@ extra-deps: - ormolu-0.1.4.1 - ghc-lib-parser-8.10.1.20200412@sha256:b0517bb150a02957d7180f131f5b94abd2a7f58a7d1532a012e71618282339c2,8751 # for ormolu -- headroom-0.2.1.0 -- implicit-hie-0.1.2.5 +- headroom-0.4.2.0 +- implicit-hie-0.1.2.6 diff --git a/stack.yaml.lock b/stack.yaml.lock deleted file mode 100644 index d830e30c3b..0000000000 --- a/stack.yaml.lock +++ /dev/null @@ -1,847 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: -- completed: - subdir: wai-middleware-prometheus - name: wai-middleware-prometheus - version: 1.0.0 - git: https://github.com/fimad/prometheus-haskell - pantry-tree: - size: 359 - sha256: 72560f0d8c7f57db769e77d491e8b10255938631847981de52e94781b905a27a - commit: 2e3282e5fb27ba8d989c271a0a989823fad7ec43 - original: - subdir: wai-middleware-prometheus - git: https://github.com/fimad/prometheus-haskell - commit: 2e3282e5fb27ba8d989c271a0a989823fad7ec43 -- completed: - name: saml2-web-sso - version: '0.18' - git: https://github.com/wireapp/saml2-web-sso - pantry-tree: - size: 4887 - sha256: 29e0138ca6bc33500b87cd6c06bbd899fe4ddaadcfd5117b211e7769f9f80161 - commit: 60398f375987b74d6b855b5d225e45dc3a96ac06 - original: - git: https://github.com/wireapp/saml2-web-sso - commit: 60398f375987b74d6b855b5d225e45dc3a96ac06 -- completed: - name: collectd - version: 0.0.0.2 - git: https://github.com/kim/hs-collectd - pantry-tree: - size: 574 - sha256: 708fdfbd4ba09171072239e12fda5647adf60f99a70cd259685db74c6a25820f - commit: 885da222be2375f78c7be36127620ed772b677c9 - original: - git: https://github.com/kim/hs-collectd - commit: 885da222be2375f78c7be36127620ed772b677c9 -- completed: - name: snappy-framing - version: 0.1.1 - git: https://github.com/kim/snappy-framing - pantry-tree: - size: 651 - sha256: 91a2ac7e0dd161fd82eee3007a6b488e53ad14a5d4e640ffdeba23f4741fbf64 - commit: d99f702c0086729efd6848dea8a01e5266c3a61c - original: - git: https://github.com/kim/snappy-framing - commit: d99f702c0086729efd6848dea8a01e5266c3a61c -- completed: - name: wai-routing - version: 0.13.0 - git: https://gitlab.com/twittner/wai-routing - pantry-tree: - size: 1020 - sha256: a1aa6c9ff369ee27cfa9d95f20f7d4fa0f239ad80ed45fb6d45ed0c6543eac30 - commit: 7e996a93fec5901767f845a50316b3c18e51a61d - original: - git: https://gitlab.com/twittner/wai-routing - commit: 7e996a93fec5901767f845a50316b3c18e51a61d -- completed: - name: multihash - version: 0.1.6 - git: https://github.com/wireapp/haskell-multihash.git - pantry-tree: - size: 602 - sha256: 8ad8afc9e9bce4830304eff1e0c1c96fc878b1aad9c55896b4cfc256dba0688c - commit: 300a6f46384bfca33e545c8bab52ef3717452d12 - original: - git: https://github.com/wireapp/haskell-multihash.git - commit: 300a6f46384bfca33e545c8bab52ef3717452d12 -- completed: - name: hspec-wai - version: 0.9.2 - git: https://github.com/wireapp/hspec-wai - pantry-tree: - size: 1829 - sha256: 1da15bc431ded925782e30d299556f7c33ab89fa74e5a519061081616fb9f4d7 - commit: 0a5142cd3ba48116ff059c041348b817fb7bdb25 - original: - git: https://github.com/wireapp/hspec-wai - commit: 0a5142cd3ba48116ff059c041348b817fb7bdb25 -- completed: - name: bloodhound - version: 0.17.0.0 - git: https://github.com/wireapp/bloodhound - pantry-tree: - size: 4587 - sha256: fc77d3295fba77f96f80bf10860afac1855d393020f3d04d71bf530afa17c143 - commit: 92de9aa632d590f288a353d03591c38ba72b3cb3 - original: - git: https://github.com/wireapp/bloodhound - commit: 92de9aa632d590f288a353d03591c38ba72b3cb3 -- completed: - hackage: deriving-aeson-0.2.5@sha256:a1efa4ab7ff94f73e6d2733a9d4414cb4c3526761295722cff28027b5b3da1a4,1277 - pantry-tree: - size: 441 - sha256: 8fa77245ed0f169fae3a337bf4b9114c44e6bd0cd02ce748998f46c19ef32277 - original: - hackage: deriving-aeson-0.2.5@sha256:a1efa4ab7ff94f73e6d2733a9d4414cb4c3526761295722cff28027b5b3da1a4,1277 -- completed: - hackage: aeson-1.4.7.1@sha256:6d8d2fd959b7122a1df9389cf4eca30420a053d67289f92cdc0dbc0dab3530ba,7098 - pantry-tree: - size: 40133 - sha256: caa9306e519c601ab0170d113daa03c1163db53e5466be2968bbd61a771bebcb - original: - hackage: aeson-1.4.7.1@sha256:6d8d2fd959b7122a1df9389cf4eca30420a053d67289f92cdc0dbc0dab3530ba,7098 -- completed: - subdir: amazonka - name: amazonka - version: 1.6.1 - git: https://github.com/wireapp/amazonka - pantry-tree: - size: 1038 - sha256: 59c7840fe6c9609d1d5022149010e72db5778e4978b9384b6dee8a4a207c96b3 - commit: 412172d8c28906591f01576a78792de7c34cc3eb - original: - subdir: amazonka - git: https://github.com/wireapp/amazonka - commit: 412172d8c28906591f01576a78792de7c34cc3eb -- completed: - subdir: amazonka-cloudfront - name: amazonka-cloudfront - version: 1.6.1 - git: https://github.com/wireapp/amazonka - pantry-tree: - size: 12839 - sha256: f0f27588c628d9996c298ab035b19999572ad8432ea05526497b608b009b1258 - commit: 412172d8c28906591f01576a78792de7c34cc3eb - original: - subdir: amazonka-cloudfront - git: https://github.com/wireapp/amazonka - commit: 412172d8c28906591f01576a78792de7c34cc3eb -- completed: - subdir: amazonka-dynamodb - name: amazonka-dynamodb - version: 1.6.1 - git: https://github.com/wireapp/amazonka - pantry-tree: - size: 8379 - sha256: d513775676879e3b2ff8393528882df1670a79110120b65ce6c68765581a2473 - commit: 412172d8c28906591f01576a78792de7c34cc3eb - original: - subdir: amazonka-dynamodb - git: https://github.com/wireapp/amazonka - commit: 412172d8c28906591f01576a78792de7c34cc3eb -- completed: - subdir: amazonka-s3 - name: amazonka-s3 - version: 1.6.1 - git: https://github.com/wireapp/amazonka - pantry-tree: - size: 18431 - sha256: a19d02da301bbcad502e6092d7418a59543747c8bb6f12932bcbc4606f7814ab - commit: 412172d8c28906591f01576a78792de7c34cc3eb - original: - subdir: amazonka-s3 - git: https://github.com/wireapp/amazonka - commit: 412172d8c28906591f01576a78792de7c34cc3eb -- completed: - subdir: amazonka-ses - name: amazonka-ses - version: 1.6.1 - git: https://github.com/wireapp/amazonka - pantry-tree: - size: 18197 - sha256: cd9b02c30d7571dc87868b054ed3826d5b8d26b717f3158da6443377e8dfd563 - commit: 412172d8c28906591f01576a78792de7c34cc3eb - original: - subdir: amazonka-ses - git: https://github.com/wireapp/amazonka - commit: 412172d8c28906591f01576a78792de7c34cc3eb -- completed: - subdir: amazonka-sns - name: amazonka-sns - version: 1.6.1 - git: https://github.com/wireapp/amazonka - pantry-tree: - size: 7905 - sha256: e5a6d407b92e423ccf58d784fe42d4a0598204f65c0e7753569c130428bfb5eb - commit: 412172d8c28906591f01576a78792de7c34cc3eb - original: - subdir: amazonka-sns - git: https://github.com/wireapp/amazonka - commit: 412172d8c28906591f01576a78792de7c34cc3eb -- completed: - subdir: amazonka-sqs - name: amazonka-sqs - version: 1.6.1 - git: https://github.com/wireapp/amazonka - pantry-tree: - size: 5351 - sha256: 990b7e4467d557e43959483063f7229f5039857a8cd67decb53f9a5c513db7f8 - commit: 412172d8c28906591f01576a78792de7c34cc3eb - original: - subdir: amazonka-sqs - git: https://github.com/wireapp/amazonka - commit: 412172d8c28906591f01576a78792de7c34cc3eb -- completed: - subdir: core - name: amazonka-core - version: 1.6.1 - git: https://github.com/wireapp/amazonka - pantry-tree: - size: 3484 - sha256: d4e427a362d66c9ee0dc0de810015633e43e3953944a84b24cfa2e71bcf0ed4d - commit: 412172d8c28906591f01576a78792de7c34cc3eb - original: - subdir: core - git: https://github.com/wireapp/amazonka - commit: 412172d8c28906591f01576a78792de7c34cc3eb -- completed: - name: cryptobox-haskell - version: 0.1.1 - git: https://github.com/wireapp/cryptobox-haskell - pantry-tree: - size: 279 - sha256: 2b1c19494263d1c6f88654b72ff4e0cc3b54a02cc81f8587899336e99c8a662f - commit: 7546a1a25635ef65183e3d44c1052285e8401608 - original: - git: https://github.com/wireapp/cryptobox-haskell - commit: 7546a1a25635ef65183e3d44c1052285e8401608 -- completed: - name: hsaml2 - version: '0.1' - git: https://github.com/wireapp/hsaml2 - pantry-tree: - size: 3918 - sha256: 072d64ee1d974ed2170e4b0dacfeef2cb13ae62fe066211e93c0be0073f959a3 - commit: b652ec6e69d1647e827cbee0fa290605ac09dc63 - original: - git: https://github.com/wireapp/hsaml2 - commit: b652ec6e69d1647e827cbee0fa290605ac09dc63 -- completed: - subdir: http-client - name: http-client - version: 0.7.0 - git: https://github.com/wireapp/http-client - pantry-tree: - size: 3129 - sha256: 355d13d4b018ab32ad3ba1b88d8d183c4f673efb3a8109d3b0260776b2473ec0 - commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd - original: - subdir: http-client - git: https://github.com/wireapp/http-client - commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd -- completed: - subdir: http-client-openssl - name: http-client-openssl - version: 0.3.1.0 - git: https://github.com/wireapp/http-client - pantry-tree: - size: 387 - sha256: c9265105d25badaa471e8d3d0eb493ebcba3ce17b4d430d2db70b6a0a4f90821 - commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd - original: - subdir: http-client-openssl - git: https://github.com/wireapp/http-client - commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd -- completed: - subdir: http-client-tls - name: http-client-tls - version: 0.3.5.3 - git: https://github.com/wireapp/http-client - pantry-tree: - size: 435 - sha256: 13722b74ba7edde9163e5c194af168fc98c4dc419c37fd42fada45f5a89d2042 - commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd - original: - subdir: http-client-tls - git: https://github.com/wireapp/http-client - commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd -- completed: - subdir: http-conduit - name: http-conduit - version: 2.3.7.3 - git: https://github.com/wireapp/http-client - pantry-tree: - size: 1074 - sha256: ec54f41b6997eabc01aa5e65a584bf37a39efb57a9eaad8f1e8005137f32c625 - commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd - original: - subdir: http-conduit - git: https://github.com/wireapp/http-client - commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd -- completed: - hackage: template-0.2.0.10@sha256:f822de4d34c45bc84b33a61bc112c15fedee6fa6dc414c62b10456395a868f85,987 - pantry-tree: - size: 339 - sha256: e9829c39501915bc47fda35069207b7a839f9fb929b81946e151e0dda8a7fda1 - original: - hackage: template-0.2.0.10 -- completed: - hackage: HaskellNet-0.5.2@sha256:77fb8466fcbeb76f17366ffd7deb37550b6ea08a4d08bf721d0b597c2573336d,2069 - pantry-tree: - size: 1499 - sha256: 20f0361675729e606fb37b8a1865f4bd49d952f2d0148693b62f68fadf5801d5 - original: - hackage: HaskellNet-0.5.2 -- completed: - hackage: smtp-mail-0.2.0.0@sha256:b91c81f6dbb41a9ceee8c443385118684ecec55006b77f7d3c0e49cffd2468cf,1211 - pantry-tree: - size: 449 - sha256: 413c4c7e7c7573c8bf906c136a282aebfe37ecc25492ff4b5ec8c69ff8d190fe - original: - hackage: smtp-mail-0.2.0.0 -- completed: - hackage: stm-containers-1.1.0.4@sha256:f83a683357b6e3b1dda3e70d2077a37224ed534df1f74c4e11f3f6daa7945c5b,3248 - pantry-tree: - size: 761 - sha256: 059c5a2d657d392aca0a887648f57380d6321734dc8879c056a44d4414308ac6 - original: - hackage: stm-containers-1.1.0.4 -- completed: - hackage: redis-resp-1.0.0@sha256:c134ac23e79d57071fdc8559e2b2e72280ea11786a8ba4118c10ed506dc7d991,1615 - pantry-tree: - size: 441 - sha256: c63020c2f2ca4f92c4747959a2e89e84bdd929d1ea1458c75552ee3f7aaa00fc - original: - hackage: redis-resp-1.0.0 -- completed: - hackage: stm-hamt-1.2.0.4@sha256:7957497c022554b7599e790696d1a3e56359ad99e5da36a251894c626ca1f60a,3970 - pantry-tree: - size: 1009 - sha256: d9a8be48da86bd4a2ba9d52ea29b9a74f1b686d439ba1bbfba04ab1a002391da - original: - hackage: stm-hamt-1.2.0.4 -- completed: - hackage: primitive-unlifted-0.1.2.0@sha256:9c3df73af54ed19fb3f4874da19334863cc414b22e578e27b5f52beeac4a60dd,1360 - pantry-tree: - size: 420 - sha256: cc6ffb1b48aa3f514c107f5188d5d5beb4e61a4232a81be7025b54f9be66a837 - original: - hackage: primitive-unlifted-0.1.2.0 -- completed: - hackage: prometheus-2.2.2@sha256:d794f5fe975be2f3ca7d7af71a7aeeb006615ad7d98835fa42caba9457a51936,4288 - pantry-tree: - size: 1559 - sha256: 3b1cb27cf8cb0a8da83b5730e85132e058e808f8dd1be349ea3dbb162c7f14c3 - original: - hackage: prometheus-2.2.2 -- completed: - hackage: currency-codes-3.0.0.1@sha256:a4b24669dd91e805b11d9eb267becd0ba6d726927e535e03d5f3f368f44c1cf4,2902 - pantry-tree: - size: 548 - sha256: 9802924b7472c67d93312eedbbb49ab250b9651101b27668133b9f5d15dbca78 - original: - hackage: currency-codes-3.0.0.1 -- completed: - hackage: mime-0.4.0.2@sha256:208947d9d1a19d08850be67ecb28c6e776db697f3bba05bd9d682e51a59f241f,983 - pantry-tree: - size: 565 - sha256: f2529a2e1678074ca0340ff60caa986f4e246d7d9abe8186657910c2900364bb - original: - hackage: mime-0.4.0.2 -- completed: - hackage: data-timeout-0.3.1@sha256:80830a56fcb562b06ede4203de3a80a17d359c40311624f9e4f72b425a5294db,1313 - pantry-tree: - size: 416 - sha256: d073a04c7c660d564e0f52baa0aad68006e992050f358f18fab6c6d9c2859d2f - original: - hackage: data-timeout-0.3.1 -- completed: - hackage: geoip2-0.4.0.1@sha256:cee67aa8da78686c5e5e37f0e92502218ed7c6b2200a121dc4fb4060c703fa37,1316 - pantry-tree: - size: 433 - sha256: 364b9ff8d4a85b1265b70f83e7ab81eb1f94c752aa32416de19e739ca6bb8a05 - original: - hackage: geoip2-0.4.0.1 -- completed: - hackage: stomp-queue-0.3.1@sha256:0f4ced5b67107d4dc06498985058236505470ca742dbfe5c6af0534d67ace9b5,2186 - pantry-tree: - size: 686 - sha256: 29ffec14af759c9244c559dd54b7fcd13d3b054b0aea21d753d80fb3064720a5 - original: - hackage: stomp-queue-0.3.1 -- completed: - hackage: text-icu-translit-0.1.0.7@sha256:c8eaaee3331417a250365474067b7cb0f196ebabd04b3fe834c4e2b5a212b5ce,1723 - pantry-tree: - size: 542 - sha256: 74233c36098c69ffdeac6fdf578ddf77c6308f6dda900b8c038a3b652768f253 - original: - hackage: text-icu-translit-0.1.0.7 -- completed: - hackage: wai-middleware-gunzip-0.0.2@sha256:03ad25dd0faf55e20087e7d8456e60188d1b8fe5d6572b73f31cbab8157f57bb,1211 - pantry-tree: - size: 298 - sha256: 9ca3f095e65532b408abde50bbb6c6aa5cb58de9c7918ba775fc7873521a790b - original: - hackage: wai-middleware-gunzip-0.0.2 -- completed: - hackage: cql-io-tinylog-0.1.0@sha256:8a5abaa6ca0dbf061cc092d5c04a473d5c3d0aa3905f2f10fecb478962d4c11b,663 - pantry-tree: - size: 232 - sha256: c6d7b32126a059dec2b56f529a6ff1f493c3f887e1555793486568399b813e49 - original: - hackage: cql-io-tinylog-0.1.0 -- completed: - hackage: invertible-hxt-0.1@sha256:8495092e94f6a7eebbdf980a8ccd3684f2078b02b2faf4b4822b1202ee42dae9,865 - pantry-tree: - size: 195 - sha256: da65a22968a2fecc17f42e66f1f3d0d2f341e4af50bf496c6c0fe84c0907f756 - original: - hackage: invertible-hxt-0.1 -- completed: - hackage: base58-bytestring-0.1.0@sha256:a1da72ee89d5450bac1c792d9fcbe95ed7154ab7246f2172b57bd4fd9b5eab79,1913 - pantry-tree: - size: 419 - sha256: 053784f8edef6433518c873a7c502dc75348f812e2384e1306f90467ea54f40b - original: - hackage: base58-bytestring-0.1.0 -- completed: - hackage: stompl-0.5.0@sha256:58a43198bc24a2332aecec65bc5de3ccb4fe93e470e217b892cd87545240e4ce,1895 - pantry-tree: - size: 357 - sha256: f4d7a11d9ee71ea0c5504aea227105a7528d41a26972d35f813bb82ab7dc0321 - original: - hackage: stompl-0.5.0 -- completed: - hackage: pattern-trie-0.1.0@sha256:2ef9ad9a630f07e8e8c9a6689e47d7600b5ca3ebc7fe060d31bb687b1f122eed,2346 - pantry-tree: - size: 632 - sha256: 9cf57bcb24b5da4d9ab314750810dce6c28ae082348e0afd60bdb12afdeeca6f - original: - hackage: pattern-trie-0.1.0 -- completed: - hackage: markov-chain-usage-model-0.0.0@sha256:1afa95faeb9213c4d960a669190078b41b89169462b8edd910472980671ba8c0,2112 - pantry-tree: - size: 432 - sha256: 6871bd9281acf589296d0998a3d62892b036040ab10e74e8a0f356f68c194f4f - original: - hackage: markov-chain-usage-model-0.0.0 -- completed: - hackage: wai-predicates-1.0.0@sha256:46ec4b4afcecac28810e6a13613fedc0c995419cb7c5e18d3dd62eed258b434f,2848 - pantry-tree: - size: 1378 - sha256: 58c340a179ad44850ace6f5d7d14df2f2e8cc7fd95f8a83b1c0c19e8b777760b - original: - hackage: wai-predicates-1.0.0 -- completed: - hackage: redis-io-1.1.0@sha256:16ff8142557658df2c8ad569a1108042bab4cc4aec73fbc9dfd910477222c2e8,2732 - pantry-tree: - size: 809 - sha256: db61f70aa7387090c26ccca0545ffdeea0adfcf93b76d5eaf6a954c0e5a34064 - original: - hackage: redis-io-1.1.0 -- completed: - hackage: polysemy-mocks-0.2.0.0@sha256:ed7b4aa8ee29995d0b840ac0c131a141636ca46493b82706b7e5ec5e33b9ffa7,1441 - pantry-tree: - size: 695 - sha256: 8218e3dde278ca1f01d19009fad40f603e1b17993a519d15fe6319e3a827cc01 - original: - hackage: polysemy-mocks-0.2.0.0 -- completed: - hackage: wai-route-0.4.0@sha256:ee52f13d2945e4a56147e91e515e184f840654f2e3d9071c73bec3d8aa1f4444,2119 - pantry-tree: - size: 566 - sha256: d98288879d370d53e741f0dafaad96de2a58f84556ce4a835322d4029e529b9d - original: - hackage: wai-route-0.4.0 -- completed: - hackage: QuickCheck-2.14@sha256:3f536a4b86bef7ec39025f04ef8d76c5ac5a78ba0b42e660b25d0a8f9c811045,7004 - pantry-tree: - size: 2203 - sha256: 7067593c50ff2e5e83c637ac73009f4bd8f43c29ff256e976bbb14674033abe9 - original: - hackage: QuickCheck-2.14 -- completed: - hackage: splitmix-0.0.4@sha256:fb9bb8b54a2e76c8a021fe5c4c3798047e1f60e168379a1f80693047fe00ad0e,4813 - pantry-tree: - size: 872 - sha256: e58892088b95190bfb59a7c0803f7ef65338e57fc9b938d7c166563605003902 - original: - hackage: splitmix-0.0.4 -- completed: - hackage: servant-mock-0.8.7@sha256:64cb3e52bbd51ab6cb25e3f412a99ea712c6c26f1efd117f01a8d1664df49c67,2306 - pantry-tree: - size: 555 - sha256: b263e932ec6b151e52987054ec0a4cd692fa787f856c79e51498302eb0d6c388 - original: - hackage: servant-mock-0.8.7 -- completed: - hackage: servant-swagger-ui-0.3.4.3.36.1@sha256:b696e28ed2c9090ae3306535a80f4a54a876def2d33db0c795c911826c107cda,1746 - pantry-tree: - size: 878 - sha256: 137680a15ee0147cd19634d8296d90c2150ca4fd62ed3d56f7e07ccd8823810c - original: - hackage: servant-swagger-ui-0.3.4.3.36.1 -- completed: - hackage: tls-1.5.5@sha256:f6681d6624071211edd509a8f56e0c96b4f003bb349b7dc706d4333775a373c5,6996 - pantry-tree: - size: 4897 - sha256: 6400901a8f8ddd0c7d2fb30c95857753a654a60a63fcec38aab4a08b23e0984f - original: - hackage: tls-1.5.5 -- completed: - hackage: cryptonite-0.28@sha256:edf00c7b00b9a1c07a178c0fe446c6ebe462637d498590757c8eac2075bb0b43,18215 - pantry-tree: - size: 23132 - sha256: 3737ee32d6629b4b915c01911fdb9dc0e255b96233799479c29420d986634726 - original: - hackage: cryptonite-0.28 -- completed: - name: servant-swagger - version: 1.1.11 - git: https://github.com/haskell-servant/servant-swagger - pantry-tree: - size: 1965 - sha256: 8fd0d018aee725fa475a408d17a54ae8d190518e96453b304687bccafe4cddac - commit: bb0a84faa073fa9530f60337610d7da3d5b9393c - original: - git: https://github.com/haskell-servant/servant-swagger - commit: bb0a84faa073fa9530f60337610d7da3d5b9393c -- completed: - subdir: servant - name: servant - version: 0.18.2 - git: https://github.com/wireapp/servant.git - pantry-tree: - size: 2809 - sha256: 22348fceac7bca97f5c349d9db0b157e401ed273d151d8cbcbd767f4d06791e8 - commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 - original: - subdir: servant - git: https://github.com/wireapp/servant.git - commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 -- completed: - subdir: servant-server - name: servant-server - version: 0.18.2 - git: https://github.com/wireapp/servant.git - pantry-tree: - size: 2727 - sha256: 55d3c9747550555f3861b5fabfe7cc0385c64ccaf3e5b051aa3064bddb8661ad - commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 - original: - subdir: servant-server - git: https://github.com/wireapp/servant.git - commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 -- completed: - subdir: servant-client - name: servant-client - version: 0.18.2 - git: https://github.com/wireapp/servant.git - pantry-tree: - size: 1346 - sha256: 9245621a9097c0b4d5ecbd61616d00c69112e1539db8803a0fda010de484e7ba - commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 - original: - subdir: servant-client - git: https://github.com/wireapp/servant.git - commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 -- completed: - subdir: servant-client-core - name: servant-client-core - version: 0.18.2 - git: https://github.com/wireapp/servant.git - pantry-tree: - size: 1444 - sha256: b5a7abf78d2ee0887bf05d7d4ba71e3c689b65a9b2e7386c394f4bdb6ff8e55d - commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 - original: - subdir: servant-client-core - git: https://github.com/wireapp/servant.git - commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 -- completed: - hackage: HsOpenSSL-x509-system-0.1.0.3@sha256:f4958ee0eec555c5c213662eff6764bddefe5665e2afcfd32733ce3801a9b687,1774 - pantry-tree: - size: 503 - sha256: 2a097abbccc0382ebb565c8ab9932628f33471607c2174303c3c930d7685bd18 - original: - hackage: HsOpenSSL-x509-system-0.1.0.3@sha256:f4958ee0eec555c5c213662eff6764bddefe5665e2afcfd32733ce3801a9b687,1774 -- completed: - hackage: cql-4.0.2@sha256:a0006a5ac13d6f86d5eff28c11be80928246309f217ea6d5f5c8a76a5d16b48b,3157 - pantry-tree: - size: 1281 - sha256: 8cc6e57c6a794188ae79415cee38bd29e1c07f7426cfa533c9a57523c0a2ed23 - original: - hackage: cql-4.0.2@sha256:a0006a5ac13d6f86d5eff28c11be80928246309f217ea6d5f5c8a76a5d16b48b,3157 -- completed: - hackage: cql-io-1.1.1@sha256:897ef0811b227c8b1a269b29b9c1ebfb09c46f00d66834e2e8c6f19ea7f90f7d,4611 - pantry-tree: - size: 2067 - sha256: 7ced76ae95b51fa1669b4fcaeec3825b5cb8cf1f4e37c53d0bddf6234742eba8 - original: - hackage: cql-io-1.1.1@sha256:897ef0811b227c8b1a269b29b9c1ebfb09c46f00d66834e2e8c6f19ea7f90f7d,4611 -- completed: - hackage: primitive-extras-0.8@sha256:fca0310150496867f5b9421fe1541ecda87fae17eae44885a29f9c52dd00c8ff,2963 - pantry-tree: - size: 1105 - sha256: e7c1d26202b80d1fca2ef780ec7fe76ede1275f4d9a996c6d44c08d8de1c45db - original: - hackage: primitive-extras-0.8@sha256:fca0310150496867f5b9421fe1541ecda87fae17eae44885a29f9c52dd00c8ff,2963 -- completed: - hackage: text-format-0.3.2@sha256:2a3fc17cf87120fcfdbca62a0da59759755549285841cdc1483081c35fb3d115,1814 - pantry-tree: - size: 1029 - sha256: 2db26ddb77184186e0d5b2b020bdfbeb044c168024767b1fa3691682ca618896 - original: - hackage: text-format-0.3.2@sha256:2a3fc17cf87120fcfdbca62a0da59759755549285841cdc1483081c35fb3d115,1814 -- completed: - hackage: hex-0.2.0@sha256:197d2561d2e216c4ead035b4911dabc6e678ac6257cb71b64e324c822f6f9f5a,726 - pantry-tree: - size: 197 - sha256: 1e5aba0165fb8ffa93d1516a87026a59c245750ca5f2ed42bd53b8328620f98e - original: - hackage: hex-0.2.0@sha256:197d2561d2e216c4ead035b4911dabc6e678ac6257cb71b64e324c822f6f9f5a,726 -- completed: - hackage: quickcheck-state-machine-0.6.0@sha256:3e4f8df0f6b5d415e3c8840dc75034a63e37f56f5f8cfa1035ded16345235ac4,3825 - pantry-tree: - size: 1926 - sha256: ae502fd7f4c6680294149bed482d1896904c1259d5ae614093da01e0731ec92e - original: - hackage: quickcheck-state-machine-0.6.0 -- completed: - hackage: servant-multipart-0.11.5@sha256:1633f715b5b53d648a1da69839bdc5046599f4f7244944d4bbf852dba38d8f4b,2319 - pantry-tree: - size: 333 - sha256: b3e1fd2ad2e654475be000c2f0ac6f717b5499436fa73eec50ceccddf352dcec - original: - hackage: servant-multipart-0.11.5@sha256:1633f715b5b53d648a1da69839bdc5046599f4f7244944d4bbf852dba38d8f4b,2319 -- completed: - name: HaskellNet-SSL - version: 0.3.4.2 - git: https://github.com/dpwright/HaskellNet-SSL - pantry-tree: - size: 786 - sha256: c6a64c9e64bc834842756be28eaac2d842f0dde3753542bfa0cfd87ae5cf0bc5 - commit: ca84ef29a93eaef7673fa58056cdd8dae1568d2d - original: - git: https://github.com/dpwright/HaskellNet-SSL - commit: ca84ef29a93eaef7673fa58056cdd8dae1568d2d -- completed: - hackage: mu-rpc-0.4.0.1@sha256:24f2516926a669f860b59d17ed8af6d0704361b5abed30f4e7eb80fb685ae8bc,1383 - pantry-tree: - size: 445 - sha256: 235597681d97b0789bc7437c752658f2585248d889a289c09532e3e535640cfa - original: - hackage: mu-rpc-0.4.0.1 -- completed: - hackage: mu-optics-0.3.0.1@sha256:c3494c71c6300e6a0dcb77c9782481150956e912c1b47fccd69cbb795e461d52,1068 - pantry-tree: - size: 172 - sha256: 6f8275b8db1dce6136ebd2eb831495af39774d9560d8d07e60d5da09a5f3ed99 - original: - hackage: mu-optics-0.3.0.1 -- completed: - hackage: mu-avro-0.4.0.4@sha256:10e317c633c5152a26e89becba749456b76f70eb640d1c0b2ccdc0e45a7ef5da,2096 - pantry-tree: - size: 541 - sha256: 26fd2a714615b6c2c0459178fb5f350848ce64be5c33076c4ddaff9c74adb278 - original: - hackage: mu-avro-0.4.0.4 -- completed: - hackage: mu-protobuf-0.4.2.0@sha256:4787a2688abdda107e150736433b61448acdf0b71eb0c174232239b4c143f78b,2119 - pantry-tree: - size: 640 - sha256: ad3ec2fa09fea08c1c7c5181db7ed4440c030cc6c9dbc708a9a58155c13ca8fa - original: - hackage: mu-protobuf-0.4.2.0 -- completed: - hackage: mu-schema-0.3.1.2@sha256:c05e58de29d50376638d19dd3357cd3644d39f984664484f3568d5305b3034d9,1933 - pantry-tree: - size: 1061 - sha256: 07d5d0ab3fc6db8e7492311caacbd92f33a343fd173cb51d2915522b3aea8073 - original: - hackage: mu-schema-0.3.1.2 -- completed: - hackage: mu-grpc-server-0.4.0.0@sha256:03963b39f5b0887d261106ec03bfabbd4ccd1489e4c59c6cc216b61a4ffdb52c,2682 - pantry-tree: - size: 334 - sha256: e0d51b2551de2ecce35707b3dc3fabfe67cbd206522d363bf2316b08c2ccbfda - original: - hackage: mu-grpc-server-0.4.0.0 -- completed: - hackage: mu-grpc-client-0.4.0.1@sha256:b09dcf69f0650e0cfd86d6f67544a6350590574f4757f5ee459c57828c3a41ff,2079 - pantry-tree: - size: 562 - sha256: 94e32cdfdee230f090684804fee5ef254c6063f985b913c8efaadbe1dfceafef - original: - hackage: mu-grpc-client-0.4.0.1 -- completed: - hackage: mu-grpc-common-0.4.0.0@sha256:568b5879cd67c0bc0e956d53fb87552bb6d9a6287c5d1b09e2284ed5b04de418,1394 - pantry-tree: - size: 281 - sha256: 7e745ded1cb622178392ae2d5a6d5591af9743b58506de5ed2e17d7d698b0d18 - original: - hackage: mu-grpc-common-0.4.0.0 -- completed: - hackage: compendium-client-0.2.1.1@sha256:cd477438d507273b34b82581ade333921ae997c1618b48af0c1da2a4968623e0,1203 - pantry-tree: - size: 181 - sha256: 18996ce535e40483ca2e29397e606aae551552608f96a6a8cc647ce24e24e937 - original: - hackage: compendium-client-0.2.1.1 -- completed: - hackage: http2-grpc-types-0.5.0.0@sha256:4d34edc06a48496130f19245817a7cd7ea15c78ac8815570c3795ffc4503cf27,1445 - pantry-tree: - size: 405 - sha256: 3a1a94b87acd230b2f750f0077dc47177f37e46a2984b5764390207a83c4d5e4 - original: - hackage: http2-grpc-types-0.5.0.0 -- completed: - hackage: http2-grpc-proto3-wire-0.1.0.0@sha256:4f6c0d27048756155b82ebf7385a20cc8241c7bd854e96d1dd6a1827e75fa410,1504 - pantry-tree: - size: 341 - sha256: d07d5bb883860e3bf928c00312df133a4c195c99bb397865bd67f433f75387b8 - original: - hackage: http2-grpc-proto3-wire-0.1.0.0 -- completed: - hackage: warp-grpc-0.4.0.1@sha256:3859190e4fa23b944cf93ac691b3cec78c2adf4eaff6a4e8070c89fd17915add,1759 - pantry-tree: - size: 709 - sha256: f542ef3e7e03b9cd0b2c0e0c436ce4e68ab37f56195740639034cc3cd28a6b9f - original: - hackage: warp-grpc-0.4.0.1 -- completed: - hackage: proto3-wire-1.2.0@sha256:898c88614ef328fe74d6abc153387a30855af7ccfcebf3b419681133e0fb9291,2837 - pantry-tree: - size: 1009 - sha256: 43009bc2c01725358b40f590bc899f0edbece516090944b6015d40178781759c - original: - hackage: proto3-wire-1.2.0 -- completed: - hackage: parameterized-0.5.0.0@sha256:880717fbb958de1bac015f0a375ab6636f162a72483d987a11e305da6fac6c97,1969 - pantry-tree: - size: 1019 - sha256: 843aed822e03279edf00a2595dfb22038b306f4f0acd6984bd108024c5102f90 - original: - hackage: parameterized-0.5.0.0 -- completed: - name: http2-client - version: 0.10.0.1 - git: https://github.com/lucasdicioccio/http2-client - pantry-tree: - size: 1545 - sha256: d0b3ab62eee8ee4c0ddec7a90fea78090815a54884646ddcdc451ff51d7e262a - commit: 73f5975e18eda9d071aa5548fcea6b5a51e61769 - original: - git: https://github.com/lucasdicioccio/http2-client - commit: 73f5975e18eda9d071aa5548fcea6b5a51e61769 -- completed: - subdir: http2-client-grpc - name: http2-client-grpc - version: 0.8.0.0 - git: https://github.com/wireapp/http2-grpc-haskell - pantry-tree: - size: 455 - sha256: 5599a7b9b801d669e2063ffd4ab767bb8bbf12d20069de0cbd8862bca78d7e42 - commit: eea98418672626eafbace3181ca34bf44bee91c0 - original: - subdir: http2-client-grpc - git: https://github.com/wireapp/http2-grpc-haskell - commit: eea98418672626eafbace3181ca34bf44bee91c0 -- completed: - name: http2 - version: 2.0.6 - git: https://github.com/wireapp/http2 - pantry-tree: - size: 51601 - sha256: 0a048cf85ab9614f2da80e3a8cf72ee7674cecea86b37a5e56011add73e5fa03 - commit: 7c465be1201e0945b106f7cc6176ac1b1193be13 - original: - git: https://github.com/wireapp/http2 - commit: 7c465be1201e0945b106f7cc6176ac1b1193be13 -- completed: - name: snappy - version: 0.2.0.2 - git: https://github.com/wireapp/snappy - pantry-tree: - size: 989 - sha256: ae7fdf1988910fa026279052e85ade0a99962a3e7812ace104797e12ead0cd1d - commit: b0e5c08af48911caecffa4fa6a3e74872018b258 - original: - git: https://github.com/wireapp/snappy - commit: b0e5c08af48911caecffa4fa6a3e74872018b258 -- completed: - subdir: x509-store - name: x509-store - version: 1.6.7 - git: https://github.com/vincenthz/hs-certificate - pantry-tree: - size: 398 - sha256: bf71c28417dcf76a8aef361fbc74abe78962c80e7e996a2515996fd44b2f6ba6 - commit: a899bda3d7666d25143be7be8f3105fc076703d9 - original: - subdir: x509-store - git: https://github.com/vincenthz/hs-certificate - commit: a899bda3d7666d25143be7be8f3105fc076703d9 -- completed: - hackage: polysemy-1.7.0.0@sha256:c972f33191113e2fe6809ea1cda24a6cabfeed2f115b3be0137dee7c65d08293,5977 - pantry-tree: - size: 4577 - sha256: 78c733f5dde13340e880bbb883dc64af948f6449da3a4025811cdc79c204dfde - original: - hackage: polysemy-1.7.0.0 -- completed: - hackage: polysemy-plugin-0.4.2.0@sha256:1dbcb892bb866926994dadafeb93e76ae4a6625dc3ae9ca0f4f419ee85cb2f7b,3154 - pantry-tree: - size: 1229 - sha256: ee75425b00b0f1c80207c3c4d5df86a94d892de229b75fb23e0380ec2526a626 - original: - hackage: polysemy-plugin-0.4.2.0 -- completed: - hackage: polysemy-check-0.8.1.0@sha256:5cce3ae162d2f8d8f629397daa28ec5e425f72d357afeb4fe994e102425f2383,2648 - pantry-tree: - size: 1027 - sha256: bc880fb3405307ed251c02358d604979d8014040b78c2ffe6319076431f93509 - original: - hackage: polysemy-check-0.8.1.0 -- completed: - hackage: ormolu-0.1.4.1@sha256:ed404eac6e4eb64da1ca5fb749e0f99907431a9633e6ba34e44d260e7d7728ba,6499 - pantry-tree: - size: 74141 - sha256: 86dffe835089c8029e99046a75e7350fae8b80266a352a7295f13a279a8e5363 - original: - hackage: ormolu-0.1.4.1 -- completed: - hackage: ghc-lib-parser-8.10.1.20200412@sha256:b0517bb150a02957d7180f131f5b94abd2a7f58a7d1532a012e71618282339c2,8751 - pantry-tree: - size: 19497 - sha256: b11275740480138dd1fce4a22a2aa8835cddfecaa8da58a153f130b4575f9df5 - original: - hackage: ghc-lib-parser-8.10.1.20200412@sha256:b0517bb150a02957d7180f131f5b94abd2a7f58a7d1532a012e71618282339c2,8751 -- completed: - hackage: headroom-0.2.1.0@sha256:084b72a071454516bff30c3f50e4f671fb12ee062602693ad5ffcafdea5fab99,8140 - pantry-tree: - size: 9195 - sha256: 11d2ac77cee54cc1f222e574e4126189fe5b60a47a1aedbafc2ab0de709b29c6 - original: - hackage: headroom-0.2.1.0 -- completed: - hackage: implicit-hie-0.1.2.5@sha256:517a98ef72f92f0a1617495222774fed3a751a64b0c06fbfc7b858d7aa5de279,2998 - pantry-tree: - size: 844 - sha256: 9bf2645187637b647dfaebf37a45a57e221b3527592ce3b1cfd9faf90339dac3 - original: - hackage: implicit-hie-0.1.2.5 -snapshots: -- completed: - size: 532382 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/14.yaml - sha256: 1ef27e36f38824abafc43224ca612211b3828fa9ffd31ba0fc2867ae2e19ba90 - original: lts-16.14 From b97e697fb528c992eb3bb4b23331ceb9b38b4ff8 Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Wed, 1 Dec 2021 08:44:06 +0100 Subject: [PATCH 02/63] ... --- stack.yaml.lock | 871 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 871 insertions(+) create mode 100644 stack.yaml.lock diff --git a/stack.yaml.lock b/stack.yaml.lock new file mode 100644 index 0000000000..e9ce9f327d --- /dev/null +++ b/stack.yaml.lock @@ -0,0 +1,871 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + subdir: wai-middleware-prometheus + name: wai-middleware-prometheus + version: 1.0.0 + git: https://github.com/fimad/prometheus-haskell + pantry-tree: + size: 359 + sha256: 72560f0d8c7f57db769e77d491e8b10255938631847981de52e94781b905a27a + commit: 2e3282e5fb27ba8d989c271a0a989823fad7ec43 + original: + subdir: wai-middleware-prometheus + git: https://github.com/fimad/prometheus-haskell + commit: 2e3282e5fb27ba8d989c271a0a989823fad7ec43 +- completed: + name: saml2-web-sso + version: '0.18' + git: https://github.com/wireapp/saml2-web-sso + pantry-tree: + size: 4887 + sha256: 29e0138ca6bc33500b87cd6c06bbd899fe4ddaadcfd5117b211e7769f9f80161 + commit: 60398f375987b74d6b855b5d225e45dc3a96ac06 + original: + git: https://github.com/wireapp/saml2-web-sso + commit: 60398f375987b74d6b855b5d225e45dc3a96ac06 +- completed: + name: collectd + version: 0.0.0.2 + git: https://github.com/kim/hs-collectd + pantry-tree: + size: 574 + sha256: 708fdfbd4ba09171072239e12fda5647adf60f99a70cd259685db74c6a25820f + commit: 885da222be2375f78c7be36127620ed772b677c9 + original: + git: https://github.com/kim/hs-collectd + commit: 885da222be2375f78c7be36127620ed772b677c9 +- completed: + name: snappy-framing + version: 0.1.1 + git: https://github.com/kim/snappy-framing + pantry-tree: + size: 651 + sha256: 91a2ac7e0dd161fd82eee3007a6b488e53ad14a5d4e640ffdeba23f4741fbf64 + commit: d99f702c0086729efd6848dea8a01e5266c3a61c + original: + git: https://github.com/kim/snappy-framing + commit: d99f702c0086729efd6848dea8a01e5266c3a61c +- completed: + name: wai-routing + version: 0.13.0 + git: https://gitlab.com/twittner/wai-routing + pantry-tree: + size: 1020 + sha256: a1aa6c9ff369ee27cfa9d95f20f7d4fa0f239ad80ed45fb6d45ed0c6543eac30 + commit: 7e996a93fec5901767f845a50316b3c18e51a61d + original: + git: https://gitlab.com/twittner/wai-routing + commit: 7e996a93fec5901767f845a50316b3c18e51a61d +- completed: + name: multihash + version: 0.1.6 + git: https://github.com/wireapp/haskell-multihash.git + pantry-tree: + size: 602 + sha256: 8ad8afc9e9bce4830304eff1e0c1c96fc878b1aad9c55896b4cfc256dba0688c + commit: 300a6f46384bfca33e545c8bab52ef3717452d12 + original: + git: https://github.com/wireapp/haskell-multihash.git + commit: 300a6f46384bfca33e545c8bab52ef3717452d12 +- completed: + name: hspec-wai + version: 0.9.2 + git: https://github.com/wireapp/hspec-wai + pantry-tree: + size: 1829 + sha256: 1da15bc431ded925782e30d299556f7c33ab89fa74e5a519061081616fb9f4d7 + commit: 0a5142cd3ba48116ff059c041348b817fb7bdb25 + original: + git: https://github.com/wireapp/hspec-wai + commit: 0a5142cd3ba48116ff059c041348b817fb7bdb25 +- completed: + name: bloodhound + version: 0.17.0.0 + git: https://github.com/wireapp/bloodhound + pantry-tree: + size: 4587 + sha256: fc77d3295fba77f96f80bf10860afac1855d393020f3d04d71bf530afa17c143 + commit: 92de9aa632d590f288a353d03591c38ba72b3cb3 + original: + git: https://github.com/wireapp/bloodhound + commit: 92de9aa632d590f288a353d03591c38ba72b3cb3 +- completed: + hackage: deriving-aeson-0.2.5@sha256:a1efa4ab7ff94f73e6d2733a9d4414cb4c3526761295722cff28027b5b3da1a4,1277 + pantry-tree: + size: 441 + sha256: 8fa77245ed0f169fae3a337bf4b9114c44e6bd0cd02ce748998f46c19ef32277 + original: + hackage: deriving-aeson-0.2.5@sha256:a1efa4ab7ff94f73e6d2733a9d4414cb4c3526761295722cff28027b5b3da1a4,1277 +- completed: + hackage: aeson-1.4.7.1@sha256:6d8d2fd959b7122a1df9389cf4eca30420a053d67289f92cdc0dbc0dab3530ba,7098 + pantry-tree: + size: 40133 + sha256: caa9306e519c601ab0170d113daa03c1163db53e5466be2968bbd61a771bebcb + original: + hackage: aeson-1.4.7.1@sha256:6d8d2fd959b7122a1df9389cf4eca30420a053d67289f92cdc0dbc0dab3530ba,7098 +- completed: + subdir: amazonka + name: amazonka + version: 1.6.1 + git: https://github.com/wireapp/amazonka + pantry-tree: + size: 1038 + sha256: 59c7840fe6c9609d1d5022149010e72db5778e4978b9384b6dee8a4a207c96b3 + commit: 412172d8c28906591f01576a78792de7c34cc3eb + original: + subdir: amazonka + git: https://github.com/wireapp/amazonka + commit: 412172d8c28906591f01576a78792de7c34cc3eb +- completed: + subdir: amazonka-cloudfront + name: amazonka-cloudfront + version: 1.6.1 + git: https://github.com/wireapp/amazonka + pantry-tree: + size: 12839 + sha256: f0f27588c628d9996c298ab035b19999572ad8432ea05526497b608b009b1258 + commit: 412172d8c28906591f01576a78792de7c34cc3eb + original: + subdir: amazonka-cloudfront + git: https://github.com/wireapp/amazonka + commit: 412172d8c28906591f01576a78792de7c34cc3eb +- completed: + subdir: amazonka-dynamodb + name: amazonka-dynamodb + version: 1.6.1 + git: https://github.com/wireapp/amazonka + pantry-tree: + size: 8379 + sha256: d513775676879e3b2ff8393528882df1670a79110120b65ce6c68765581a2473 + commit: 412172d8c28906591f01576a78792de7c34cc3eb + original: + subdir: amazonka-dynamodb + git: https://github.com/wireapp/amazonka + commit: 412172d8c28906591f01576a78792de7c34cc3eb +- completed: + subdir: amazonka-s3 + name: amazonka-s3 + version: 1.6.1 + git: https://github.com/wireapp/amazonka + pantry-tree: + size: 18431 + sha256: a19d02da301bbcad502e6092d7418a59543747c8bb6f12932bcbc4606f7814ab + commit: 412172d8c28906591f01576a78792de7c34cc3eb + original: + subdir: amazonka-s3 + git: https://github.com/wireapp/amazonka + commit: 412172d8c28906591f01576a78792de7c34cc3eb +- completed: + subdir: amazonka-ses + name: amazonka-ses + version: 1.6.1 + git: https://github.com/wireapp/amazonka + pantry-tree: + size: 18197 + sha256: cd9b02c30d7571dc87868b054ed3826d5b8d26b717f3158da6443377e8dfd563 + commit: 412172d8c28906591f01576a78792de7c34cc3eb + original: + subdir: amazonka-ses + git: https://github.com/wireapp/amazonka + commit: 412172d8c28906591f01576a78792de7c34cc3eb +- completed: + subdir: amazonka-sns + name: amazonka-sns + version: 1.6.1 + git: https://github.com/wireapp/amazonka + pantry-tree: + size: 7905 + sha256: e5a6d407b92e423ccf58d784fe42d4a0598204f65c0e7753569c130428bfb5eb + commit: 412172d8c28906591f01576a78792de7c34cc3eb + original: + subdir: amazonka-sns + git: https://github.com/wireapp/amazonka + commit: 412172d8c28906591f01576a78792de7c34cc3eb +- completed: + subdir: amazonka-sqs + name: amazonka-sqs + version: 1.6.1 + git: https://github.com/wireapp/amazonka + pantry-tree: + size: 5351 + sha256: 990b7e4467d557e43959483063f7229f5039857a8cd67decb53f9a5c513db7f8 + commit: 412172d8c28906591f01576a78792de7c34cc3eb + original: + subdir: amazonka-sqs + git: https://github.com/wireapp/amazonka + commit: 412172d8c28906591f01576a78792de7c34cc3eb +- completed: + subdir: core + name: amazonka-core + version: 1.6.1 + git: https://github.com/wireapp/amazonka + pantry-tree: + size: 3484 + sha256: d4e427a362d66c9ee0dc0de810015633e43e3953944a84b24cfa2e71bcf0ed4d + commit: 412172d8c28906591f01576a78792de7c34cc3eb + original: + subdir: core + git: https://github.com/wireapp/amazonka + commit: 412172d8c28906591f01576a78792de7c34cc3eb +- completed: + name: cryptobox-haskell + version: 0.1.1 + git: https://github.com/wireapp/cryptobox-haskell + pantry-tree: + size: 279 + sha256: 2b1c19494263d1c6f88654b72ff4e0cc3b54a02cc81f8587899336e99c8a662f + commit: 7546a1a25635ef65183e3d44c1052285e8401608 + original: + git: https://github.com/wireapp/cryptobox-haskell + commit: 7546a1a25635ef65183e3d44c1052285e8401608 +- completed: + name: hsaml2 + version: '0.1' + git: https://github.com/wireapp/hsaml2 + pantry-tree: + size: 3918 + sha256: 072d64ee1d974ed2170e4b0dacfeef2cb13ae62fe066211e93c0be0073f959a3 + commit: b652ec6e69d1647e827cbee0fa290605ac09dc63 + original: + git: https://github.com/wireapp/hsaml2 + commit: b652ec6e69d1647e827cbee0fa290605ac09dc63 +- completed: + subdir: http-client + name: http-client + version: 0.7.0 + git: https://github.com/wireapp/http-client + pantry-tree: + size: 3129 + sha256: 355d13d4b018ab32ad3ba1b88d8d183c4f673efb3a8109d3b0260776b2473ec0 + commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd + original: + subdir: http-client + git: https://github.com/wireapp/http-client + commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd +- completed: + subdir: http-client-openssl + name: http-client-openssl + version: 0.3.1.0 + git: https://github.com/wireapp/http-client + pantry-tree: + size: 387 + sha256: c9265105d25badaa471e8d3d0eb493ebcba3ce17b4d430d2db70b6a0a4f90821 + commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd + original: + subdir: http-client-openssl + git: https://github.com/wireapp/http-client + commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd +- completed: + subdir: http-client-tls + name: http-client-tls + version: 0.3.5.3 + git: https://github.com/wireapp/http-client + pantry-tree: + size: 435 + sha256: 13722b74ba7edde9163e5c194af168fc98c4dc419c37fd42fada45f5a89d2042 + commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd + original: + subdir: http-client-tls + git: https://github.com/wireapp/http-client + commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd +- completed: + subdir: http-conduit + name: http-conduit + version: 2.3.7.3 + git: https://github.com/wireapp/http-client + pantry-tree: + size: 1074 + sha256: ec54f41b6997eabc01aa5e65a584bf37a39efb57a9eaad8f1e8005137f32c625 + commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd + original: + subdir: http-conduit + git: https://github.com/wireapp/http-client + commit: 9100baeddbd15d93dc58a826ae812dafff29d5fd +- completed: + hackage: template-0.2.0.10@sha256:f822de4d34c45bc84b33a61bc112c15fedee6fa6dc414c62b10456395a868f85,987 + pantry-tree: + size: 339 + sha256: e9829c39501915bc47fda35069207b7a839f9fb929b81946e151e0dda8a7fda1 + original: + hackage: template-0.2.0.10 +- completed: + hackage: HaskellNet-0.6@sha256:1b514b95acf1c56f39bebc27150c909988d0a6ad28a2db1210316cffed57cad7,2344 + pantry-tree: + size: 1689 + sha256: 22cc61632129d47407d3e28c5291f21b7cc9a5df69304395d75d5ae341f567d4 + original: + hackage: HaskellNet-0.6 +- completed: + hackage: smtp-mail-0.3.0.0@sha256:2e6d9cb29d09a5a04d77a905eb1b570b94b5654e24d40630ea96aa374474c12f,1239 + pantry-tree: + size: 450 + sha256: 4d319cb6c22b35ca043a83210cd09bfbf99eec3dca4945cd53ed5b7c96f7daca + original: + hackage: smtp-mail-0.3.0.0 +- completed: + hackage: stm-containers-1.2@sha256:a887f2e7692b7cf20e0b081e2d66e21076e2bd4b57016ec59c484edfa2d29397,3244 + pantry-tree: + size: 761 + sha256: 20b1076bdb121347ccc512a67df697eed34815a8e35279b6b9a0951963b1eba2 + original: + hackage: stm-containers-1.2 +- completed: + hackage: redis-resp-1.0.0@sha256:c134ac23e79d57071fdc8559e2b2e72280ea11786a8ba4118c10ed506dc7d991,1615 + pantry-tree: + size: 441 + sha256: c63020c2f2ca4f92c4747959a2e89e84bdd929d1ea1458c75552ee3f7aaa00fc + original: + hackage: redis-resp-1.0.0 +- completed: + hackage: stm-hamt-1.2.0.6@sha256:fba86ccb4b45c5706c19b0e1315ba63dcac3b5d71de945ec001ba921fae80061,3972 + pantry-tree: + size: 1009 + sha256: 1920790535af832b76e7583c33ecf51f8b0b0c3615ef1db1c8ed9be19622c1db + original: + hackage: stm-hamt-1.2.0.6 +- completed: + hackage: primitive-unlifted-1.0.0.0@sha256:16c3f149cf2fb3da64a43ffd0020d78a198454baded3a7f7f49a59397eea5770,2293 + pantry-tree: + size: 1719 + sha256: 0ca7abed459d0240ee880bc52d957e35ca01017313ea94b5d026fc1842aba93c + original: + hackage: primitive-unlifted-1.0.0.0 +- completed: + hackage: prometheus-2.2.2@sha256:d794f5fe975be2f3ca7d7af71a7aeeb006615ad7d98835fa42caba9457a51936,4288 + pantry-tree: + size: 1559 + sha256: 3b1cb27cf8cb0a8da83b5730e85132e058e808f8dd1be349ea3dbb162c7f14c3 + original: + hackage: prometheus-2.2.2 +- completed: + hackage: currency-codes-3.0.0.1@sha256:a4b24669dd91e805b11d9eb267becd0ba6d726927e535e03d5f3f368f44c1cf4,2902 + pantry-tree: + size: 548 + sha256: 9802924b7472c67d93312eedbbb49ab250b9651101b27668133b9f5d15dbca78 + original: + hackage: currency-codes-3.0.0.1 +- completed: + hackage: mime-0.4.0.2@sha256:208947d9d1a19d08850be67ecb28c6e776db697f3bba05bd9d682e51a59f241f,983 + pantry-tree: + size: 565 + sha256: f2529a2e1678074ca0340ff60caa986f4e246d7d9abe8186657910c2900364bb + original: + hackage: mime-0.4.0.2 +- completed: + hackage: data-timeout-0.3.1@sha256:80830a56fcb562b06ede4203de3a80a17d359c40311624f9e4f72b425a5294db,1313 + pantry-tree: + size: 416 + sha256: d073a04c7c660d564e0f52baa0aad68006e992050f358f18fab6c6d9c2859d2f + original: + hackage: data-timeout-0.3.1 +- completed: + hackage: geoip2-0.4.1.0@sha256:f8b69ea86198817141edab06cd10b2dcf23a906ea9f0ba2ce52045c7fea2e5c5,1316 + pantry-tree: + size: 433 + sha256: 13b2f1557f8915c71902f576ccc1b42491f4fc38baef080a5b753df5e81b4766 + original: + hackage: geoip2-0.4.1.0 +- completed: + hackage: stomp-queue-0.5.1@sha256:47c47d21dc756c028c8253b51cf647d4fa0282777dda2265edde2f65284f9d14,2321 + pantry-tree: + size: 608 + sha256: 2996c49e280fd1bf4111ffb8788d5729c48d663648e1dd6734c83ee20681c531 + original: + hackage: stomp-queue-0.5.1 +- completed: + hackage: text-icu-translit-0.1.0.7@sha256:c8eaaee3331417a250365474067b7cb0f196ebabd04b3fe834c4e2b5a212b5ce,1723 + pantry-tree: + size: 542 + sha256: 74233c36098c69ffdeac6fdf578ddf77c6308f6dda900b8c038a3b652768f253 + original: + hackage: text-icu-translit-0.1.0.7 +- completed: + hackage: wai-middleware-gunzip-0.0.2@sha256:03ad25dd0faf55e20087e7d8456e60188d1b8fe5d6572b73f31cbab8157f57bb,1211 + pantry-tree: + size: 298 + sha256: 9ca3f095e65532b408abde50bbb6c6aa5cb58de9c7918ba775fc7873521a790b + original: + hackage: wai-middleware-gunzip-0.0.2 +- completed: + hackage: cql-io-tinylog-0.1.0@sha256:8a5abaa6ca0dbf061cc092d5c04a473d5c3d0aa3905f2f10fecb478962d4c11b,663 + pantry-tree: + size: 232 + sha256: c6d7b32126a059dec2b56f529a6ff1f493c3f887e1555793486568399b813e49 + original: + hackage: cql-io-tinylog-0.1.0 +- completed: + hackage: invertible-hxt-0.1@sha256:8495092e94f6a7eebbdf980a8ccd3684f2078b02b2faf4b4822b1202ee42dae9,865 + pantry-tree: + size: 195 + sha256: da65a22968a2fecc17f42e66f1f3d0d2f341e4af50bf496c6c0fe84c0907f756 + original: + hackage: invertible-hxt-0.1 +- completed: + hackage: base58-bytestring-0.1.0@sha256:a1da72ee89d5450bac1c792d9fcbe95ed7154ab7246f2172b57bd4fd9b5eab79,1913 + pantry-tree: + size: 419 + sha256: 053784f8edef6433518c873a7c502dc75348f812e2384e1306f90467ea54f40b + original: + hackage: base58-bytestring-0.1.0 +- completed: + hackage: stompl-0.6.0@sha256:fd7b39a754926102d3f9917213f646d5cd765ebcf23e70daf9eb99e44e441cef,1896 + pantry-tree: + size: 357 + sha256: 0bc21f1930468f6b75cab74ab6d4ff95bc1eedcda5c33c336d2599452eb45ace + original: + hackage: stompl-0.6.0 +- completed: + hackage: pattern-trie-0.1.1@sha256:265ecc98c4345a89f2711b9b00e4f52ed7c143ea20f10b76ca6ddc3066658143,2236 + pantry-tree: + size: 751 + sha256: dc1264e417abc23b25fc0b3b486880c0510a805cc0a19d2208f13d0ec8a0102d + original: + hackage: pattern-trie-0.1.1 +- completed: + hackage: markov-chain-usage-model-0.0.0@sha256:1afa95faeb9213c4d960a669190078b41b89169462b8edd910472980671ba8c0,2112 + pantry-tree: + size: 432 + sha256: 6871bd9281acf589296d0998a3d62892b036040ab10e74e8a0f356f68c194f4f + original: + hackage: markov-chain-usage-model-0.0.0 +- completed: + hackage: wai-predicates-1.0.0@sha256:46ec4b4afcecac28810e6a13613fedc0c995419cb7c5e18d3dd62eed258b434f,2848 + pantry-tree: + size: 1378 + sha256: 58c340a179ad44850ace6f5d7d14df2f2e8cc7fd95f8a83b1c0c19e8b777760b + original: + hackage: wai-predicates-1.0.0 +- completed: + hackage: redis-io-1.1.0@sha256:16ff8142557658df2c8ad569a1108042bab4cc4aec73fbc9dfd910477222c2e8,2732 + pantry-tree: + size: 809 + sha256: db61f70aa7387090c26ccca0545ffdeea0adfcf93b76d5eaf6a954c0e5a34064 + original: + hackage: redis-io-1.1.0 +- completed: + hackage: polysemy-mocks-0.2.0.0@sha256:ed7b4aa8ee29995d0b840ac0c131a141636ca46493b82706b7e5ec5e33b9ffa7,1441 + pantry-tree: + size: 695 + sha256: 8218e3dde278ca1f01d19009fad40f603e1b17993a519d15fe6319e3a827cc01 + original: + hackage: polysemy-mocks-0.2.0.0 +- completed: + hackage: wai-route-0.4.0@sha256:ee52f13d2945e4a56147e91e515e184f840654f2e3d9071c73bec3d8aa1f4444,2119 + pantry-tree: + size: 566 + sha256: d98288879d370d53e741f0dafaad96de2a58f84556ce4a835322d4029e529b9d + original: + hackage: wai-route-0.4.0 +- completed: + hackage: QuickCheck-2.14.2@sha256:4ce29211223d5e6620ebceba34a3ca9ccf1c10c0cf387d48aea45599222ee5aa,7736 + pantry-tree: + size: 2315 + sha256: 2fe423d0ed7cd64f0f165d708779f48814e66c4f181c568468134af55d86a5f8 + original: + hackage: QuickCheck-2.14.2 +- completed: + hackage: splitmix-0.1.0.4@sha256:714a55fd28d3e2533bd5b49e74f604ef8e5d7b06f249c8816f6c54aed431dcf1,6483 + pantry-tree: + size: 1519 + sha256: 79f4645c11b7a3861db0b596297f72804f509444d639a8fd7c0162b1ed80c578 + original: + hackage: splitmix-0.1.0.4 +- completed: + hackage: servant-mock-0.8.7@sha256:64cb3e52bbd51ab6cb25e3f412a99ea712c6c26f1efd117f01a8d1664df49c67,2306 + pantry-tree: + size: 555 + sha256: b263e932ec6b151e52987054ec0a4cd692fa787f856c79e51498302eb0d6c388 + original: + hackage: servant-mock-0.8.7 +- completed: + hackage: servant-swagger-ui-0.3.5.3.52.5@sha256:4734c536b8b0c48993c337e880a5bd65ed521271937ce9da5feac360dea661ba,1746 + pantry-tree: + size: 878 + sha256: 822d19afe0e75bbc8bd2b685dc2cb4fd7d5972ed1e7b61546ce3e61cf77b8808 + original: + hackage: servant-swagger-ui-0.3.5.3.52.5 +- completed: + hackage: tls-1.5.5@sha256:f6681d6624071211edd509a8f56e0c96b4f003bb349b7dc706d4333775a373c5,6996 + pantry-tree: + size: 4897 + sha256: 6400901a8f8ddd0c7d2fb30c95857753a654a60a63fcec38aab4a08b23e0984f + original: + hackage: tls-1.5.5 +- completed: + hackage: cryptonite-0.29@sha256:147724f6a8e4394fcbd51bf52aba7a8b92d3fc8f42055cd6ca9486655e2ab614,18312 + pantry-tree: + size: 23323 + sha256: 087de3ed0552cfb1f84d03629b0f98c77aadc076b85bb5cb787f77c5e5dac136 + original: + hackage: cryptonite-0.29 +- completed: + name: servant-swagger + version: 1.1.11 + git: https://github.com/haskell-servant/servant-swagger + pantry-tree: + size: 1965 + sha256: 8fd0d018aee725fa475a408d17a54ae8d190518e96453b304687bccafe4cddac + commit: bb0a84faa073fa9530f60337610d7da3d5b9393c + original: + git: https://github.com/haskell-servant/servant-swagger + commit: bb0a84faa073fa9530f60337610d7da3d5b9393c +- completed: + subdir: servant + name: servant + version: 0.18.2 + git: https://github.com/wireapp/servant.git + pantry-tree: + size: 2809 + sha256: 22348fceac7bca97f5c349d9db0b157e401ed273d151d8cbcbd767f4d06791e8 + commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 + original: + subdir: servant + git: https://github.com/wireapp/servant.git + commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 +- completed: + subdir: servant-server + name: servant-server + version: 0.18.2 + git: https://github.com/wireapp/servant.git + pantry-tree: + size: 2727 + sha256: 55d3c9747550555f3861b5fabfe7cc0385c64ccaf3e5b051aa3064bddb8661ad + commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 + original: + subdir: servant-server + git: https://github.com/wireapp/servant.git + commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 +- completed: + subdir: servant-client + name: servant-client + version: 0.18.2 + git: https://github.com/wireapp/servant.git + pantry-tree: + size: 1346 + sha256: 9245621a9097c0b4d5ecbd61616d00c69112e1539db8803a0fda010de484e7ba + commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 + original: + subdir: servant-client + git: https://github.com/wireapp/servant.git + commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 +- completed: + subdir: servant-client-core + name: servant-client-core + version: 0.18.2 + git: https://github.com/wireapp/servant.git + pantry-tree: + size: 1444 + sha256: b5a7abf78d2ee0887bf05d7d4ba71e3c689b65a9b2e7386c394f4bdb6ff8e55d + commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 + original: + subdir: servant-client-core + git: https://github.com/wireapp/servant.git + commit: a4e15fe75f294816d9ead19ed8a48cae8e0b76e7 +- completed: + hackage: HsOpenSSL-x509-system-0.1.0.4@sha256:86be72558de4cee8f4e32f9cb8b63610d7624219910cfc205a23326078658676,1777 + pantry-tree: + size: 508 + sha256: 98f6b47d27550f29a90a8f5660cf09f72f139d9940fe00cd6b0cffbd5c210a15 + original: + hackage: HsOpenSSL-x509-system-0.1.0.4 +- completed: + hackage: cql-4.0.3@sha256:10d6b09715699efec5c97f22887aaf65c8fa0b0916c926ef79bc21f4db460175,3157 + pantry-tree: + size: 1281 + sha256: 94433b7c7c46bea532fdc64c6988643a48e39b643948003b27e5bde1bdad3b24 + original: + hackage: cql-4.0.3 +- completed: + hackage: cql-io-1.1.1@sha256:897ef0811b227c8b1a269b29b9c1ebfb09c46f00d66834e2e8c6f19ea7f90f7d,4611 + pantry-tree: + size: 2067 + sha256: 7ced76ae95b51fa1669b4fcaeec3825b5cb8cf1f4e37c53d0bddf6234742eba8 + original: + hackage: cql-io-1.1.1 +- completed: + hackage: primitive-extras-0.10.1.1@sha256:47c4d211166bc31ebdb053f610e4b5387c01d00bde81840e59438469cef6c94e,2955 + pantry-tree: + size: 1096 + sha256: 55ee00adb4e2e6beedfb997b071b60014b28ce0b25fb946b1f4abfae9a5e01d1 + original: + hackage: primitive-extras-0.10.1.1 +- completed: + hackage: text-format-0.3.2@sha256:2a3fc17cf87120fcfdbca62a0da59759755549285841cdc1483081c35fb3d115,1814 + pantry-tree: + size: 1029 + sha256: 2db26ddb77184186e0d5b2b020bdfbeb044c168024767b1fa3691682ca618896 + original: + hackage: text-format-0.3.2 +- completed: + hackage: hex-0.2.0@sha256:197d2561d2e216c4ead035b4911dabc6e678ac6257cb71b64e324c822f6f9f5a,726 + pantry-tree: + size: 197 + sha256: 1e5aba0165fb8ffa93d1516a87026a59c245750ca5f2ed42bd53b8328620f98e + original: + hackage: hex-0.2.0 +- completed: + hackage: quickcheck-state-machine-0.7.1@sha256:575f16ece44b20f204730b7b5d77a1ed91b33f4a961a4e70932fc8d602082b10,6153 + pantry-tree: + size: 3022 + sha256: edb32e2c7ac3be15e0d110b762990192d993326779f440984e56de0be5e0f714 + original: + hackage: quickcheck-state-machine-0.7.1 +- completed: + hackage: servant-multipart-0.12.1@sha256:4b6a8c3f73d645e212f2a7a476f30a2ab7ed191945a3ff62154ab99d76dea7f0,1951 + pantry-tree: + size: 332 + sha256: 80f6033a74da5d7c6aded81c428d740a0bf6bfd49e13ce8cde68158abd5ff49f + original: + hackage: servant-multipart-0.12.1 +- completed: + name: HaskellNet-SSL + version: 0.3.4.2 + git: https://github.com/dpwright/HaskellNet-SSL + pantry-tree: + size: 786 + sha256: c6a64c9e64bc834842756be28eaac2d842f0dde3753542bfa0cfd87ae5cf0bc5 + commit: ca84ef29a93eaef7673fa58056cdd8dae1568d2d + original: + git: https://github.com/dpwright/HaskellNet-SSL + commit: ca84ef29a93eaef7673fa58056cdd8dae1568d2d +- completed: + hackage: mu-rpc-0.5.0.1@sha256:6ff07f30d3d8283c71852cb1fa952c9e34a7108b619ec4a92619a96835912f88,1391 + pantry-tree: + size: 445 + sha256: bce492cc34a5da696f53482020a216566c053e19091ec779a0b21e1899a74f13 + original: + hackage: mu-rpc-0.5.0.1 +- completed: + hackage: mu-optics-0.3.0.1@sha256:c3494c71c6300e6a0dcb77c9782481150956e912c1b47fccd69cbb795e461d52,1068 + pantry-tree: + size: 172 + sha256: 6f8275b8db1dce6136ebd2eb831495af39774d9560d8d07e60d5da09a5f3ed99 + original: + hackage: mu-optics-0.3.0.1 +- completed: + hackage: mu-avro-0.4.0.4@sha256:10e317c633c5152a26e89becba749456b76f70eb640d1c0b2ccdc0e45a7ef5da,2096 + pantry-tree: + size: 541 + sha256: 26fd2a714615b6c2c0459178fb5f350848ce64be5c33076c4ddaff9c74adb278 + original: + hackage: mu-avro-0.4.0.4 +- completed: + hackage: mu-protobuf-0.4.2.0@sha256:4787a2688abdda107e150736433b61448acdf0b71eb0c174232239b4c143f78b,2119 + pantry-tree: + size: 640 + sha256: ad3ec2fa09fea08c1c7c5181db7ed4440c030cc6c9dbc708a9a58155c13ca8fa + original: + hackage: mu-protobuf-0.4.2.0 +- completed: + hackage: mu-schema-0.3.1.2@sha256:c05e58de29d50376638d19dd3357cd3644d39f984664484f3568d5305b3034d9,1933 + pantry-tree: + size: 1061 + sha256: 07d5d0ab3fc6db8e7492311caacbd92f33a343fd173cb51d2915522b3aea8073 + original: + hackage: mu-schema-0.3.1.2 +- completed: + hackage: mu-grpc-server-0.5.0.0@sha256:c67bd7c5dcc87e11ec34ac07b4d18fb1f6de036f58db4176274e6826099fe0a8,2749 + pantry-tree: + size: 334 + sha256: e7bed965e015b625216ee54db107f1ecb313ffb6bf2f75898853253d96cf6762 + original: + hackage: mu-grpc-server-0.5.0.0 +- completed: + hackage: mu-grpc-client-0.4.0.1@sha256:b09dcf69f0650e0cfd86d6f67544a6350590574f4757f5ee459c57828c3a41ff,2079 + pantry-tree: + size: 562 + sha256: 94e32cdfdee230f090684804fee5ef254c6063f985b913c8efaadbe1dfceafef + original: + hackage: mu-grpc-client-0.4.0.1 +- completed: + hackage: mu-grpc-common-0.4.0.0@sha256:568b5879cd67c0bc0e956d53fb87552bb6d9a6287c5d1b09e2284ed5b04de418,1394 + pantry-tree: + size: 281 + sha256: 7e745ded1cb622178392ae2d5a6d5591af9743b58506de5ed2e17d7d698b0d18 + original: + hackage: mu-grpc-common-0.4.0.0 +- completed: + hackage: compendium-client-0.2.1.1@sha256:cd477438d507273b34b82581ade333921ae997c1618b48af0c1da2a4968623e0,1203 + pantry-tree: + size: 181 + sha256: 18996ce535e40483ca2e29397e606aae551552608f96a6a8cc647ce24e24e937 + original: + hackage: compendium-client-0.2.1.1 +- completed: + hackage: http2-grpc-types-0.5.0.0@sha256:4d34edc06a48496130f19245817a7cd7ea15c78ac8815570c3795ffc4503cf27,1445 + pantry-tree: + size: 405 + sha256: 3a1a94b87acd230b2f750f0077dc47177f37e46a2984b5764390207a83c4d5e4 + original: + hackage: http2-grpc-types-0.5.0.0 +- completed: + hackage: http2-grpc-proto3-wire-0.1.0.0@sha256:4f6c0d27048756155b82ebf7385a20cc8241c7bd854e96d1dd6a1827e75fa410,1504 + pantry-tree: + size: 341 + sha256: d07d5bb883860e3bf928c00312df133a4c195c99bb397865bd67f433f75387b8 + original: + hackage: http2-grpc-proto3-wire-0.1.0.0 +- completed: + hackage: warp-grpc-0.4.0.1@sha256:3859190e4fa23b944cf93ac691b3cec78c2adf4eaff6a4e8070c89fd17915add,1759 + pantry-tree: + size: 709 + sha256: f542ef3e7e03b9cd0b2c0e0c436ce4e68ab37f56195740639034cc3cd28a6b9f + original: + hackage: warp-grpc-0.4.0.1 +- completed: + hackage: proto3-wire-1.2.2@sha256:06cfbd240071099b01c78f90d540a6276e4b40626a97cae9e8668ace5d773864,2756 + pantry-tree: + size: 1009 + sha256: dd8a00722794fa6aee7e3d3fda5f10f518951664a7f8ae880c7d017599972c5e + original: + hackage: proto3-wire-1.2.2 +- completed: + hackage: parameterized-0.5.0.0@sha256:880717fbb958de1bac015f0a375ab6636f162a72483d987a11e305da6fac6c97,1969 + pantry-tree: + size: 1019 + sha256: 843aed822e03279edf00a2595dfb22038b306f4f0acd6984bd108024c5102f90 + original: + hackage: parameterized-0.5.0.0 +- completed: + name: http2-client + version: 0.10.0.1 + git: https://github.com/lucasdicioccio/http2-client + pantry-tree: + size: 1545 + sha256: d0b3ab62eee8ee4c0ddec7a90fea78090815a54884646ddcdc451ff51d7e262a + commit: 73f5975e18eda9d071aa5548fcea6b5a51e61769 + original: + git: https://github.com/lucasdicioccio/http2-client + commit: 73f5975e18eda9d071aa5548fcea6b5a51e61769 +- completed: + subdir: http2-client-grpc + name: http2-client-grpc + version: 0.8.0.0 + git: https://github.com/wireapp/http2-grpc-haskell + pantry-tree: + size: 455 + sha256: 5599a7b9b801d669e2063ffd4ab767bb8bbf12d20069de0cbd8862bca78d7e42 + commit: eea98418672626eafbace3181ca34bf44bee91c0 + original: + subdir: http2-client-grpc + git: https://github.com/wireapp/http2-grpc-haskell + commit: eea98418672626eafbace3181ca34bf44bee91c0 +- completed: + name: snappy + version: 0.2.0.2 + git: https://github.com/wireapp/snappy + pantry-tree: + size: 989 + sha256: ae7fdf1988910fa026279052e85ade0a99962a3e7812ace104797e12ead0cd1d + commit: b0e5c08af48911caecffa4fa6a3e74872018b258 + original: + git: https://github.com/wireapp/snappy + commit: b0e5c08af48911caecffa4fa6a3e74872018b258 +- completed: + subdir: x509-store + name: x509-store + version: 1.6.7 + git: https://github.com/vincenthz/hs-certificate + pantry-tree: + size: 398 + sha256: bf71c28417dcf76a8aef361fbc74abe78962c80e7e996a2515996fd44b2f6ba6 + commit: a899bda3d7666d25143be7be8f3105fc076703d9 + original: + subdir: x509-store + git: https://github.com/vincenthz/hs-certificate + commit: a899bda3d7666d25143be7be8f3105fc076703d9 +- completed: + hackage: polysemy-1.7.1.0@sha256:3ead7a332abd70b202920ed3bf2e36866de163f821e643adfdcc9d39867b8033,5977 + pantry-tree: + size: 4577 + sha256: 22f540602a4d5565d4d90bc6084eb4e578f1ed934917a4efd6b01f5b90f49fea + original: + hackage: polysemy-1.7.1.0 +- completed: + hackage: polysemy-plugin-0.4.2.0@sha256:1dbcb892bb866926994dadafeb93e76ae4a6625dc3ae9ca0f4f419ee85cb2f7b,3154 + pantry-tree: + size: 1229 + sha256: ee75425b00b0f1c80207c3c4d5df86a94d892de229b75fb23e0380ec2526a626 + original: + hackage: polysemy-plugin-0.4.2.0 +- completed: + hackage: polysemy-check-0.8.1.0@sha256:5cce3ae162d2f8d8f629397daa28ec5e425f72d357afeb4fe994e102425f2383,2648 + pantry-tree: + size: 1027 + sha256: bc880fb3405307ed251c02358d604979d8014040b78c2ffe6319076431f93509 + original: + hackage: polysemy-check-0.8.1.0 +- completed: + hackage: proto-lens-0.7.1.0@sha256:b151890929e71db5b8c2ad86cd758bcdf1dfcf25f34eb6c9ce19e3d7cd4eae39,2959 + pantry-tree: + size: 1857 + sha256: 2f1199d04d0588805e06faa0bf9a75898584d76243d4f945acbcc0e93913732e + original: + hackage: proto-lens-0.7.1.0 +- completed: + hackage: proto-lens-protoc-0.7.1.0@sha256:b0b92498af74fc4bb770d51f84405d591e73c085a0c1d9952dd3e14ce07b538f,2220 + pantry-tree: + size: 1219 + sha256: 1aaa82cb2823b33c9ea96608cc7ec245e54a0d14de8f18736be03220d8dbe683 + original: + hackage: proto-lens-protoc-0.7.1.0 +- completed: + hackage: proto-lens-runtime-0.7.0.1@sha256:703f327422b2e204f8ea13c5e178edd8ab42ccd01c7a5a89fcb1b37ab474c68a,3038 + pantry-tree: + size: 168 + sha256: 145cb9a15b73d45b07cb3f9f0716256b2ed9e27ac296268ce100a4f0e477e110 + original: + hackage: proto-lens-runtime-0.7.0.1 +- completed: + hackage: proto-lens-setup-0.4.0.5@sha256:ae4514963a6c20ad059bba427cd14b94c6007f614d797ebecae3c37f8bf0fa96,3108 + pantry-tree: + size: 235 + sha256: 14982fbc9ee0c6f9f9a59c2639b647613eb9c2cfa1d5b1b323077a15ae285ccf + original: + hackage: proto-lens-setup-0.4.0.5 +- completed: + hackage: tracing-0.0.7.2@sha256:25a531be1ffe4054085f2855fd5132be54aa2e6b31a730b26e2cb01bd96b22ea,1438 + pantry-tree: + size: 672 + sha256: b3059324bf8fea08874dd4f5518105f3edd6e469104242e652698f488a5227d5 + original: + hackage: tracing-0.0.7.2 +- completed: + hackage: ormolu-0.1.4.1@sha256:ed404eac6e4eb64da1ca5fb749e0f99907431a9633e6ba34e44d260e7d7728ba,6499 + pantry-tree: + size: 74141 + sha256: 86dffe835089c8029e99046a75e7350fae8b80266a352a7295f13a279a8e5363 + original: + hackage: ormolu-0.1.4.1 +- completed: + hackage: ghc-lib-parser-8.10.1.20200412@sha256:b0517bb150a02957d7180f131f5b94abd2a7f58a7d1532a012e71618282339c2,8751 + pantry-tree: + size: 19497 + sha256: b11275740480138dd1fce4a22a2aa8835cddfecaa8da58a153f130b4575f9df5 + original: + hackage: ghc-lib-parser-8.10.1.20200412@sha256:b0517bb150a02957d7180f131f5b94abd2a7f58a7d1532a012e71618282339c2,8751 +- completed: + hackage: headroom-0.4.2.0@sha256:ebaf701628054472de745fa57b33ddf1021b99a8e4de5f5b96f21fb296b27652,10873 + pantry-tree: + size: 15450 + sha256: cd772daa4d3ea56ca28764afd60186363bd92cbf69c0ba3c0a9c064507e79ecc + original: + hackage: headroom-0.4.2.0 +- completed: + hackage: implicit-hie-0.1.2.6@sha256:f50a908979a574a881f753c0f9a5224f023f438b30fdefc5b7fa01803b07a280,2998 + pantry-tree: + size: 844 + sha256: 87e1a41e292526d86b55668bca628cf917056d82001438dc6975e4f35cf5210d + original: + hackage: implicit-hie-0.1.2.6 +snapshots: +- completed: + size: 586296 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/18.yaml + sha256: 63539429076b7ebbab6daa7656cfb079393bf644971156dc349d7c0453694ac2 + original: lts-18.18 From 33f6f309c16108e6e411afecae3c0c4bf18d5116 Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Tue, 7 Dec 2021 12:03:02 +0100 Subject: [PATCH 03/63] ... --- stack.yaml | 3 +++ stack.yaml.lock | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/stack.yaml b/stack.yaml index 1b9189d08b..38c5aaded9 100644 --- a/stack.yaml +++ b/stack.yaml @@ -243,6 +243,9 @@ extra-deps: - polysemy-plugin-0.4.2.0 - polysemy-check-0.8.1.0 +# polysemy-check has this upper bound +- kind-generics-0.4.1.0 + # ad-hoc additions (on 2021-10-10) - proto-lens-0.7.1.0 - proto-lens-protoc-0.7.1.0 diff --git a/stack.yaml.lock b/stack.yaml.lock index d7c19e56ab..f39be0fa05 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -696,6 +696,13 @@ packages: sha256: bc880fb3405307ed251c02358d604979d8014040b78c2ffe6319076431f93509 original: hackage: polysemy-check-0.8.1.0 +- completed: + hackage: kind-generics-0.4.1.0@sha256:15e50867349de627c401af29f56b204dfb2ad2b12e83417132ffca3d5cd02462,1061 + pantry-tree: + size: 390 + sha256: 497a73c5243cd787c06b7b66258fccf6299e6a853fa44f050f72f0bf1967715f + original: + hackage: kind-generics-0.4.1.0 - completed: hackage: proto-lens-0.7.1.0@sha256:b151890929e71db5b8c2ad86cd758bcdf1dfcf25f34eb6c9ce19e3d7cd4eae39,2959 pantry-tree: From 84be2c130d164d216c00298d98ecb118cca33cd6 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 16:03:24 +0100 Subject: [PATCH 04/63] Upgrade nix and stack --- cabal.project | 6 +- cabal.project.freeze | 2256 +++++++++-------- dev-packages.nix | 26 +- libs/api-bot/api-bot.cabal | 45 +- libs/api-client/api-client.cabal | 45 +- libs/bilge/bilge.cabal | 45 +- libs/brig-types/brig-types.cabal | 86 +- libs/cargohold-types/cargohold-types.cabal | 45 +- libs/cassandra-util/cassandra-util.cabal | 45 +- .../deriving-swagger2/deriving-swagger2.cabal | 47 +- libs/dns-util/dns-util.cabal | 86 +- libs/extended/extended.cabal | 86 +- libs/galley-types/galley-types.cabal | 88 +- libs/gundeck-types/gundeck-types.cabal | 47 +- libs/hscim/hscim.cabal | 58 +- libs/imports/imports.cabal | 45 +- libs/metrics-core/metrics-core.cabal | 45 +- libs/metrics-wai/metrics-wai.cabal | 86 +- .../polysemy-wire-zoo/polysemy-wire-zoo.cabal | 45 +- libs/ropes/ropes.cabal | 45 +- .../schema-profunctor/schema-profunctor.cabal | 90 +- .../sodium-crypto-sign.cabal | 45 +- libs/ssl-util/ssl-util.cabal | 45 +- libs/tasty-cannon/tasty-cannon.cabal | 45 +- libs/types-common-aws/types-common-aws.cabal | 45 +- libs/types-common/types-common.cabal | 86 +- libs/wai-utilities/wai-utilities.cabal | 45 +- .../wire-api-federation.cabal | 86 +- libs/wire-api/wire-api.cabal | 129 +- libs/zauth/zauth.cabal | 127 +- nix/sources.json | 12 +- nix/sources.nix | 132 +- services/brig/brig.cabal | 250 +- services/cannon/cannon.cabal | 127 +- services/cargohold/cargohold.cabal | 129 +- services/federator/federator.cabal | 168 +- services/galley/galley.cabal | 250 +- services/gundeck/gundeck.cabal | 252 +- services/proxy/proxy.cabal | 86 +- services/spar/spar.cabal | 250 +- stack-deps.nix | 2 +- stack.yaml | 2 +- stack.yaml.lock | 6 +- tools/api-simulations/api-simulations.cabal | 127 +- tools/bonanza/bonanza.cabal | 209 +- tools/convert-to-cabal/shell.nix | 2 +- tools/db/auto-whitelist/auto-whitelist.cabal | 45 +- .../billing-team-member-backfill.cabal | 45 +- tools/db/find-undead/find-undead.cabal | 45 +- .../migrate-sso-feature-flag.cabal | 45 +- tools/db/move-team/move-team.cabal | 127 +- tools/db/repair-handles/repair-handles.cabal | 45 +- .../service-backfill/service-backfill.cabal | 45 +- tools/makedeb/makedeb.cabal | 86 +- tools/stern/stern.cabal | 86 +- 55 files changed, 5325 insertions(+), 1268 deletions(-) diff --git a/cabal.project b/cabal.project index 35f93fb100..7cd4f6077e 100644 --- a/cabal.project +++ b/cabal.project @@ -1,6 +1,6 @@ -- Generated by stackage-to-hackage -with-compiler: ghc-8.8.4 +with-compiler: ghc-8.10.7 packages: libs/api-bot/ @@ -140,7 +140,7 @@ source-repository-package source-repository-package type: git location: https://github.com/wireapp/saml2-web-sso - tag: 60398f375987b74d6b855b5d225e45dc3a96ac06 + tag: b761d352de12a411927a91729a5c27932d69ba9e source-repository-package type: git @@ -237,6 +237,8 @@ package rex ghc-options: -Werror package ropes ghc-options: -Werror +package saml2-web-sso + ghc-options: -Werror package schema-profunctor ghc-options: -Werror package service-backfill diff --git a/cabal.project.freeze b/cabal.project.freeze index 22013305b8..4f9dca799b 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -1,101 +1,107 @@ constraints: any.AC-Angle ==1.0, any.ALUT ==2.4.0.3, any.ANum ==0.2.0.2, - any.Allure ==0.9.5.0, + any.Agda ==2.6.2, + any.Allure ==0.10.3.0, + any.BNFC ==2.9.3, + any.BNFC-meta ==0.6.1, any.Boolean ==0.2.4, any.BoundedChan ==1.0.3.0, any.ChannelT ==0.0.0.7, any.Chart ==1.9.3, - any.Chart-diagrams ==1.9.3, - any.ChasingBottoms ==1.3.1.9, + any.ChasingBottoms ==1.3.1.11, any.Clipboard ==2.3.2.0, any.ClustalParser ==1.3.0, - any.Color ==0.1.4, - any.ConfigFile ==1.1.4, + any.Color ==0.3.3, any.DAV ==1.3.4, - any.DBFunctor ==0.1.1.1, - any.Decimal ==0.5.1, + any.DBFunctor ==0.1.2.1, + any.Decimal ==0.5.2, any.Diff ==0.4.0, any.ENIG ==0.0.1.0, any.Earley ==0.13.0.1, any.Ebnf2ps ==1.0.15, any.FenwickTree ==0.1.2.1, any.FindBin ==0.0.5, - any.FloatingHex ==0.4, + any.FloatingHex ==0.5, any.FontyFruity ==0.5.3.5, any.ForestStructures ==0.0.1.0, any.GLFW-b ==3.3.0.0, - any.GLURaw ==2.0.0.4, - any.GLUT ==2.7.0.15, + any.GLURaw ==2.0.0.5, + any.GLUT ==2.7.0.16, any.GenericPretty ==1.2.2, - any.Glob ==0.10.1, + any.Glob ==0.10.2, + any.H ==0.9.0.1, any.HCodecs ==0.5.2, any.HDBC ==2.4.0.3, any.HDBC-session ==0.1.2.0, any.HSlippyMap ==3.0.1, - any.HStringTemplate ==0.8.7, - any.HSvm ==0.1.1.3.22, - any.HTF ==0.14.0.3, - any.HTTP ==4000.3.15, - any.HUnit ==1.6.0.0, + any.HStringTemplate ==0.8.8, + any.HSvm ==0.1.1.3.25, + any.HTF ==0.14.0.6, + any.HTTP ==4000.3.16, + any.HUnit ==1.6.2.0, any.HUnit-approx ==1.1.1.1, - any.HaTeX ==3.22.2.0, - any.HaXml ==1.25.5, + any.HaTeX ==3.22.3.0, + any.HaXml ==1.25.7, any.HandsomeSoup ==0.4.2, any.HasBigDecimal ==0.1.1, - any.HaskellNet ==0.5.2, + any.HaskellNet ==0.6, HsOpenSSL -fast-bignum, - any.HsOpenSSL ==0.11.4.19, - any.HsOpenSSL-x509-system ==0.1.0.3, + any.HsOpenSSL ==0.11.7.2, + any.HsOpenSSL-x509-system ==0.1.0.4, any.HsYAML ==0.2.1.0, - any.HsYAML-aeson ==0.2.0.0, - any.IPv6Addr ==1.1.5, + any.HsYAML-aeson ==0.2.0.1, + any.IPv6Addr ==2.0.3, any.Imlib ==0.1.2, any.IntervalMap ==0.6.1.2, - any.JuicyPixels ==3.3.5, + any.JuicyPixels ==3.3.6, any.JuicyPixels-blurhash ==0.1.0.3, - any.JuicyPixels-extra ==0.4.1, + any.JuicyPixels-extra ==0.5.2, any.JuicyPixels-scale-dct ==0.1.2, - any.LambdaHack ==0.9.5.0, + any.LambdaHack ==0.10.3.0, any.LibZip ==1.0.1, any.List ==0.6.2, - any.ListLike ==4.7.2, + any.ListLike ==4.7.6, any.ListTree ==0.2.3, + any.MapWith ==0.2.0.0, any.MemoTrie ==0.6.10, - any.MissingH ==1.4.3.0, any.MonadPrompt ==1.0.0.5, - any.MonadRandom ==0.5.2, + any.MonadRandom ==0.5.3, any.MusicBrainz ==0.4.1, NineP -bytestring-in-base, any.NineP ==0.0.2.1, any.NumInstances ==1.4, - any.ObjectName ==1.1.0.1, + any.ObjectName ==1.1.0.2, any.OneTuple ==0.2.2.1, any.Only ==0.1, any.OpenAL ==1.7.0.5, any.OpenGL ==3.0.3.0, - any.OpenGLRaw ==3.3.4.0, + any.OpenGLRaw ==3.3.4.1, any.ParsecTools ==0.0.2.0, - any.PyF ==0.9.0.2, + any.PyF ==0.9.0.3, any.QuasiText ==0.1.2.6, - any.QuickCheck ==2.14, + QuickCheck -old-random, + any.QuickCheck ==2.14.2, any.RSA ==2.4.1, any.Ranged-sets ==0.4.0, - any.Rasterific ==0.7.5.2, + any.Rasterific ==0.7.5.4, + any.Rattus ==0.5.0.1, any.RefSerialize ==0.4.0, any.SHA ==1.6.4.4, - any.SVGFonts ==1.7.0.1, + any.STMonadTrans ==0.4.6, any.SafeSemaphore ==0.10.1, - any.ShellCheck ==0.7.1, - any.Spintax ==0.3.5, - any.StateVar ==1.2, + any.ShellCheck ==0.7.2, + any.Sit ==0.2021.1.18, + any.Spintax ==0.3.6, + any.StateVar ==1.2.2, + any.Stream ==0.4.7.2, any.TCache ==0.12.1, - any.Taxonomy ==2.1.0, + any.Taxonomy ==2.2.0, any.TypeCompose ==0.9.14, any.ViennaRNAParser ==1.3.3, - any.Win32 ==2.6.1.0, + any.Win32 ==2.6.2.1, any.Win32-notify ==0.3.0.3, - any.X11 ==1.9.2, + any.X11 ==1.10.2, any.X11-xft ==0.3.1, any.Xauth ==0.1, any.abstract-deque ==0.3, @@ -103,40 +109,44 @@ constraints: any.AC-Angle ==1.0, any.accuerr ==0.2.0.2, any.ace ==0.6, any.action-permutations ==0.0.0.1, - any.active ==0.2.0.14, - any.ad ==4.4, + any.ad ==4.4.1, any.adjunctions ==4.4, any.adler32 ==0.1.2.0, - any.advent-of-code-api ==0.2.7.0, + any.aern2-mp ==0.2.8.0, + any.aern2-real ==0.2.8.0, any.aeson ==1.4.7.1, any.aeson-attoparsec ==0.0.0, any.aeson-better-errors ==0.9.1.0, any.aeson-casing ==0.2.0.0, - any.aeson-combinators ==0.0.2.1, - any.aeson-compat ==0.3.9, + any.aeson-combinators ==0.0.5.0, + any.aeson-commit ==1.3, + any.aeson-compat ==0.3.10, any.aeson-default ==0.9.1.0, any.aeson-diff ==1.1.0.9, any.aeson-generic-compat ==0.0.1.3, any.aeson-lens ==0.5.0.0, - any.aeson-optics ==1.1.0.1, + any.aeson-optics ==1.1.1, any.aeson-picker ==0.1.0.5, - any.aeson-pretty ==0.8.8, - any.aeson-qq ==0.8.3, - any.aeson-schemas ==1.2.0, - any.aeson-utils ==0.3.0.2, + any.aeson-pretty ==0.8.9, + any.aeson-qq ==0.8.4, + any.aeson-schemas ==1.3.5, + any.aeson-typescript ==0.3.0.1, + any.aeson-with ==0.1.2.0, any.aeson-yak ==0.1.1.3, - any.aeson-yaml ==1.0.6.0, + any.aeson-yaml ==1.1.0.1, + any.agda2lagda ==0.2021.6.1, any.al ==0.1.4.2, any.alarmclock ==0.7.0.5, any.alerts ==0.1.2.0, - any.alex ==3.2.5, + any.alex ==3.2.6, + any.alex-meta ==0.3.0.13, any.alg ==0.2.13.1, any.algebraic-graphs ==0.5, any.almost-fix ==0.0.2, any.alsa-core ==0.5.0.1, any.alsa-mixer ==0.3.0, any.alsa-pcm ==0.6.1.1, - any.alsa-seq ==0.6.0.7, + any.alsa-seq ==0.6.0.8, any.alternative-vector ==0.0.0, any.amazonka-apigateway ==1.6.1, any.amazonka-application-autoscaling ==1.6.1, @@ -220,154 +230,158 @@ constraints: any.AC-Angle ==1.0, any.amazonka-waf ==1.6.1, any.amazonka-workspaces ==1.6.1, any.amazonka-xray ==1.6.1, - any.amqp ==0.20.0, - any.amqp-utils ==0.4.4.1, + any.amqp ==0.22.0, + any.amqp-utils ==0.6.3.2, any.annotated-wl-pprint ==0.7.0, - any.ansi-terminal ==0.10.3, + any.ansi-terminal ==0.11, any.ansi-wl-pprint ==0.6.9, - any.antiope-core ==7.5.1, - any.antiope-dynamodb ==7.5.1, - any.antiope-messages ==7.5.1, - any.antiope-s3 ==7.5.1, - any.antiope-sns ==7.5.1, - any.antiope-sqs ==7.5.1, - any.apecs ==0.9.2, + any.ap-normalize ==0.1.0.1, + any.apecs ==0.9.3, any.apecs-gloss ==0.2.4, - any.apecs-physics ==0.4.4, + any.apecs-physics ==0.4.5, any.api-field-json-th ==0.1.0.2, + any.api-maker ==0.1.0.0, any.app-settings ==0.2.0.12, any.appar ==0.1.8, any.appendmap ==0.1.5, + any.apply-refact ==0.9.3.0, any.apportionment ==0.0.0.3, - any.approximate ==0.3.2, + any.approximate ==0.3.5, + any.approximate-equality ==1.1.0.2, any.arbor-lru-cache ==0.1.1.1, - any.arithmoi ==0.10.0.0, + any.arithmoi ==0.12.0.1, any.array-memoize ==0.6.0, any.arrow-extras ==0.1.0.1, - any.ascii ==1.0.0.2, - any.ascii-case ==1.0.0.2, - any.ascii-char ==1.0.0.2, - any.ascii-group ==1.0.0.2, - any.ascii-predicates ==1.0.0.2, + any.arrows ==0.4.4.2, + any.ascii ==1.0.1.6, + any.ascii-case ==1.0.0.8, + any.ascii-char ==1.0.0.12, + any.ascii-group ==1.0.0.8, + any.ascii-predicates ==1.0.0.6, any.ascii-progress ==0.3.3.0, - any.ascii-superset ==1.0.0.2, - any.ascii-th ==1.0.0.2, + any.ascii-superset ==1.0.1.8, + any.ascii-th ==1.0.0.6, any.asciidiagram ==1.3.3.3, any.asn1-encoding ==0.9.6, any.asn1-parse ==0.9.5, any.asn1-types ==0.3.4, any.assert-failure ==0.1.2.5, any.assoc ==1.0.2, - any.astro ==0.4.2.1, - any.async ==2.2.2, + any.astro ==0.4.3.0, + any.async ==2.2.4, any.async-extra ==0.2.0.0, + any.async-pool ==0.9.1, any.async-refresh ==0.3.0.0, any.async-refresh-tokens ==0.4.0.0, - any.async-timer ==0.2.0.0, any.atom-basic ==0.2.5, - any.atomic-primops ==0.8.3, + any.atomic-primops ==0.8.4, any.atomic-write ==0.2.0.7, - any.attoparsec ==0.13.2.4, + any.attoparsec ==0.13.2.5, any.attoparsec-base64 ==0.0.0, any.attoparsec-binary ==0.2, any.attoparsec-expr ==0.1.1.2, - any.attoparsec-iso8601 ==1.0.1.0, + any.attoparsec-iso8601 ==1.0.2.0, any.attoparsec-path ==0.0.0.1, any.audacity ==0.0.2, - any.aur ==7.0.4, - any.aura ==3.1.9, + any.aur ==7.0.7, + any.aura ==3.2.5, any.authenticate ==1.3.5, any.authenticate-oauth ==1.6.0.1, - any.auto ==0.4.3.1, any.auto-update ==0.1.6, - any.autoexporter ==1.1.18, - any.avers ==0.0.17.1, + any.autoexporter ==1.1.20, any.avro ==0.5.2.0, - any.aws-cloudfront-signed-cookies ==0.2.0.6, - any.bank-holidays-england ==0.2.0.5, - any.base-compat ==0.11.1, - any.base-compat-batteries ==0.11.1, - any.base-noprelude ==4.13.0.0, - any.base-orphans ==0.8.2, - any.base-prelude ==1.3, + any.aws-cloudfront-signed-cookies ==0.2.0.10, + any.aws-xray-client ==0.1.0.1, + any.aws-xray-client-wai ==0.1.0.1, + any.backprop ==0.2.6.4, + any.backtracking ==0.1.0, + any.bank-holidays-england ==0.2.0.6, + any.barbies ==2.0.3.0, + any.base-compat ==0.11.2, + any.base-compat-batteries ==0.11.2, + any.base-orphans ==0.8.6, + any.base-prelude ==1.4, any.base-unicode-symbols ==0.2.4.2, - any.base16 ==0.2.1.0, - any.base16-bytestring ==0.1.1.7, - any.base16-lens ==0.1.2.0, - any.base32 ==0.1.1.2, - any.base32-lens ==0.1.0.0, + any.base16 ==0.3.0.2, + any.base16-bytestring ==1.0.2.0, + any.base16-lens ==0.1.3.2, + any.base32 ==0.2.1.0, + any.base32-lens ==0.1.1.1, any.base32string ==0.9.1, any.base58-bytestring ==0.1.0, any.base58string ==0.10.0, - any.base64 ==0.4.2.2, - any.base64-bytestring ==1.0.0.3, + any.base64 ==0.4.2.3, + any.base64-bytestring ==1.1.0.0, any.base64-bytestring-type ==1.0.1, - any.base64-lens ==0.3.0, + any.base64-lens ==0.3.1, any.base64-string ==0.2, - any.basement ==0.0.11, + any.basement ==0.0.12, any.basic-prelude ==0.7.0, any.bazel-runfiles ==0.12, any.bbdb ==0.8, + any.bcp47 ==0.2.0.4, + any.bcp47-orphans ==0.1.0.4, any.bcrypt ==0.0.11, - any.bech32 ==1.0.2, + any.bech32 ==1.1.2, any.bech32-th ==1.0.2, any.bench ==1.0.12, - any.benchpress ==0.2.2.14, + any.benchpress ==0.2.2.18, any.between ==0.11.0.0, any.bibtex ==0.1.0.6, - any.bifunctors ==5.5.7, + any.bifunctors ==5.5.11, any.bimap ==0.4.0, any.bimap-server ==0.1.0.1, any.bimaps ==0.1.0.2, - any.bin ==0.1, + any.bin ==0.1.1, any.binary-conduit ==1.3.1, any.binary-ext ==2.0.4, any.binary-ieee754 ==0.1.0.0, + any.binary-instances ==1.0.2, any.binary-list ==1.1.1.2, any.binary-orphans ==1.0.1, - any.binary-parser ==0.5.6, + any.binary-parser ==0.5.7, any.binary-parsers ==0.2.4.0, - any.binary-search ==1.0.0.3, + any.binary-search ==2.0.0, any.binary-shared ==0.8.3, - any.binary-tagged ==0.3, + any.binary-tagged ==0.3.1, any.bindings-DSL ==1.0.25, any.bindings-GLFW ==3.3.2.0, any.bindings-libzip ==1.0.1, any.bindings-uname ==0.1, any.bins ==0.1.2.0, any.bitarray ==0.0.1.1, - any.bits ==0.5.2, + any.bits ==0.5.3, any.bits-extra ==0.0.2.0, any.bitset-word8 ==0.1.1.2, - any.bitvec ==1.0.3.0, + any.bitvec ==1.1.1.0, + any.bitwise-enum ==1.0.1.0, any.blake2 ==0.3.0, - any.blanks ==0.3.0, + any.blanks ==0.5.0, any.blas-carray ==0.1.0.1, - any.blas-comfort-array ==0.0.0.2, + any.blas-comfort-array ==0.0.0.3, any.blas-ffi ==0.1, any.blaze-bootstrap ==0.1.0.1, - any.blaze-builder ==0.4.1.0, + any.blaze-builder ==0.4.2.2, any.blaze-html ==0.9.1.2, - any.blaze-markup ==0.8.2.7, + any.blaze-markup ==0.8.2.8, any.blaze-svg ==0.3.6.1, - any.blaze-textual ==0.2.1.0, + any.blaze-textual ==0.2.2.1, any.bmp ==1.2.6.3, + any.board-games ==0.3, any.boltzmann-samplers ==0.1.1.0, any.boolean-like ==0.1.1.0, - any.boolean-normal-forms ==0.0.1.1, any.boolsimplifier ==0.1.8, any.boots ==0.2.0.1, any.bordacount ==0.1.0.0, - any.boring ==0.1.3, - any.both ==0.1.1.1, - any.bound ==2.0.1, + any.boring ==0.2, + any.both ==0.1.1.2, + any.bound ==2.0.4, any.bounded-queue ==1.0.0, any.boundingboxes ==0.2.3, any.bower-json ==1.0.0.1, any.boxes ==0.1.5, brick +demos, - any.brick ==0.52.1, - any.brittany ==0.12.1.1, + any.brick ==0.62, any.broadcast-chan ==0.2.1.1, any.bsb-http-chunked ==0.0.0.4, bson -_old-network, @@ -375,65 +389,82 @@ constraints: any.AC-Angle ==1.0, any.btrfs ==0.2.0.0, any.buffer-builder ==0.2.4.7, any.buffer-pipe ==0.0, - any.bugsnag-hs ==0.1.0.3, + any.bugsnag-haskell ==0.0.4.1, + any.bugsnag-hs ==0.2.0.7, + any.bugzilla-redhat ==0.3.3, + any.burrito ==1.2.0.3, any.butcher ==1.3.3.2, + any.buttplug-hs-core ==0.1.0.1, any.bv ==0.5, any.bv-little ==1.1.1, - any.byte-count-reader ==0.10.1.1, + any.byte-count-reader ==0.10.1.7, any.byte-order ==0.1.2.0, any.byteable ==0.1.1, any.bytedump ==1.0, any.byteorder ==1.0.4, - any.bytes ==0.17, + any.bytes ==0.17.1, any.byteset ==0.1.1.0, any.bytestring-builder ==0.10.8.2.0, any.bytestring-conversion ==0.3.1, - any.bytestring-lexing ==0.5.0.2, + any.bytestring-lexing ==0.5.0.8, any.bytestring-mmap ==0.2.2, - any.bytestring-strict-builder ==0.4.5.3, + any.bytestring-strict-builder ==0.4.5.4, any.bytestring-to-vector ==0.3.0.1, - any.bytestring-tree-builder ==0.2.7.3, - any.bz2 ==1.0.0.1, + any.bytestring-tree-builder ==0.2.7.9, + bz2 -with-bzlib, + any.bz2 ==1.0.1.0, + any.bzlib ==0.5.1.0, any.bzlib-conduit ==0.3.0.2, - any.c2hs ==0.28.6, + any.c-enum ==0.1.0.1, + any.c-struct ==0.1.0.1, + any.c14n ==0.1.0.1, + any.c2hs ==0.28.8, any.ca-province-codes ==1.0.0.0, - any.cabal-appimage ==0.3.0.0, - any.cabal-debian ==5.0.3, - any.cabal-doctest ==1.0.8, + any.cabal-appimage ==0.3.0.3, + any.cabal-clean ==0.1.20210924, + any.cabal-debian ==5.1, + any.cabal-doctest ==1.0.9, + any.cabal-file ==0.1.1, + any.cabal-flatpak ==0.1.0.2, + any.cabal-plan ==0.7.2.0, cabal-rpm -old-locale, - any.cabal-rpm ==2.0.6, - any.cabal2nix ==2.15.1, - any.cabal2spec ==2.5, + any.cabal-rpm ==2.0.10, + any.cabal2nix ==2.17.0, + any.cabal2spec ==2.6.2, any.cache ==0.1.3.0, + any.cached-json-file ==0.1.0, any.cacophony ==0.10.1, any.calendar-recycling ==0.0.0.1, - any.call-stack ==0.2.0, + any.call-stack ==0.3.0, any.can-i-haz ==0.3.1.0, + any.capability ==0.4.0.0, any.cardano-coin-selection ==1.0.1, any.carray ==0.1.6.8, any.casa-client ==0.0.1, - any.casa-types ==0.0.1, + any.casa-types ==0.0.2, any.case-insensitive ==1.2.1.0, any.cased ==0.1.0.0, - any.cases ==0.1.4, + any.cases ==0.1.4.1, any.casing ==0.1.4.1, cassava -bytestring--lt-0_10_4, any.cassava ==0.5.2.0, - any.cassava-conduit ==0.5.1, - any.cassava-megaparsec ==2.0.2, + any.cassava-conduit ==0.6.0, + any.cassava-megaparsec ==2.0.4, any.cast ==0.1.0.2, any.category ==0.2.5.0, - any.cayley-client ==0.4.13, - any.cborg ==0.2.4.0, - any.cborg-json ==0.2.2.0, - any.cereal ==0.5.8.1, + any.cayley-client ==0.4.16, + any.cborg ==0.2.6.0, + any.cborg-json ==0.2.3.0, + any.cdar-mBound ==0.1.0.4, + any.cereal ==0.5.8.2, any.cereal-conduit ==0.8.0, any.cereal-text ==0.1.0.2, any.cereal-vector ==0.2.0.1, any.cfenv ==0.1.0.0, + any.cgi ==3001.5.0.0, any.chan ==0.0.4.1, - any.character-cases ==0.1.0.4, - any.charset ==0.3.7.1, + any.character-cases ==0.1.0.6, + any.charset ==0.3.9, any.charsetdetect-ae ==1.1.0.4, any.chaselev-deque ==0.5.0.5, any.cheapskate ==0.1.1.2, @@ -441,8 +472,8 @@ constraints: any.AC-Angle ==1.0, any.cheapskate-lucid ==0.1.0.0, any.checkers ==0.5.6, any.checksum ==0.0, - any.chimera ==0.3.1.0, - any.chiphunk ==0.1.2.1, + any.chimera ==0.3.2.0, + any.chiphunk ==0.1.4.0, any.choice ==0.2.2, any.chronologique ==0.3.1.3, any.chronos ==1.1.1, @@ -453,100 +484,105 @@ constraints: any.AC-Angle ==1.0, any.cipher-des ==0.0.6, any.cipher-rc4 ==0.1.4, any.circle-packing ==0.1.0.6, - any.clash-ghc ==1.2.4, - any.clash-lib ==1.2.4, - any.clash-prelude ==1.2.4, + any.circular ==0.4.0.1, + any.citeproc ==0.4.0.1, + any.clash-ghc ==1.4.6, + any.clash-lib ==1.4.6, + any.clash-prelude ==1.4.6, any.classy-prelude ==1.5.0, any.classy-prelude-conduit ==1.5.0, - any.classy-prelude-yesod ==1.5.0, any.clay ==0.13.3, any.clientsession ==0.9.1.2, any.climb ==0.3.3, - any.clock ==0.8, - any.clock-extras ==0.1.0.2, + any.clock ==0.8.2, + any.closed ==0.2.0.1, any.clumpiness ==0.17.0.2, any.cmark ==0.6, - any.cmark-gfm ==0.2.1, + any.cmark-gfm ==0.2.2, any.cmark-lucid ==0.1.0.0, - any.cmdargs ==0.10.20, - any.co-log ==0.4.0.1, - any.co-log-concurrent ==0.5.0.0, + any.cmdargs ==0.10.21, + any.co-log-concurrent ==0.5.1.0, any.co-log-core ==0.2.1.1, - any.co-log-polysemy ==0.0.1.2, - any.code-page ==0.2, + any.code-page ==0.2.1, any.codec-beam ==0.2.0, - any.codec-rpm ==0.2.2, - any.coercible-utils ==0.1.0, + any.collect-errors ==0.1.5.0, any.colorful-monoids ==0.2.1.3, any.colorize-haskell ==1.0.1, - any.colour ==2.3.5, - any.colourista ==0.1.0.0, + any.colour ==2.3.6, any.combinatorial ==0.1.0.1, - any.comfort-array ==0.4, + any.comfort-array ==0.4.1, any.comfort-graph ==0.0.3.1, + any.commonmark ==0.2.1.1, + any.commonmark-extensions ==0.2.2.1, + any.commonmark-pandoc ==0.2.1.1, any.commutative ==0.0.2, - any.comonad ==5.0.6, + any.comonad ==5.0.8, + any.comonad-extras ==4.0.1, any.compactmap ==0.1.4.2.1, - any.compensated ==0.8.1, + any.compdata ==0.12.1, + any.compensated ==0.8.3, any.compiler-warnings ==0.1.0, any.composable-associations ==0.1.0.0, - any.composable-associations-aeson ==0.1.0.0, - any.composition ==1.0.2.1, + any.composable-associations-aeson ==0.1.0.1, + any.composition ==1.0.2.2, any.composition-extra ==2.0.0, any.concise ==0.1.0.1, - any.concurrency ==1.11.0.0, + any.concurrency ==1.11.0.2, any.concurrent-extra ==0.7.0.12, any.concurrent-output ==1.10.12, any.concurrent-split ==0.0.1.1, any.concurrent-supply ==0.1.8, any.cond ==0.4.1.1, - any.conduit ==1.3.2.1, + any.conduino ==0.2.2.0, + any.conduit ==1.3.4.2, any.conduit-algorithms ==0.0.11.0, any.conduit-combinators ==1.3.0, any.conduit-concurrent-map ==0.1.1, any.conduit-extra ==1.3.5, any.conduit-parse ==0.2.1.0, any.conduit-zstd ==0.0.2.0, - any.conferer ==0.4.1.1, - any.conferer-hspec ==0.4.0.1, - any.conferer-source-json ==0.4.0.1, - any.conferer-warp ==0.4.0.1, + any.conferer ==1.1.0.0, + any.conferer-aeson ==1.1.0.1, + any.conferer-hspec ==1.1.0.0, + any.conferer-warp ==1.1.0.0, any.config-ini ==0.2.4.0, any.configurator ==0.3.0.0, any.configurator-export ==0.1.0.1, - any.configurator-pg ==0.2.4, + any.configurator-pg ==0.2.5, any.connection ==0.3.1, any.connection-pool ==0.2.2, any.console-style ==0.0.2.1, any.constraint ==0.1.4.0, any.constraint-tuples ==0.1.2, - any.constraints ==0.12, - any.contravariant ==1.5.2, - any.contravariant-extras ==0.3.5.2, + any.constraints ==0.13.2, + any.constraints-extras ==0.3.2.0, + any.construct ==0.3.0.2, + any.contravariant ==1.5.5, + any.contravariant-extras ==0.3.5.3, any.control-bool ==0.2.1, + any.control-dsl ==0.2.1.3, any.control-monad-free ==0.6.2, any.control-monad-omega ==0.3.2, any.convertible ==1.1.1.0, any.cookie ==0.4.5, - any.core-data ==0.2.1.8, - any.core-program ==0.2.4.5, - any.core-text ==0.2.3.6, + any.core-data ==0.2.1.11, + any.core-program ==0.2.12.0, + any.core-text ==0.3.5.0, any.countable ==1.0, - any.cpio-conduit ==0.7.0, + any.country ==0.2.1, any.cpphs ==1.20.9.1, any.cprng-aes ==0.6.1, any.cpu ==0.1.2, - any.cpuinfo ==0.1.0.1, - any.cql ==4.0.2, + any.cpuinfo ==0.1.0.2, + any.cql ==4.0.3, any.cql-io ==1.1.1, any.cql-io-tinylog ==0.1.0, - any.crackNum ==2.3, + any.crackNum ==3.1, any.crc32c ==0.0.0, any.credential-store ==0.1.2, - any.criterion ==1.5.6.2, - any.criterion-measurement ==0.1.2.0, + any.criterion ==1.5.11.0, + any.criterion-measurement ==0.1.3.0, any.cron ==0.7.0, - any.crypt-sha512 ==0, any.crypto-api ==0.13.3, any.crypto-cipher-types ==0.0.9, any.crypto-enigma ==0.1.1.6, @@ -555,21 +591,19 @@ constraints: any.AC-Angle ==1.0, any.crypto-pubkey-types ==0.4.3, any.crypto-random ==0.0.9, any.crypto-random-api ==0.2.0, - any.cryptocompare ==0.1.1, any.cryptohash ==0.11.9, any.cryptohash-cryptoapi ==0.1.4, - any.cryptohash-md5 ==0.11.100.1, - any.cryptohash-sha1 ==0.11.100.1, - any.cryptohash-sha256 ==0.11.101.0, - any.cryptohash-sha512 ==0.11.100.1, - any.cryptonite ==0.28, + any.cryptohash-md5 ==0.11.101.0, + any.cryptohash-sha1 ==0.11.101.0, + any.cryptohash-sha256 ==0.11.102.1, + any.cryptohash-sha512 ==0.11.101.0, + any.cryptonite ==0.29, any.cryptonite-conduit ==0.2.2, any.cryptonite-openssl ==0.7, any.csp ==1.4.0, any.css-syntax ==0.1.0.0, any.css-text ==0.1.3.0, any.csv ==0.1.2, - any.csv-conduit ==0.7.1.0, any.ctrie ==0.2, any.cubicbezier ==0.6.0.6, any.cubicspline ==0.1.2, @@ -586,17 +620,18 @@ constraints: any.AC-Angle ==1.0, any.cursor-gen ==0.3.0.0, any.cutter ==0.0, any.cyclotomic ==1.1.1, - any.czipwith ==1.0.1.3, + any.czipwith ==1.0.1.4, any.d10 ==0.2.1.6, any.data-accessor ==0.2.3, any.data-accessor-mtl ==0.2.0.4, + any.data-accessor-template ==0.2.1.16, any.data-accessor-transformers ==0.2.1.7, - any.data-ascii ==1.0.0.2, + any.data-ascii ==1.0.0.6, any.data-binary-ieee754 ==0.4.4, any.data-bword ==0.1.0.1, any.data-checked ==0.3, any.data-clist ==0.1.2.3, - any.data-compat ==0.1.0.2, + any.data-compat ==0.1.0.3, any.data-default ==0.7.1.1, any.data-default-class ==0.1.2.0, any.data-default-instances-containers ==0.0.1, @@ -605,112 +640,114 @@ constraints: any.AC-Angle ==1.0, any.data-diverse ==4.7.0.0, any.data-dword ==0.3.2, any.data-endian ==0.1.1, - any.data-fix ==0.2.1, - any.data-forest ==0.1.0.8, - any.data-has ==0.3.0.0, - any.data-interval ==2.0.1, + any.data-fix ==0.3.2, + any.data-forest ==0.1.0.9, + any.data-has ==0.4.0.0, + any.data-hash ==0.2.0.1, + any.data-interval ==2.1.1, any.data-inttrie ==0.1.4, - any.data-lens-light ==0.1.2.2, + any.data-lens-light ==0.1.2.3, any.data-memocombinators ==0.5.1, any.data-msgpack ==0.0.13, any.data-msgpack-types ==0.0.3, - any.data-or ==1.0.0.5, + any.data-or ==1.0.0.7, any.data-ordlist ==0.4.7.0, any.data-ref ==0.0.2, - any.data-reify ==0.6.1, - any.data-serializer ==0.3.4.1, + any.data-reify ==0.6.3, + any.data-serializer ==0.3.5, any.data-textual ==0.3.0.3, any.data-timeout ==0.3.1, - any.data-tree-print ==0.1.0.2, any.datadog ==0.2.5.0, any.dataurl ==0.1.0.0, - any.dbus ==1.2.16, + any.dbus ==1.2.17, any.dbus-hslogger ==0.1.0.1, any.debian ==4.0.2, - any.debian-build ==0.10.2.0, + any.debian-build ==0.10.2.1, any.debug-trace-var ==0.2.0, - any.dec ==0.0.3, - any.declarative ==0.5.3, + any.dec ==0.0.4, + any.declarative ==0.5.4, any.deepseq-generics ==0.2.0.0, any.deepseq-instances ==0.1.0.1, - any.deferred-folds ==0.9.10.1, - any.dejafu ==2.3.0.1, + any.deferred-folds ==0.9.17, + any.dejafu ==2.4.0.3, any.dense-linear-algebra ==0.1.0.0, - any.depq ==0.4.1.0, - any.deque ==0.4.3, + any.dependent-map ==0.4.0.0, + any.dependent-sum ==0.7.1.0, + any.dependent-sum-template ==0.1.0.3, + any.depq ==0.4.2, + any.deque ==0.4.4, + any.derive-topdown ==0.0.2.2, any.deriveJsonNoPrefix ==0.1.0.1, any.deriving-aeson ==0.2.5, - any.deriving-compat ==0.5.9, - any.derulo ==1.0.9, - any.detour-via-sci ==1.0.0, - any.dhall ==1.32.0, - any.dhall-bash ==1.0.30, - any.dhall-json ==1.6.4, - any.dhall-lsp-server ==1.0.8, - any.dhall-yaml ==1.1.0, + any.deriving-compat ==0.5.10, + any.derulo ==1.0.10, + any.dhall ==1.39.0, + any.dhall-bash ==1.0.37, + any.dhall-json ==1.7.7, + any.dhall-lsp-server ==1.0.16, + any.dhall-yaml ==1.2.7, any.di-core ==1.0.4, any.di-monad ==1.3.1, - any.diagrams ==1.4, - any.diagrams-contrib ==1.4.4, - any.diagrams-core ==1.4.2, - any.diagrams-lib ==1.4.3, - any.diagrams-postscript ==1.5, - any.diagrams-rasterific ==1.4.2, - any.diagrams-solve ==0.1.2, - any.diagrams-svg ==1.4.3, - any.dialogflow-fulfillment ==0.1.1.3, + any.diagrams-solve ==0.1.3, + any.dialogflow-fulfillment ==0.1.1.4, any.dictionary-sharing ==0.1.0.0, - any.digest ==0.0.1.2, + any.digest ==0.0.1.3, any.digits ==0.3.1, - any.dimensional ==1.3, + any.dimensional ==1.4, + any.direct-sqlite ==2.3.26, any.directory-tree ==0.12.1, + any.dirichlet ==0.1.0.5, any.discount ==0.1.1, any.disk-free-space ==0.1.0.1, any.distributed-closure ==0.4.2.0, - any.distribution-nixpkgs ==1.3.1, + any.distribution-nixpkgs ==1.5.0, any.distribution-opensuse ==1.1.1, - any.distributive ==0.6.2, - any.dl-fedora ==0.7.5, - any.dlist ==0.8.0.8, + any.distributive ==0.6.2.1, + any.dl-fedora ==0.9.2, + any.dlist ==1.0, any.dlist-instances ==0.1.1.1, any.dlist-nonempty ==0.1.1, any.dns ==4.0.1, any.do-list ==1.0.1, any.do-notation ==0.1.0.2, any.dockerfile ==0.2.0, - any.doclayout ==0.3, - any.doctemplates ==0.8.2, - any.doctest ==0.16.3, + any.doclayout ==0.3.1.1, + any.doctemplates ==0.9, + any.doctest ==0.17, any.doctest-discover ==0.2.0.0, - any.doctest-driver-gen ==0.3.0.2, + any.doctest-driver-gen ==0.3.0.5, + any.doctest-exitcode-stdio ==0.0, + any.doctest-extract ==0.1, + any.doctest-lib ==0.1, any.doldol ==0.4.1.2, + any.dot ==0.3, any.dotenv ==0.8.0.7, any.dotgen ==0.4.3, any.dotnet-timespan ==0.0.1.0, any.double-conversion ==2.0.2.0, any.download ==0.3.2.7, + any.download-curl ==0.1.4, any.drinkery ==0.4, any.dsp ==0.2.5.1, any.dual ==0.1.1.1, - any.dual-tree ==0.2.2.1, any.dublincore-xml-conduit ==0.1.0.2, any.dunai ==0.7.0, - any.duration ==0.1.0.0, + any.duration ==0.2.0.0, any.dvorak ==0.1.0.0, any.dynamic-state ==0.3.1, - any.dyre ==0.8.12, + any.dyre ==0.9.1, any.eap ==0.9.0.2, any.earcut ==0.1.0.4, any.easy-file ==0.2.2, - any.echo ==0.1.3, + any.echo ==0.1.4, any.ecstasy ==0.2.1.0, any.ed25519 ==0.0.5.0, any.edit-distance ==0.2.2.1, any.edit-distance-vector ==1.0.0.4, any.editor-open ==0.6.0.0, - any.egison ==4.0.3, - any.egison-pattern-src ==0.2.1.0, - any.egison-pattern-src-th-mode ==0.2.1.1, + any.egison ==4.1.2, + any.egison-pattern-src ==0.2.1.2, + any.egison-pattern-src-th-mode ==0.2.1.2, any.either ==5.0.1.1, any.either-both ==0.1.1.1, any.either-unwrap ==1.1, @@ -720,121 +757,139 @@ constraints: any.AC-Angle ==1.0, any.ekg-statsd ==0.2.5.0, any.elerea ==2.9.0, any.elf ==0.30, - any.eliminators ==0.6, + any.eliminators ==0.7, any.elm-bridge ==0.6.1, any.elm-core-sources ==1.0.0, any.elm-export ==0.6.0.1, - any.elm2nix ==0.2, - any.emacs-module ==0.1.1, - any.email-validate ==2.3.2.13, - any.emojis ==0.1, + any.elm2nix ==0.2.1, + any.elynx ==0.5.1.1, + any.elynx-markov ==0.5.1.1, + any.elynx-nexus ==0.5.1.1, + any.elynx-seq ==0.5.1.1, + any.elynx-tools ==0.5.1.1, + any.elynx-tree ==0.5.1.1, + any.email-validate ==2.3.2.15, + any.emd ==0.2.0.0, + any.emojis ==0.1.2, any.enclosed-exceptions ==1.0.3, - any.entropy ==0.4.1.6, + any.entropy ==0.4.1.7, any.enum-subset-generate ==0.1.0.0, any.enummapset ==0.6.0.3, any.enumset ==0.0.5, any.envelope ==0.2.2.0, + any.envparse ==0.4.1, any.envy ==2.1.0.0, any.epub-metadata ==4.5, - any.eq ==4.2, + any.eq ==4.2.1, any.equal-files ==0.0.5.3, - any.equational-reasoning ==0.6.0.3, + any.equational-reasoning ==0.7.0.1, + any.equivalence ==0.3.5, any.erf ==2.0.0.0, + any.error-or ==0.1.2.0, + any.error-or-utils ==0.1.1, any.errors ==2.3.0, any.errors-ext ==0.4.2, - any.ersatz ==0.4.8, - any.esqueleto ==3.3.3.3, - any.essence-of-live-coding ==0.1.0.3, - any.essence-of-live-coding-gloss ==0.1.0.3, - any.essence-of-live-coding-pulse ==0.1.0.3, - any.essence-of-live-coding-quickcheck ==0.1.0.3, + any.ersatz ==0.4.10, + any.esqueleto ==3.5.3.0, + any.essence-of-live-coding ==0.2.5, + any.essence-of-live-coding-gloss ==0.2.5, + any.essence-of-live-coding-pulse ==0.2.5, + any.essence-of-live-coding-quickcheck ==0.2.5, any.etc ==0.4.1.0, + any.eve ==0.1.9.0, any.event-list ==0.1.2, any.eventful-core ==0.2.0, any.eventful-test-helpers ==0.2.0, any.eventstore ==1.4.1, any.every ==0.0.1, - any.exact-combinatorics ==0.2.0.9, + any.exact-combinatorics ==0.2.0.11, any.exact-pi ==0.5.0.1, - any.exception-hierarchy ==0.1.0.3, + any.exception-hierarchy ==0.1.0.4, any.exception-mtl ==0.4.0.1, - any.exception-transformers ==0.4.0.9, + any.exception-transformers ==0.4.0.10, + any.exception-via ==0.1.0.0, any.exceptions ==0.10.4, any.executable-path ==0.0.3.1, any.exit-codes ==1.0.0, any.exomizer ==1.0.0, - any.exp-pairs ==0.2.0.0, + any.exp-pairs ==0.2.1.0, + any.experimenter ==0.1.0.12, any.expiring-cache-map ==0.0.6.1, any.explicit-exception ==0.1.10, - any.express ==0.1.3, + any.express ==0.1.16, any.extended-reals ==0.2.4.0, any.extensible-effects ==5.0.0.1, any.extensible-exceptions ==0.1.1.4, - any.extra ==1.7.8, + any.extra ==1.7.9, any.extractable-singleton ==0.0.1, - any.extrapolate ==0.4.2, + any.extrapolate ==0.4.6, any.fail ==4.9.0.0, any.failable ==1.2.4.0, - any.fakedata ==0.6.1, - any.farmhash ==0.1.0.5, - any.fast-digits ==0.3.0.0, - any.fast-logger ==3.0.1, + any.fakedata ==0.8.0, + any.fakedata-parser ==0.1.0.0, + any.fakefs ==0.3.0.2, + any.fakepull ==0.3.0.2, + any.faktory ==1.0.3.1, + any.fast-digits ==0.3.1.0, + any.fast-logger ==3.0.5, any.fast-math ==1.0.2, any.fb ==2.1.1, + any.fclabels ==2.0.5.1, any.feature-flags ==0.1.0.1, any.fedora-dists ==1.1.2, any.fedora-haskell-tools ==0.9, - any.feed ==1.3.0.1, - any.fft ==0.1.8.6, + any.feed ==1.3.2.0, + any.fft ==0.1.8.7, any.fgl ==5.7.0.3, - any.file-embed ==0.0.11.2, + any.file-embed ==0.0.15.0, any.file-embed-lzma ==0, - any.file-modules ==0.1.2.4, any.file-path-th ==0.1.0.0, - any.filecache ==0.4.1, any.filelock ==0.1.1.5, any.filemanip ==0.3.6.3, + any.filepath-bytestring ==1.4.2.1.8, any.filepattern ==0.1.2, any.fileplow ==0.1.0.0, any.filtrable ==0.1.4.0, - any.fin ==0.1.1, + any.fin ==0.2, any.fingertree ==0.1.4.2, any.finite-typelits ==0.1.4.2, - any.first-class-families ==0.8.0.0, + any.first-class-families ==0.8.0.1, any.first-class-patterns ==0.3.2.5, - any.fitspec ==0.4.8, + any.fitspec ==0.4.10, + any.fix-whitespace ==0.0.7, any.fixed ==0.3, - any.fixed-length ==0.2.2, + any.fixed-length ==0.2.3, any.fixed-vector ==1.2.0.0, - any.fixed-vector-hetero ==0.6.0.0, + any.fixed-vector-hetero ==0.6.1.1, any.flac ==0.2.0, any.flac-picture ==0.1.2, - any.flags-applicative ==0.1.0.2, + any.flags-applicative ==0.1.0.3, any.flat ==0.4.4, - any.flat-mcmc ==1.5.1, + any.flat-mcmc ==1.5.2, + any.flexible-defaults ==0.0.3, any.floatshow ==0.2.4, - any.flow ==1.0.21, + any.flow ==1.0.22, any.flush-queue ==1.0.0, any.fmlist ==0.9.4, - any.fmt ==0.6.1.2, + any.fmt ==0.6.3.0, any.fn ==0.3.0.2, - any.focus ==1.0.1.3, + any.focus ==1.0.3, any.focuslist ==0.1.0.2, any.fold-debounce ==0.2.0.9, - any.fold-debounce-conduit ==0.2.0.5, + any.fold-debounce-conduit ==0.2.0.6, any.foldable1 ==0.1.0.0, - any.foldl ==1.4.6, - any.folds ==0.7.5, + any.foldl ==1.4.12, + any.folds ==0.7.7, any.follow-file ==0.0.3, - any.force-layout ==0.4.0.6, any.foreign-store ==0.2, any.forkable-monad ==0.2.0.3, any.forma ==1.1.3, any.format-numbers ==0.1.0.1, - any.formatting ==6.3.7, - any.foundation ==0.0.25, - any.free ==5.1.3, - any.free-categories ==0.2.0.0, + any.formatting ==7.1.3, + any.foundation ==0.0.26.1, + any.fourmolu ==0.3.0.0, + any.free ==5.1.7, + any.free-categories ==0.2.0.2, any.free-vl ==0.1.4, any.freenect ==1.2.1, any.freer-simple ==1.2.1.1, @@ -849,34 +904,39 @@ constraints: any.AC-Angle ==1.0, any.funcmp ==1.9, any.function-builder ==0.3.0.1, functor-classes-compat +containers, - any.functor-classes-compat ==1, - any.fused-effects ==1.0.2.2, - any.fusion-plugin ==0.2.1, + any.functor-classes-compat ==1.0.1, + any.functor-combinators ==0.3.6.0, + any.fusion-plugin ==0.2.3, any.fusion-plugin-types ==0.1.0, any.fuzzcheck ==0.1.1, - any.fuzzy ==0.1.0.0, + any.fuzzy ==0.1.0.1, any.fuzzy-dates ==0.1.1.2, any.fuzzy-time ==0.1.0.0, - any.fuzzyset ==0.2.0, + any.fuzzyset ==0.2.2, any.gauge ==0.2.5, any.gd ==3000.7.3, any.gdp ==0.0.3.0, any.general-games ==1.1.1, + any.generic-aeson ==0.2.0.13, any.generic-arbitrary ==0.1.0, any.generic-constraints ==1.1.1.1, - any.generic-data ==0.8.3.0, - any.generic-deriving ==1.13.1, - any.generic-lens ==2.0.0.0, - any.generic-lens-core ==2.0.0.0, + any.generic-data ==0.9.2.1, + any.generic-data-surgery ==0.3.0.0, + any.generic-deriving ==1.14.1, + any.generic-functor ==0.2.0.0, + any.generic-lens ==2.1.0.0, + any.generic-lens-core ==2.1.0.0, any.generic-monoid ==0.1.0.1, - any.generic-optics ==2.0.0.0, - any.generic-random ==1.3.0.1, - any.generics-sop ==0.5.1.0, + any.generic-optics ==2.1.0.0, + any.generic-random ==1.4.0.0, + any.generics-eot ==0.4.0.1, + any.generics-sop ==0.5.1.1, any.generics-sop-lens ==0.2.0.1, - any.genvalidity ==0.11.0.0, + any.geniplate-mirror ==0.7.8, + any.genvalidity ==0.11.0.2, any.genvalidity-aeson ==0.3.0.0, any.genvalidity-bytestring ==0.6.0.0, - any.genvalidity-containers ==0.8.0.2, + any.genvalidity-containers ==0.9.0.0, any.genvalidity-criterion ==0.2.0.0, any.genvalidity-hspec ==0.7.0.4, any.genvalidity-hspec-aeson ==0.3.1.1, @@ -888,261 +948,286 @@ constraints: any.AC-Angle ==1.0, any.genvalidity-mergeful ==0.2.0.0, any.genvalidity-mergeless ==0.2.0.0, any.genvalidity-path ==0.3.0.4, + any.genvalidity-persistent ==0.0.0.0, any.genvalidity-property ==0.5.0.1, any.genvalidity-scientific ==0.2.1.1, + any.genvalidity-sydtest ==0.0.0.0, + any.genvalidity-sydtest-aeson ==0.0.0.0, + any.genvalidity-sydtest-hashable ==0.0.0.0, + any.genvalidity-sydtest-lens ==0.0.0.0, + any.genvalidity-sydtest-persistent ==0.0.0.1, any.genvalidity-text ==0.7.0.2, any.genvalidity-time ==0.3.0.0, any.genvalidity-typed-uuid ==0.0.0.2, any.genvalidity-unordered-containers ==0.3.0.1, any.genvalidity-uuid ==0.1.0.4, any.genvalidity-vector ==0.3.0.1, - any.geoip2 ==0.4.0.1, + any.geoip2 ==0.4.1.0, any.geojson ==4.0.2, any.getopt-generics ==0.13.0.4, any.ghc-byteorder ==4.11.0.0.10, - any.ghc-check ==0.5.0.1, - any.ghc-compact ==0.1.0.0, + any.ghc-check ==0.5.0.6, any.ghc-core ==0.5.6, - any.ghc-events ==0.13.0, - any.ghc-exactprint ==0.6.2, - any.ghc-lib ==8.10.2.20200808, + any.ghc-events ==0.17.0, + any.ghc-exactprint ==0.6.4, + any.ghc-lib ==8.10.7.20210828, any.ghc-lib-parser ==8.10.1.20200412, - any.ghc-lib-parser-ex ==8.10.0.16, - any.ghc-parser ==0.2.2.0, + any.ghc-lib-parser-ex ==8.10.0.23, + any.ghc-parser ==0.2.3.0, any.ghc-paths ==0.1.0.12, - any.ghc-prof ==1.4.1.7, - any.ghc-source-gen ==0.4.0.0, + any.ghc-prof ==1.4.1.9, + any.ghc-source-gen ==0.4.2.0, any.ghc-syntax-highlighter ==0.0.6.0, - any.ghc-tcplugins-extra ==0.4, - any.ghc-typelits-extra ==0.4, - any.ghc-typelits-knownnat ==0.7.3, - any.ghc-typelits-natnormalise ==0.7.2, - any.ghc-typelits-presburger ==0.3.0.1, + any.ghc-tcplugins-extra ==0.4.2, + any.ghc-trace-events ==0.1.2.3, + any.ghc-typelits-extra ==0.4.3, + any.ghc-typelits-knownnat ==0.7.6, + any.ghc-typelits-natnormalise ==0.7.6, + any.ghc-typelits-presburger ==0.6.1.0, any.ghci-hexcalc ==0.1.1.0, any.ghcid ==0.8.7, any.ghcjs-codemirror ==0.0.0.2, any.ghost-buster ==0.1.1.0, - any.gi-atk ==2.0.21, - any.gi-cairo ==1.0.23, - any.gi-cairo-connector ==0.0.1, - any.gi-cairo-render ==0.0.1, - any.gi-dbusmenu ==0.4.7, - any.gi-dbusmenugtk3 ==0.4.8, - any.gi-gdk ==3.0.22, - any.gi-gdkpixbuf ==2.0.23, - any.gi-gdkx11 ==3.0.9, - any.gi-gio ==2.0.26, - any.gi-glib ==2.0.23, - any.gi-gobject ==2.0.22, - any.gi-graphene ==1.0.1, - any.gi-gtk ==3.0.33, - any.gi-gtk-hs ==0.3.8.1, - any.gi-pango ==1.0.22, - any.gi-xlib ==2.0.8, + any.gi-atk ==2.0.23, + any.gi-cairo ==1.0.25, + any.gi-dbusmenu ==0.4.9, + any.gi-dbusmenugtk3 ==0.4.10, + any.gi-gdk ==3.0.24, + any.gi-gdkpixbuf ==2.0.26, + any.gi-gdkx11 ==3.0.11, + any.gi-gio ==2.0.28, + any.gi-glib ==2.0.25, + any.gi-gmodule ==2.0.1, + any.gi-gobject ==2.0.26, + any.gi-graphene ==1.0.3, + any.gi-gtk ==3.0.37, + any.gi-gtk-hs ==0.3.11, + any.gi-harfbuzz ==0.0.4, + any.gi-pango ==1.0.24, + any.gi-xlib ==2.0.10, any.ginger ==0.10.1.0, any.gingersnap ==0.3.1.0, - any.giphy-api ==0.7.0.0, - any.githash ==0.1.4.0, + any.githash ==0.1.6.2, + any.github-release ==1.3.8, any.github-rest ==1.0.3, any.github-types ==0.2.1, - any.gitlab-haskell ==0.1.8, + any.github-webhooks ==0.15.0, + any.gitlab-haskell ==0.2.5, any.gitrev ==1.3.1, any.gl ==0.9, - any.glabrous ==2.0.2, - any.gloss ==1.13.1.2, + any.glabrous ==2.0.5, + any.gloss ==1.13.2.1, any.gloss-rendering ==1.13.1.1, any.gluturtle ==0.0.58.1, any.gnuplot ==0.5.6.1, + any.goldplate ==0.2.0, any.google-isbn ==1.0.3, - any.gothic ==0.1.5, + any.gopher-proxy ==0.1.1.2, + any.gothic ==0.1.7, any.gpolyline ==0.1.0.1, any.graph-core ==0.3.0.0, any.graph-wrapper ==0.2.6.0, any.graphite ==0.10.0.1, + any.graphql-client ==1.1.1, any.graphs ==0.7.1, + any.graphula ==2.0.1.0, any.graphviz ==2999.20.1.0, any.gravatar ==0.8.0, greskell -hint-test, - any.greskell ==1.1.0.3, - any.greskell-core ==0.1.3.5, - any.greskell-websocket ==0.1.2.4, + any.greskell ==1.2.0.2, + any.greskell-core ==0.1.3.7, + any.greskell-websocket ==0.1.2.6, any.groom ==0.1.2.1, - any.group-by-date ==0.1.0.3, - any.groups ==0.4.1.0, - any.gtk-sni-tray ==0.1.6.0, + any.group-by-date ==0.1.0.4, + any.groups ==0.5.3, any.gtk-strut ==0.1.3.0, any.guarded-allocation ==0.0.1, - any.hOpenPGP ==2.9.4, - any.hackage-db ==2.1.0, + any.hOpenPGP ==2.9.5, + any.hackage-db ==2.1.2, any.hackage-security ==0.6.0.1, - any.haddock-library ==1.8.0, - any.hadolint ==1.18.0, + any.haddock-library ==1.10.0, any.hadoop-streaming ==0.2.0.3, - any.hakyll ==4.13.4.0, - any.half ==0.3, + any.hakyll-convert ==0.3.0.4, + any.hal ==0.4.8, + any.half ==0.3.1, any.hall-symbols ==0.1.0.6, any.hamtsolo ==1.0.3, - any.hapistrano ==0.4.1.2, - any.happstack-server ==7.6.1, - any.happy ==1.19.12, - any.hasbolt ==0.1.4.3, + any.hapistrano ==0.4.3.0, + any.happstack-server ==7.7.1.1, + any.happy ==1.20.0, + any.happy-meta ==0.2.0.11, + any.hasbolt ==0.1.6.1, any.hashable ==1.3.0.0, - any.hashable-time ==0.2.0.2, + any.hashable-time ==0.2.1, any.hashids ==1.0.2.4, + any.hashing ==0.1.0.1, any.hashmap ==1.3.3, - any.hashtables ==1.2.4.1, - any.haskeline ==0.7.5.0, - any.haskell-gi ==0.23.1, - any.haskell-gi-base ==0.23.0, + any.hashtables ==1.2.4.2, + any.haskeline ==0.8.2, + any.haskell-awk ==1.2.0.1, + any.haskell-gi ==0.25.0, + any.haskell-gi-base ==0.25.0, any.haskell-gi-overloading ==1.0, - any.haskell-igraph ==0.8.0, any.haskell-import-graph ==1.0.4, any.haskell-lexer ==1.1, - any.haskell-lsp ==0.22.0.0, - any.haskell-lsp-types ==0.22.0.0, + any.haskell-lsp ==0.24.0.0, + any.haskell-lsp-types ==0.24.0.0, any.haskell-names ==0.9.9, any.haskell-src ==1.0.3.1, any.haskell-src-exts ==1.23.1, any.haskell-src-exts-util ==0.2.5, - any.haskell-src-meta ==0.8.5, + any.haskell-src-meta ==0.8.7, any.haskey-btree ==0.3.0.1, - any.haskoin-core ==0.13.4, - any.haskoin-node ==0.13.0, - any.hasql ==1.4.3, + any.hasktags ==0.72.0, + any.hasql ==1.4.5.3, + any.hasql-notifications ==0.2.0.0, any.hasql-optparse-applicative ==0.3.0.6, any.hasql-pool ==0.5.2, - any.hasql-transaction ==1.0.0.1, - any.hasty-hamiltonian ==1.3.3, + any.hasql-queue ==1.2.0.2, + any.hasql-transaction ==1.0.1, + any.hasty-hamiltonian ==1.3.4, any.haxr ==3000.11.4.1, any.hdaemonize ==0.5.6, - any.headroom ==0.2.1.0, + any.headroom ==0.4.2.0, any.heap ==1.0.4, - any.heaps ==0.3.6.1, + any.heaps ==0.4, any.hebrew-time ==0.1.2, - any.hedgehog ==1.0.3, + any.hedgehog ==1.0.5, any.hedgehog-corpus ==0.2.0, - any.hedgehog-fakedata ==0.0.1.3, + any.hedgehog-fakedata ==0.0.1.4, any.hedgehog-fn ==1.0, any.hedgehog-quickcheck ==0.1.1, - any.hedis ==0.12.14, + any.hedis ==0.14.4, + any.hedn ==0.3.0.4, any.here ==1.2.13, any.heredoc ==0.2.0.0, - any.heterocephalus ==1.0.5.3, + any.heterocephalus ==1.0.5.4, any.hex ==0.2.0, any.hexml ==0.3.4, any.hexml-lens ==0.2.1, any.hexpat ==0.20.13, - any.hexstring ==0.11.1, any.hformat ==0.3.3.1, any.hfsevents ==0.1.6, - any.hi-file-parser ==0.1.0.0, - any.hidapi ==0.1.5, - any.hie-bios ==0.5.1, - any.higher-leveldb ==0.5.0.2, + any.hgeometry ==0.12.0.4, + any.hgeometry-combinatorial ==0.12.0.3, + any.hgrev ==0.2.6, + any.hi-file-parser ==0.1.2.0, + any.hidapi ==0.1.7, + any.hie-bios ==0.7.6, + any.higher-leveldb ==0.6.0.0, any.highlighting-kate ==0.6.4, any.hinfo ==0.0.3.0, - any.hinotify ==0.4, - any.hint ==0.9.0.3, + any.hinotify ==0.4.1, + any.hint ==0.9.0.4, any.hjsmin ==0.2.0.4, any.hkd-default ==1.1.0.0, - any.hkgr ==0.2.6.1, - any.hledger ==1.18.1, - any.hledger-iadd ==1.3.12, - any.hledger-lib ==1.18.1, - any.hledger-stockquotes ==0.1.0.0, - any.hledger-ui ==1.18.1, - any.hledger-web ==1.18.1, + any.hkgr ==0.3, + any.hledger ==1.21, + any.hledger-iadd ==1.3.14, + any.hledger-interest ==1.6.1, + any.hledger-lib ==1.21, + any.hledger-stockquotes ==0.1.2.0, + any.hledger-ui ==1.21, + any.hledger-web ==1.21, any.hlibcpuid ==0.2.0, any.hlibgit2 ==0.18.0.16, - any.hlint ==3.1.6, - any.hmatrix ==0.20.0.0, + any.hlibsass ==0.1.10.1, + any.hlint ==3.2.7, + any.hmatrix ==0.20.2, + any.hmatrix-backprop ==0.1.3.0, any.hmatrix-gsl ==0.19.0.1, any.hmatrix-gsl-stats ==0.4.1.8, any.hmatrix-morpheus ==0.1.1.2, any.hmatrix-vector-sized ==0.1.3.0, + any.hmm-lapack ==0.4, any.hmpfr ==0.4.4, any.hnock ==0.4.0, - any.hoauth2 ==1.14.0, - any.hopenpgp-tools ==0.23.1, + any.hoauth2 ==1.16.0, + any.hoogle ==5.0.18.2, + any.hopenpgp-tools ==0.23.6, any.hopenssl ==2.2.4, any.hopfli ==0.2.2.1, - any.hosc ==0.17, + any.hosc ==0.18.1, any.hostname ==1.0, any.hostname-validate ==1.0.0, any.hourglass ==0.2.12, any.hourglass-orphans ==0.1.0.0, - any.hp2pretty ==0.9, - any.hpack ==0.34.2, - any.hpack-dhall ==0.5.2, - any.hpc-codecov ==0.2.0.0, + any.hp2pretty ==0.10, + any.hpack ==0.34.5, + any.hpack-dhall ==0.5.3, + any.hpc-codecov ==0.3.0.0, any.hpc-lcov ==1.0.1, - any.hreader ==1.1.0, - any.hreader-lens ==0.1.3.0, - any.hruby ==0.3.8, + any.hprotoc ==2.4.17, + any.hruby ==0.3.8.1, any.hs-GeoIP ==0.3, any.hs-bibutils ==6.10.0.0, any.hs-functors ==0.1.7.1, any.hs-php-session ==0.0.9.3, - any.hsc2hs ==0.68.7, + any.hs-tags ==0.1.5.2, + any.hsass ==0.8.0, + any.hsc2hs ==0.68.8, any.hscolour ==1.24.4, any.hsdns ==1.8, any.hsebaysdk ==0.4.1.0, - any.hsemail ==2.2.0, - any.hset ==2.2.0, + any.hsemail ==2.2.1, any.hsini ==0.5.1.2, any.hsinstall ==2.6, any.hslogger ==1.3.1.0, - any.hslua ==1.0.3.2, - any.hslua-aeson ==1.0.3, - any.hslua-module-doclayout ==0.1.0, - any.hslua-module-system ==0.2.2, - any.hslua-module-text ==0.2.1, + any.hslua ==1.3.0.2, + any.hslua-aeson ==1.0.3.1, + any.hslua-module-doclayout ==0.2.0.1, + any.hslua-module-path ==0.1.0.1, + any.hslua-module-system ==0.2.2.1, + any.hslua-module-text ==0.3.0.1, any.hsp ==0.10.0, - any.hspec ==2.7.4, + any.hspec ==2.7.10, any.hspec-attoparsec ==0.1.0.2, any.hspec-checkers ==0.1.0.2, any.hspec-contrib ==0.5.1, - any.hspec-core ==2.7.4, - any.hspec-discover ==2.7.4, + any.hspec-core ==2.7.10, + any.hspec-discover ==2.7.10, any.hspec-expectations ==0.8.2, + any.hspec-expectations-json ==1.0.0.4, any.hspec-expectations-lifted ==0.10.0, any.hspec-expectations-pretty-diff ==0.7.2.5, any.hspec-golden ==0.1.0.3, any.hspec-golden-aeson ==0.7.0.0, any.hspec-hedgehog ==0.0.1.2, - any.hspec-leancheck ==0.0.4, - any.hspec-megaparsec ==2.1.0, - any.hspec-meta ==2.6.0, - any.hspec-need-env ==0.1.0.5, + any.hspec-junit-formatter ==1.0.0.5, + any.hspec-leancheck ==0.0.6, + any.hspec-megaparsec ==2.2.0, + any.hspec-meta ==2.7.8, + any.hspec-need-env ==0.1.0.8, any.hspec-parsec ==0, any.hspec-smallcheck ==0.5.2, any.hspec-tables ==0.0.1, - any.hspec-wai-json ==0.10.1, - any.hsshellscript ==3.4.5, + any.hspec-wai-json ==0.11.0, + any.hsshellscript ==3.5.0, any.hsyslog ==5.0.2, any.htaglib ==1.2.0, any.html ==1.0.1.2, - any.html-conduit ==1.3.2.1, - any.html-entities ==1.1.4.3, + any.html-conduit ==1.3.2.2, + any.html-entities ==1.1.4.5, any.html-entity-map ==0.1.0.0, any.htoml ==1.0.0.3, - any.http-api-data ==0.4.1.1, + any.http-api-data ==0.4.2, any.http-client-overrides ==0.1.1.0, - any.http-common ==0.8.2.1, - any.http-date ==0.0.8, + any.http-common ==0.8.3.4, + any.http-date ==0.0.11, any.http-directory ==0.1.8, any.http-download ==0.2.0.0, - any.http-link-header ==1.0.3.1, + any.http-link-header ==1.2.1, any.http-media ==0.8.0.0, + any.http-query ==0.1.0.1, any.http-reverse-proxy ==0.6.0, - any.http-streams ==0.8.7.2, + any.http-streams ==0.8.9.4, any.http-types ==0.12.3, any.httpd-shed ==0.4.1.1, any.human-readable-duration ==0.2.1.4, - any.hunit-dejafu ==2.0.0.4, + any.hunit-dejafu ==2.0.0.5, any.hvect ==0.4.0.0, - any.hvega ==0.9.1.0, - any.hw-balancedparens ==0.4.1.0, + any.hvega ==0.11.0.1, + any.hw-balancedparens ==0.4.1.1, any.hw-bits ==0.7.2.1, any.hw-conduit ==0.2.1.0, any.hw-conduit-merges ==0.2.1.0, @@ -1154,147 +1239,169 @@ constraints: any.AC-Angle ==1.0, any.hw-hspec-hedgehog ==0.1.1.0, any.hw-int ==0.0.2.0, any.hw-json-simd ==0.1.1.0, - any.hw-mquery ==0.2.1.0, + any.hw-kafka-client ==4.0.3, + any.hw-packed-vector ==0.2.1.0, any.hw-parser ==0.1.1.0, any.hw-prim ==0.6.3.0, + any.hw-rankselect ==0.13.4.0, any.hw-rankselect-base ==0.3.4.1, + any.hw-simd ==0.1.2.0, any.hw-streams ==0.0.1.0, any.hw-string-parse ==0.0.0.4, + any.hw-succinct ==0.1.0.1, any.hweblib ==0.6.3, hxt +network-uri, - any.hxt ==9.3.1.18, - any.hxt-charproperties ==9.4.0.0, + any.hxt ==9.3.1.22, + any.hxt-charproperties ==9.5.0.0, any.hxt-css ==0.1.0.3, any.hxt-curl ==9.1.1.1, any.hxt-expat ==9.1.1, hxt-http +network-uri, any.hxt-http ==9.1.5.2, - any.hxt-regex-xmlschema ==9.2.0.3, + any.hxt-regex-xmlschema ==9.2.0.7, any.hxt-tagsoup ==9.1.4, any.hxt-unicode ==9.0.2.4, any.hybrid-vectors ==0.2.2, - any.hyperloglog ==0.4.3, - any.hyphenation ==0.8, - any.hyraxAbif ==0.2.3.21, + any.hyper ==0.2.1.1, + any.hyperloglog ==0.4.5, + any.hyphenation ==0.8.2, any.iconv ==0.4.1.3, any.identicon ==0.2.2, any.ieee754 ==0.8.0, any.if ==0.1.0.0, any.iff ==0.0.6, - any.ihaskell ==0.10.1.2, + any.ihaskell ==0.10.2.1, any.ihs ==0.1.0.3, any.ilist ==0.4.0.1, any.imagesize-conduit ==1.1, any.immortal ==0.3, any.immortal-queue ==0.1.0.1, - any.implicit-hie ==0.1.2.5, + any.implicit-hie ==0.1.2.6, + any.inbox ==0.1.0, any.include-file ==0.1.0.4, - any.incremental-parser ==0.4.0.2, + any.incremental-parser ==0.5.0.2, any.indents ==0.5.0.1, any.indexed ==0.1.3, any.indexed-containers ==0.1.0.2, any.indexed-list-literals ==0.2.1.3, - any.indexed-profunctors ==0.1, + any.indexed-profunctors ==0.1.1, + any.indexed-traversable ==0.1.2, + any.indexed-traversable-instances ==0.1, any.infer-license ==0.2.0, any.inflections ==0.4.0.6, - any.influxdb ==1.7.1.6, + any.influxdb ==1.9.2.1, any.ini ==0.4.1, any.inj ==1.0, - any.inline-c ==0.9.1.0, - any.inline-c-cpp ==0.4.0.2, + any.inline-c ==0.9.1.5, + any.inline-c-cpp ==0.4.0.3, + any.inline-r ==0.10.5, any.inliterate ==0.1.0, - any.insert-ordered-containers ==0.2.3.1, - any.inspection-testing ==0.4.2.4, + any.input-parsers ==0.2.3.1, + any.insert-ordered-containers ==0.2.5.1, + any.inspection-testing ==0.4.6.0, any.instance-control ==0.1.2.0, any.int-cast ==0.2.0.0, - any.integer-logarithms ==1.0.3, - any.integer-roots ==1.0, + any.integer-logarithms ==1.0.3.1, + any.integer-roots ==1.0.1.0, any.integration ==0.2.1, - any.intern ==0.9.2, + any.intern ==0.9.4, any.interpolate ==0.2.1, any.interpolatedstring-perl6 ==1.0.2, - any.interpolation ==0.1.1.1, - any.interpolator ==1.0.0, - any.intervals ==0.9.1, - any.intro ==0.7.0.0, + any.interpolation ==0.1.1.2, + any.interpolator ==1.1.0.2, + any.intervals ==0.9.2, + any.intro ==0.9.0.0, any.intset-imperative ==0.1.0.0, - any.invariant ==0.5.3, + any.invariant ==0.5.5, any.invertible ==0.2.0.7, - any.invertible-grammar ==0.1.3, + any.invertible-grammar ==0.1.3.2, any.invertible-hxt ==0.1, any.io-machine ==0.2.0.0, any.io-manager ==0.1.0.3, any.io-memoize ==1.1.1.0, any.io-region ==0.1.1, any.io-storage ==0.3, - any.io-streams ==1.5.2.0, + any.io-streams ==1.5.2.1, any.io-streams-haproxy ==1.0.1.0, - any.ip6addr ==1.0.1, - any.iproute ==1.7.9, - any.ipynb ==0.1.0.1, + any.ip6addr ==1.0.2, + any.ipa ==0.3.1.1, + any.iproute ==1.7.12, + any.ipynb ==0.1.0.2, any.ipython-kernel ==0.10.2.1, any.irc ==0.6.1.0, - any.irc-client ==1.1.1.1, - any.irc-conduit ==0.3.0.4, - any.irc-ctcp ==0.1.3.0, - any.isbn ==1.0.0.0, + any.irc-client ==1.1.2.2, + any.irc-conduit ==0.3.0.5, + any.irc-ctcp ==0.1.3.1, + any.isbn ==1.1.0.2, any.islink ==0.1.0.0, any.iso3166-country-codes ==0.20140203.8, any.iso639 ==0.1.0.3, any.iso8601-time ==0.1.5, - any.it-has ==0.2.0.0, any.iterable ==3.0, any.ix-shapable ==0.1.0, any.ixset-typed ==0.5, - any.jack ==0.7.1.4, + any.ixset-typed-binary-instance ==0.1.0.2, + any.ixset-typed-conversions ==0.1.2.0, + any.ixset-typed-hashable-instance ==0.1.0.2, + any.jack ==0.7.2, any.jailbreak-cabal ==1.3.5, - any.jira-wiki-markup ==1.1.4, - any.jose ==0.8.3.1, - any.jose-jwt ==0.8.0, + any.jalaali ==1.0.0.0, + any.java-adt ==0.2018.11.4, + any.jira-wiki-markup ==1.4.0, + any.jose ==0.8.4, + any.jose-jwt ==0.9.2, + any.js-chart ==2.9.4.1, any.js-dgtable ==0.5.2, any.js-flot ==0.8.3, any.js-jquery ==3.3.1, - any.json-alt ==1.0.0, - any.json-feed ==1.0.11, + any.json ==0.10, + any.json-feed ==1.0.15, any.json-rpc ==1.0.3, - any.json-rpc-generic ==0.2.1.5, + any.json-rpc-generic ==0.2.1.6, + any.jsonifier ==0.1.1, any.jsonpath ==0.2.0.0, - any.junit-xml ==0.1.0.1, + any.junit-xml ==0.1.0.2, any.justified-containers ==0.3.0.0, any.jwt ==0.10.0, - any.kan-extensions ==5.2, + any.kan-extensions ==5.2.3, any.kanji ==3.4.1, - any.katip ==0.8.5.0, + any.katip ==0.8.7.0, + any.katip-logstash ==0.1.0.0, any.kawhi ==0.3.0, any.kazura-queue ==0.1.0.4, any.kdt ==0.2.4, + any.keep-alive ==0.2.0.0, any.keycode ==0.2.2, any.keys ==3.12.3, + any.ki ==0.2.0.1, any.kind-apply ==0.3.2.0, any.kind-generics ==0.4.1.0, - any.kind-generics-th ==0.2.2.0, + any.kind-generics-th ==0.2.2.2, any.kmeans ==0.1.3, + any.koji ==0.0.2, any.koofr-client ==1.0.0.3, - any.krank ==0.2.2, + any.krank ==0.2.3, any.kubernetes-webhook-haskell ==0.2.0.3, any.l10n ==0.1.0.1, any.labels ==0.3.3, - any.lackey ==1.0.13, + any.lackey ==1.0.16, + any.lambdabot-core ==5.3.0.2, any.lame ==0.2.0, any.language-avro ==0.1.3.1, any.language-bash ==0.9.2, - any.language-c ==0.8.3, - any.language-c-quote ==0.12.2.1, - any.language-docker ==9.1.1, - any.language-haskell-extract ==0.2.4, + any.language-c ==0.9.0.1, + any.language-c-quote ==0.13, + any.language-docker ==10.0.2, any.language-java ==0.2.9, any.language-javascript ==0.7.1.0, any.language-nix ==2.2.0, any.language-protobuf ==1.0.1, - any.language-puppet ==1.4.6.5, + any.language-python ==0.5.8, + any.language-thrift ==0.12.0.0, + any.lapack ==0.3.2, any.lapack-carray ==0.0.3, - any.lapack-comfort-array ==0.0.0.1, - any.lapack-ffi ==0.0.2, + any.lapack-comfort-array ==0.0.1, + any.lapack-ffi ==0.0.3, any.lapack-ffi-tools ==0.1.2.1, any.largeword ==1.2.5, any.latex ==0.1.0.4, @@ -1302,84 +1409,104 @@ constraints: any.AC-Angle ==1.0, any.lawful ==0.1.0.0, any.lazy-csv ==0.5.1, any.lazyio ==0.1.0.4, - any.lca ==0.3.1, - any.leancheck ==0.9.3, + any.lazysmallcheck ==0.6, + any.lca ==0.4, + any.leancheck ==0.9.10, any.leancheck-instances ==0.0.4, any.leapseconds-announced ==2017.1.0.1, any.learn-physics ==0.6.5, - any.lens ==4.18.1, - any.lens-action ==0.2.4, - any.lens-aeson ==1.1, + any.lens ==4.19.2, + any.lens-action ==0.2.6, + any.lens-aeson ==1.1.3, + any.lens-csv ==0.1.1.0, any.lens-datetime ==0.3, any.lens-family ==2.0.0, any.lens-family-core ==2.0.0, - any.lens-family-th ==0.5.1.0, + any.lens-family-th ==0.5.2.1, any.lens-misc ==0.0.2.0, + any.lens-process ==0.4.0.0, any.lens-properties ==4.11.1, - any.lens-regex ==0.1.1, + any.lens-regex ==0.1.3, + any.lens-regex-pcre ==1.1.0.0, any.lenz ==0.4.2.0, any.leveldb-haskell ==0.6.5, + any.libBF ==0.6.2, any.libffi ==0.1, any.libgit ==0.3.1, any.libgraph ==1.14, - any.libmpd ==0.9.1.0, + any.libjwt-typed ==0.2, + any.libmpd ==0.10.0.0, + any.liboath-hs ==0.0.1.2, any.libyaml ==0.1.2, - any.life-sync ==1.1.1.0, - any.lift-generics ==0.1.3, - any.lifted-async ==0.10.1.2, + any.lift-generics ==0.2.1, + any.lift-type ==0.1.0.1, + any.lifted-async ==0.10.2.2, any.lifted-base ==0.2.3.12, any.line ==4.0.1, - any.linear ==1.21.1, + any.linear ==1.21.6, + any.linear-circuit ==0.1.0.2, any.linenoise ==0.3.2, + any.linux-capabilities ==0.1.0.0, any.linux-file-extents ==0.2.0.0, any.linux-namespaces ==0.1.3.0, + any.liquid-fixpoint ==0.8.10.2, any.list-predicate ==0.1.0.1, - any.list-singleton ==1.0.0.4, - any.list-t ==1.0.4, + any.list-singleton ==1.0.0.5, + any.list-t ==1.0.5, + any.list-transformer ==1.0.7, any.listsafe ==0.1.0.1, - any.little-logger ==0.1.0, - any.little-rio ==0.1.1, + any.literatex ==0.1.0.2, + any.little-rio ==0.2.2, any.llvm-hs ==9.0.1, any.llvm-hs-pure ==9.0.0, any.lmdb ==0.2.5, any.load-env ==0.2.1.0, - any.loc ==0.1.3.8, + any.loc ==0.1.3.10, + any.locators ==0.3.0.3, any.loch-th ==0.2.2, any.lockfree-queue ==0.2.3.1, - any.log-base ==0.8.0.1, - any.log-domain ==0.13, - any.logfloat ==0.13.3.3, + any.log-domain ==0.13.2, + any.logfloat ==0.13.4, any.logging ==3.0.5, - any.logging-facade ==0.3.0, + any.logging-facade ==0.3.1, any.logging-facade-syslog ==1, - any.logict ==0.7.0.3, + any.logict ==0.7.1.0, + any.logstash ==0.1.0.1, any.loop ==0.3.0, - any.loopbreaker ==0.1.1.1, any.lrucache ==1.2.0.1, any.lrucaching ==0.3.3, - any.lsp-test ==0.10.3.0, - any.lucid ==2.9.12, + any.lsp ==1.2.0.0, + any.lsp-test ==0.14.0.0, + any.lsp-types ==1.2.0.0, + any.lucid ==2.9.12.1, + any.lucid-cdn ==0.2.2.0, any.lucid-extras ==0.2.2, - any.lukko ==0.1.1.2, + any.lukko ==0.1.1.3, + any.lz4-frame-conduit ==0.1.0.1, any.lzma ==0.0.0.3, - any.lzma-conduit ==1.2.1, - any.machines ==0.7, + any.lzma-clib ==5.2.2, + any.lzma-conduit ==1.2.2, + any.machines ==0.7.2, + any.machines-binary ==7.0.0.0, any.magic ==1.1, + any.magico ==0.0.2.1, any.main-tester ==0.2.0.1, - any.mainland-pretty ==0.7.0.1, + any.mainland-pretty ==0.7.1, any.makefile ==1.1.0.0, any.managed ==1.0.8, - any.markdown ==0.1.17.4, - any.markdown-unlit ==0.5.0, + any.markdown ==0.1.17.5, + any.markdown-unlit ==0.5.1, any.markov-chain ==0.0.3.4, any.markov-chain-usage-model ==0.0.0, - any.massiv ==0.5.4.0, - any.massiv-io ==0.2.1.0, - any.massiv-test ==0.1.4, + any.massiv ==0.6.1.0, + any.massiv-io ==0.4.1.0, + any.massiv-persist ==0.1.0.0, + any.massiv-serialise ==0.1.0.0, + any.massiv-test ==0.1.6.1, any.math-extras ==0.1.1.0, - any.math-functions ==0.3.4.1, + any.math-functions ==0.3.4.2, any.mathexpr ==0.3.0.0, - any.matplotlib ==0.7.5, + any.matplotlib ==0.7.7, any.matrices ==0.5.0, any.matrix ==0.3.6.1, any.matrix-as-xyz ==0.1.2.2, @@ -1388,78 +1515,83 @@ constraints: any.AC-Angle ==1.0, any.maximal-cliques ==0.1.1, any.mbox ==0.3.4, any.mbox-utility ==0.0.3.1, + any.mcmc ==0.5.0.0, any.mcmc-types ==1.0.3, - any.medea ==1.1.2, + any.med-module ==0.1.2.1, + any.medea ==1.2.0, any.median-stream ==0.7.0.0, - any.megaparsec ==8.0.0, - any.megaparsec-tests ==8.0.0, + any.megaparsec ==9.0.1, + any.megaparsec-tests ==9.0.1, any.membrain ==0.0.0.2, any.memory ==0.15.0, any.mercury-api ==0.1.0.2, any.mergeful ==0.2.0.0, any.mergeless ==0.3.0.0, + any.mersenne-random ==1.0.0.1, mersenne-random-pure64 -small_base, any.mersenne-random-pure64 ==0.2.2.0, any.messagepack ==0.5.4, any.metrics ==0.4.1.1, any.mfsolve ==0.3.2.0, - any.microlens ==0.4.11.2, + any.microlens ==0.4.12.0, any.microlens-aeson ==2.3.1, any.microlens-contra ==0.1.0.2, - any.microlens-ghc ==0.4.12, + any.microlens-ghc ==0.4.13.1, any.microlens-mtl ==0.2.0.1, - any.microlens-platform ==0.4.1, + any.microlens-platform ==0.4.2.1, any.microlens-process ==0.2.0.2, - any.microlens-th ==0.4.3.5, + any.microlens-th ==0.4.3.10, any.microspec ==0.2.1.3, - any.microstache ==1.0.1.1, + any.microstache ==1.0.2, any.midair ==0.2.0.1, any.midi ==0.2.2.2, any.mighty-metropolis ==2.0.0, any.mime ==0.4.0.2, - any.mime-mail ==0.5.0, + any.mime-mail ==0.5.1, any.mime-mail-ses ==0.4.3, any.mime-types ==0.1.0.9, any.min-max-pqueue ==0.1.0.2, any.mini-egison ==1.0.0, any.minimal-configuration ==0.1.4, - any.minimorph ==0.2.2.0, - any.minio-hs ==1.5.2, - any.miniutter ==0.5.1.0, - mintty +win32-2-5-3, - any.mintty ==0.1.2, - any.miso ==1.6.0.0, + any.minimorph ==0.3.0.0, + any.minio-hs ==1.5.3, + any.miniutter ==0.5.1.1, + mintty +win32-2-13-1, + any.mintty ==0.1.3, any.missing-foreign ==0.1.1, - any.mixed-types-num ==0.4.0.2, - any.mixpanel-client ==0.2.1, + any.mixed-types-num ==0.5.9.1, any.mltool ==0.2.0.1, any.mmap ==0.5.9, any.mmark ==0.0.7.2, any.mmark-cli ==0.0.5.0, - any.mmark-ext ==0.2.1.2, - any.mmorph ==1.1.3, + any.mmark-ext ==0.2.1.3, + any.mmorph ==1.1.5, any.mnist-idx ==0.1.2.8, + any.mnist-idx-conduit ==0.4.0.0, + any.mock-time ==0.1.0, any.mockery ==0.3.5, - any.mod ==0.1.2.0, + any.mod ==0.1.2.2, any.model ==0.5, - any.modern-uri ==0.3.2.0, + any.modern-uri ==0.3.4.2, any.modular ==0.1.0.8, - any.monad-bayes ==0.1.1.0, - any.monad-control ==1.0.2.3, + any.monad-chronicle ==1.0.0.1, + any.monad-control ==1.0.3.1, any.monad-control-aligned ==0.0.1.1, - any.monad-coroutine ==0.9.0.4, + any.monad-coroutine ==0.9.1.3, any.monad-extras ==0.6.0, any.monad-journal ==0.8.1, - any.monad-logger ==0.3.35, + any.monad-logger ==0.3.36, any.monad-logger-json ==0.1.0.0, - any.monad-logger-prefix ==0.1.11, + any.monad-logger-logstash ==0.1.0.0, + any.monad-logger-prefix ==0.1.12, any.monad-loops ==0.4.3, - any.monad-memo ==0.5.1, - any.monad-metrics ==0.2.1.4, + any.monad-memo ==0.5.3, + any.monad-metrics ==0.2.2.0, any.monad-par ==0.3.5, any.monad-par-extras ==0.3.3, - any.monad-parallel ==0.7.2.3, + any.monad-parallel ==0.7.2.5, any.monad-peel ==0.2.1.2, + any.monad-primitive ==0.1, any.monad-products ==4.0.1, any.monad-resumption ==0.1.4.0, any.monad-skeleton ==0.1.5, @@ -1468,18 +1600,22 @@ constraints: any.AC-Angle ==1.0, any.monad-unlift ==0.2.0, any.monad-unlift-ref ==0.2.1, any.monadic-arrays ==0.2.2, + any.monadlist ==0.0.2, any.monads-tf ==0.1.0.3, mongoDB -_old-network, - any.mongoDB ==2.7.0.0, - any.mono-traversable ==1.0.15.1, + any.mongoDB ==2.7.1.1, + any.mono-traversable ==1.0.15.3, any.mono-traversable-instances ==0.1.1.0, any.mono-traversable-keys ==0.1.0, - any.monoid-extras ==0.5.1, - any.monoid-subclasses ==1.0.1, + any.monoid-subclasses ==1.1.2, any.monoid-transformer ==0.0.4, - any.more-containers ==0.2.2.0, - any.morpheus-graphql ==0.12.0, - any.morpheus-graphql-core ==0.12.0, + any.more-containers ==0.2.2.2, + any.morpheus-graphql ==0.17.0, + any.morpheus-graphql-app ==0.17.0, + any.morpheus-graphql-client ==0.17.0, + any.morpheus-graphql-core ==0.17.0, + any.morpheus-graphql-subscriptions ==0.17.0, + any.moss ==0.2.0.0, any.mountpoints ==1.0.2, any.mpi-hs ==0.7.2.0, any.mpi-hs-binary ==0.1.1.0, @@ -1489,17 +1625,19 @@ constraints: any.AC-Angle ==1.0, any.multi-containers ==0.1.1, any.multiarg ==0.30.0.10, any.multimap ==1.2.1, + any.multipart ==0.2.1, any.multiset ==0.3.4.3, any.multistate ==0.8.0.3, - any.murmur-hash ==0.1.0.9, - any.murmur3 ==1.0.4, + any.murmur-hash ==0.1.0.10, + any.murmur3 ==1.0.5, any.mustache ==2.3.1, any.mutable-containers ==0.3.4, any.mwc-probability ==2.3.1, - any.mwc-random ==0.14.0.0, + any.mwc-random ==0.15.0.2, + any.mwc-random-monad ==0.7.3.1, any.mx-state-codes ==1.0.0.0, - any.mysql ==0.1.7, - any.mysql-simple ==0.4.5, + any.mysql ==0.2.1, + any.mysql-simple ==0.4.7, any.n2o ==0.11.1, any.nagios-check ==0.3.2, any.names-th ==0.3.0.1, @@ -1510,105 +1648,116 @@ constraints: any.AC-Angle ==1.0, any.natural-sort ==0.1.2, any.natural-transformation ==0.4, any.ndjson-conduit ==0.1.0.5, - any.neat-interpolation ==0.3.2.6, + any.neat-interpolation ==0.5.1.2, + any.net-mqtt ==0.7.1.1, + any.net-mqtt-lens ==0.1.1.0, + any.netcode-io ==0.0.3, any.netlib-carray ==0.1, - any.netlib-comfort-array ==0.0.0.1, + any.netlib-comfort-array ==0.0.0.2, any.netlib-ffi ==0.1.1, - any.netpbm ==1.0.3, - any.netrc ==0.2.0.0, + any.netpbm ==1.0.4, any.nettle ==0.3.0, any.netwire ==5.0.3, any.netwire-input ==0.0.7, any.netwire-input-glfw ==0.0.11, any.network ==3.1.1.1, any.network-bsd ==2.8.1.0, - any.network-byte-order ==0.1.5, + any.network-byte-order ==0.1.6, any.network-conduit-tls ==1.3.2, any.network-info ==0.2.0.10, any.network-ip ==0.3.0.3, any.network-messagepack-rpc ==0.1.2.0, any.network-messagepack-rpc-websocket ==0.1.1.1, + any.network-run ==0.2.4, any.network-simple ==0.4.5, any.network-simple-tls ==0.4, any.network-transport ==0.5.4, any.network-transport-composed ==0.2.1, - any.network-uri ==2.6.3.0, + any.network-uri ==2.6.4.1, any.newtype ==0.2.2.0, - any.newtype-generics ==0.5.4, + any.newtype-generics ==0.6.1, any.nicify-lib ==1.0.1, + any.nix-derivation ==1.1.2, nix-paths +allow-relative-paths, any.nix-paths ==1.0.1, any.no-value ==1.0.0.0, - any.non-empty ==0.3.2, + any.non-empty ==0.3.3, any.non-empty-sequence ==0.2.0.4, any.non-negative ==0.1.2, any.nonce ==1.0.7, any.nondeterminism ==1.4, - any.nonempty-containers ==0.3.4.1, - any.nonempty-vector ==0.2.0.2, + any.nonempty-containers ==0.3.4.4, + any.nonempty-vector ==0.2.1.0, + any.nonempty-zipper ==1.0.0.3, any.nonemptymap ==0.0.6.0, any.not-gloss ==0.7.7.0, any.nowdoc ==0.1.1.0, any.nqe ==0.6.3, + any.nri-env-parser ==0.1.0.7, + any.nri-observability ==0.1.1.3, + any.nri-prelude ==0.6.0.5, any.nsis ==0.3.3, any.numbers ==3000.2.0.2, any.numeric-extras ==0.1, - any.numeric-prelude ==0.4.3.2, - any.numhask ==0.4.0, - any.numtype-dk ==0.5.0.2, + any.numeric-limits ==0.1.0.0, + any.numeric-prelude ==0.4.3.3, + any.numhask ==0.7.1.0, + any.numtype-dk ==0.5.0.3, any.nuxeo ==0.3.2, - any.o-clock ==1.1.0, + any.nvim-hs ==2.1.0.4, + any.nvim-hs-contrib ==2.0.0.0, + any.nvim-hs-ghcid ==2.0.0.0, + any.o-clock ==1.2.1, any.oauthenticated ==0.2.1.0, - any.odbc ==0.2.2, - any.oeis2 ==1.0.4, + any.odbc ==0.2.5, + any.oeis2 ==1.0.5, any.ofx ==0.4.4.0, any.old-locale ==1.0.0.7, any.old-time ==1.1.0.3, any.once ==0.4, any.one-liner ==1.0, - any.one-liner-instances ==0.1.2.1, any.oo-prototypes ==0.1.0.0, - any.opaleye ==0.6.7006.1, + any.opaleye ==0.7.6.2, any.open-browser ==0.2.1.0, + any.openapi3 ==3.1.0, any.openexr-write ==0.1.0.2, any.openpgp-asciiarmor ==0.1.2, any.opensource ==0.1.1.0, any.openssl-streams ==1.2.3.0, - any.opentelemetry ==0.4.2, - any.opentelemetry-extra ==0.4.2, - any.opentelemetry-lightstep ==0.4.2, - any.opentelemetry-wai ==0.4.2, - any.operational ==0.2.3.5, + any.opentelemetry ==0.7.0, + any.opentelemetry-extra ==0.7.0, + any.opentelemetry-lightstep ==0.7.0, + any.opentelemetry-wai ==0.7.0, + any.operational ==0.2.4.1, any.operational-class ==0.3.0.0, - any.optics ==0.2, - any.optics-core ==0.2, - any.optics-extra ==0.2, - any.optics-th ==0.2, - any.optics-vl ==0.2, + any.optics ==0.3, + any.optics-core ==0.3.0.1, + any.optics-extra ==0.3, + any.optics-th ==0.3.0.2, + any.optics-vl ==0.2.1, any.optional-args ==1.0.2, any.options ==1.2.1.1, - any.optparse-applicative ==0.15.1.0, - any.optparse-generic ==1.3.1, - any.optparse-simple ==0.1.1.3, + any.optparse-applicative ==0.16.1.0, + any.optparse-generic ==1.4.7, + any.optparse-simple ==0.1.1.4, any.optparse-text ==0.1.1.0, any.ordered-containers ==0.2.2, any.ormolu ==0.1.4.1, any.overhang ==1.0.0, any.packcheck ==0.5.1, + any.packdeps ==0.6.0.0, any.pager ==0.1.1.0, - any.pagination ==0.2.1, + any.pagination ==0.2.2, any.pagure-cli ==0.2, - any.pandoc ==2.9.2.1, - any.pandoc-citeproc ==0.17.0.1, - any.pandoc-csv2table ==1.0.8, - any.pandoc-plot ==0.6.1.0, - any.pandoc-pyplot ==2.3.0.1, - any.pandoc-types ==1.20, - any.pantry ==0.4.0.2, - any.papillon ==0.1.1.1, + any.pandoc ==2.14.0.3, + any.pandoc-dhall-decoder ==0.1.0.1, + any.pandoc-plot ==1.2.3, + any.pandoc-throw ==0.1.0.0, + any.pandoc-types ==1.22.1, + any.pantry ==0.5.2.3, any.parallel ==3.2.2.0, - any.parallel-io ==0.3.3, - any.paripari ==0.6.0.1, + any.parameterized ==0.5.0.0, + any.paripari ==0.7.0.0, any.parseargs ==0.2.0.9, any.parsec-class ==1.0.0.0, any.parsec-numbers ==0.1.0, @@ -1618,51 +1767,60 @@ constraints: any.AC-Angle ==1.0, any.parsers ==0.12.10, any.partial-handler ==1.0.3, any.partial-isomorphisms ==0.2.2.1, - any.partial-semigroup ==0.5.1.8, - any.password ==2.0.1.1, - any.password-instances ==2.0.0.1, - any.path ==0.7.0, + any.partial-semigroup ==0.5.1.12, + any.password ==3.0.0.0, + any.password-instances ==3.0.0.0, + any.password-types ==1.0.0.0, + any.path ==0.8.0, + any.path-binary-instance ==0.1.0.1, + any.path-extensions ==0.1.1.0, any.path-extra ==0.2.0, - any.path-io ==1.6.0, + any.path-io ==1.6.3, + any.path-like ==0.2.0.2, any.path-pieces ==0.2.1, - any.path-text-utf8 ==0.0.1.6, + any.path-text-utf8 ==0.0.1.8, pathtype -old-time, any.pathtype ==0.8.1.1, any.pathwalk ==0.3.1.2, any.pattern-arrows ==0.0.2, - any.pattern-trie ==0.1.0, - any.pcg-random ==0.1.3.6, + any.pattern-trie ==0.1.1, + any.pava ==0.1.1.2, + any.pcg-random ==0.1.3.7, any.pcre-heavy ==1.0.0.2, any.pcre-light ==0.4.1.0, - any.pcre-utils ==0.1.8.1.1, + any.pcre-utils ==0.1.8.2, + any.pcre2 ==1.1.5, any.pdfinfo ==1.5.4, any.peano ==0.1.0.1, any.pem ==0.2.4, - any.percent-format ==0.0.1, + any.percent-format ==0.0.2, + any.peregrin ==0.3.1, any.perfect-hash-generator ==0.2.0.6, any.perfect-vector-shuffle ==0.1.1.1, any.persist ==0.1.1.5, any.persistable-record ==0.6.0.5, any.persistable-types-HDBC-pg ==0.0.3.5, - any.persistent ==2.10.5.2, - any.persistent-mysql ==2.10.2.3, - any.persistent-pagination ==0.1.1.1, - any.persistent-postgresql ==2.10.1.2, - any.persistent-qq ==2.9.1.1, - any.persistent-sqlite ==2.10.6.2, - any.persistent-template ==2.8.2.3, - any.persistent-test ==2.0.3.1, - any.persistent-typed-db ==0.1.0.1, + any.persistent ==2.13.2.1, + any.persistent-mtl ==0.2.2.0, + any.persistent-mysql ==2.13.0.2, + any.persistent-pagination ==0.1.1.2, + any.persistent-postgresql ==2.13.2.1, + any.persistent-qq ==2.12.0.1, + any.persistent-sqlite ==2.13.0.3, + any.persistent-template ==2.12.0.0, + any.persistent-test ==2.13.0.3, + any.persistent-typed-db ==0.1.0.5, any.pg-harness-client ==0.6.0, - any.pg-transact ==0.3.1.1, + any.pg-transact ==0.3.2.0, any.pgp-wordlist ==0.1.0.3, any.phantom-state ==0.2.1.2, - any.pid1 ==0.1.2.0, - any.pipes ==4.3.14, + any.pid1 ==0.1.3.0, + any.pinboard ==0.10.2.0, + any.pipes ==4.3.16, any.pipes-aeson ==0.4.1.8, any.pipes-attoparsec ==0.5.1.5, - any.pipes-binary ==0.4.2, - any.pipes-bytestring ==2.1.6, + any.pipes-binary ==0.4.3, + any.pipes-bytestring ==2.1.7, any.pipes-concurrency ==2.0.12, any.pipes-csv ==1.4.3, any.pipes-extras ==1.0.15, @@ -1671,100 +1829,109 @@ constraints: any.AC-Angle ==1.0, any.pipes-http ==1.0.6, any.pipes-network ==0.6.5, any.pipes-network-tls ==0.4, - any.pipes-ordered-zip ==1.1.0, - any.pipes-parse ==3.0.8, + any.pipes-ordered-zip ==1.2.1, + any.pipes-parse ==3.0.9, any.pipes-random ==1.0.0.5, - any.pipes-safe ==2.3.2, + any.pipes-safe ==2.3.3, any.pipes-wai ==3.2.0, any.pkcs10 ==0.2.0.0, + any.pkgtreediff ==0.4.1, + any.place-cursor-at ==1.0.1, any.placeholders ==0.1, any.plaid ==0.1.0.4, - any.planb-token-introspection ==0.1.4.0, any.plotlyhs ==0.2.1, - any.pointed ==5.0.1, + any.pointed ==5.0.3, any.pointedlist ==0.6.1, - any.pointless-fun ==1.1.0.6, - any.poll ==0.0.0.1, - any.poly ==0.4.0.0, + any.pointless-fun ==1.1.0.8, + any.poll ==0.0.0.2, + any.polling-cache ==0.1.1.0, + any.poly ==0.5.0.0, any.poly-arity ==0.1.0, any.polynomials-bernstein ==1.1.2, any.polyparse ==1.13, - any.polysemy ==1.7.0.0, + any.polysemy ==1.7.1.0, any.polysemy-check ==0.8.1.0, any.polysemy-mocks ==0.2.0.0, any.polysemy-plugin ==0.4.2.0, any.pooled-io ==0.0.2.2, any.port-utils ==0.2.1.0, - any.posix-paths ==0.2.1.6, + any.posix-paths ==0.3.0.0, any.possibly ==1.0.0.0, any.post-mess-age ==0.2.1.0, any.postgres-options ==0.2.0.0, - any.postgresql-binary ==0.12.2, - any.postgresql-libpq ==0.9.4.2, + any.postgresql-binary ==0.12.4.1, + any.postgresql-libpq ==0.9.4.3, + any.postgresql-libpq-notify ==0.2.0.0, any.postgresql-orm ==0.5.1, - any.postgresql-simple ==0.6.2, - any.postgrest ==7.0.0, + any.postgresql-simple ==0.6.4, + any.postgresql-typed ==0.6.2.0, + any.postgrest ==7.0.1, any.pptable ==0.3.0.0, any.pqueue ==1.4.1.3, + any.prairie ==0.0.1.0, any.prefix-units ==0.2.0, any.prelude-compat ==0.0.0.2, - any.prelude-safeenum ==0.1.1.2, + any.prelude-safeenum ==0.1.1.3, any.pretty-class ==1.0.1.1, + any.pretty-diff ==0.4.0.3, any.pretty-hex ==1.1, any.pretty-relative-time ==0.2.0.0, any.pretty-show ==1.10, - any.pretty-simple ==3.2.3.0, + any.pretty-simple ==4.0.0.0, any.pretty-sop ==0.2.0.3, any.pretty-terminal ==0.1.0.0, - any.pretty-types ==0.3.0.1, any.prettyclass ==1.0.0.0, - any.prettyprinter ==1.6.2, - any.prettyprinter-ansi-terminal ==1.1.2, - any.prettyprinter-compat-annotated-wl-pprint ==1, - any.prettyprinter-compat-ansi-wl-pprint ==1.0.1, - any.prettyprinter-compat-wl-pprint ==1.0.0.1, - any.prettyprinter-convert-ansi-wl-pprint ==1.1.1, + any.prettyprinter ==1.7.1, + any.prettyprinter-ansi-terminal ==1.1.3, + any.prettyprinter-compat-annotated-wl-pprint ==1.1, + any.prettyprinter-compat-ansi-wl-pprint ==1.0.2, + any.prettyprinter-compat-wl-pprint ==1.0.1, + any.prettyprinter-convert-ansi-wl-pprint ==1.1.2, + any.prim-uniq ==0.2, any.primes ==0.2.1.0, - any.primitive ==0.7.0.1, + any.primitive ==0.7.3.0, any.primitive-addr ==0.1.0.2, - any.primitive-extras ==0.8, + any.primitive-extras ==0.10.1.1, any.primitive-unaligned ==0.1.1.1, - any.primitive-unlifted ==0.1.2.0, + any.primitive-unlifted ==1.0.0.0, any.print-console-colors ==0.1.0.0, + any.probability ==0.2.7, any.process-extras ==0.7.4, any.product-isomorphic ==0.0.3.3, - any.product-profunctors ==0.10.0.1, + any.product-profunctors ==0.11.0.2, any.profiterole ==0.1, - any.profunctors ==5.5.2, + any.profunctors ==5.6.2, any.project-template ==0.2.1.0, any.projectroot ==0.2.0.1, any.prometheus ==2.2.2, any.prometheus-client ==1.0.1, + any.prometheus-metrics-ghc ==1.0.1.2, + any.prometheus-wai-middleware ==1.0.1.0, any.promises ==0.3, any.prompt ==0.1.1.2, any.prospect ==0.1.0.0, - any.proto-lens ==0.7.0.0, - any.proto-lens-arbitrary ==0.1.2.9, - any.proto-lens-optparse ==0.1.1.7, - any.proto-lens-protobuf-types ==0.7.0.0, - any.proto-lens-protoc ==0.7.0.0, - any.proto-lens-runtime ==0.7.0.0, - any.proto-lens-setup ==0.4.0.4, - any.proto3-wire ==1.1.0, + any.proto-lens ==0.7.1.0, + any.proto-lens-protoc ==0.7.1.0, + any.proto-lens-runtime ==0.7.0.1, + any.proto-lens-setup ==0.4.0.5, + any.proto3-wire ==1.2.2, any.protobuf ==0.2.1.3, - any.protobuf-simple ==0.1.1.0, + any.protobuf-simple ==0.1.1.1, + any.protocol-buffers ==2.4.17, + any.protocol-buffers-descriptor ==2.4.17, any.protocol-radius ==0.0.1.1, any.protocol-radius-test ==0.1.0.1, - any.protolude ==0.2.4, + any.protolude ==0.3.0, any.proxied ==0.3.1, - any.psqueues ==0.2.7.2, + any.psqueues ==0.2.7.3, + any.ptr-poker ==0.1.1.4, any.publicsuffix ==0.20200526, any.pulse-simple ==0.1.14, - any.pureMD5 ==2.1.3, + any.pureMD5 ==2.1.4, any.purescript-bridge ==0.14.0.0, any.pushbullet-types ==0.4.1.0, - any.pusher-http-haskell ==1.5.1.14, - any.pvar ==0.2.0.0, + any.pusher-http-haskell ==2.1.0.7, + any.pvar ==1.0.0.0, any.qchas ==1.1.0.1, any.qm-interpolated-string ==0.3.0.0, any.qrcode-core ==0.9.4, @@ -1772,347 +1939,394 @@ constraints: any.AC-Angle ==1.0, any.quadratic-irrational ==0.1.1, any.quickcheck-arbitrary-adt ==0.3.1.0, any.quickcheck-assertions ==0.3.0, - any.quickcheck-classes ==0.6.4.0, - any.quickcheck-classes-base ==0.6.1.0, - any.quickcheck-instances ==0.3.23, + any.quickcheck-classes ==0.6.5.0, + any.quickcheck-classes-base ==0.6.2.0, + any.quickcheck-higherorder ==0.1.0.0, + any.quickcheck-instances ==0.3.25.2, any.quickcheck-io ==0.2.0, any.quickcheck-simple ==0.1.1.1, any.quickcheck-special ==0.1.0.6, - any.quickcheck-state-machine ==0.6.0, + any.quickcheck-state-machine ==0.7.1, any.quickcheck-text ==0.1.2.1, any.quickcheck-transformer ==0.3.1.1, any.quickcheck-unicode ==1.0.1.0, any.quiet ==0.2, - any.radius ==0.6.1.0, + any.quote-quot ==0.2.0.0, + any.radius ==0.7.1.0, any.rainbow ==0.34.2.2, any.rainbox ==0.26.0.0, - any.ral ==0.1, + any.ral ==0.2, + any.rampart ==1.1.0.4, any.ramus ==0.1.2, any.rando ==0.0.0.4, - any.random ==1.1, - any.random-bytestring ==0.1.3.2, + any.random ==1.2.0, + any.random-bytestring ==0.1.4, + any.random-fu ==0.2.7.7, any.random-shuffle ==0.0.4, + any.random-source ==0.3.0.11, any.random-tree ==0.6.0.5, any.range ==0.3.0.2, any.range-set-list ==0.1.3.1, - any.rank1dynamic ==0.4.0, - any.rank2classes ==1.3.2.1, + any.ranged-list ==0.1.0.0, + any.rank1dynamic ==0.4.1, + any.rank2classes ==1.4.3, any.rasterific-svg ==0.3.3.2, any.rate-limit ==1.4.2, - any.ratel ==1.0.12, - any.ratel-wai ==1.1.3, + any.ratel ==1.0.17, + any.ratel-wai ==1.1.5, + any.rattle ==0.2, + any.rattletrap ==11.1.1, any.raw-strings-qq ==1.1, any.rawfilepath ==0.2.4, any.rawstring-qm ==0.2.3.0, - any.rcu ==0.2.4, - any.rdf ==0.1.0.4, + any.rcu ==0.2.5, + any.rdf ==0.1.0.5, any.rdtsc ==1.3.0.1, any.re2 ==0.3, any.read-editor ==0.1.0.2, any.read-env-var ==1.0.0.0, any.readable ==0.3.1, - any.reanimate ==0.3.3.0, - any.reanimate-svg ==0.9.8.0, - any.rebase ==1.6.1, - any.record-dot-preprocessor ==0.2.6, + any.reanimate ==1.1.4.0, + any.reanimate-svg ==0.13.0.1, + any.rebase ==1.13.1, + any.record-dot-preprocessor ==0.2.13, any.record-hasfield ==1.0, - any.records-sop ==0.1.0.3, - any.recursion-schemes ==5.1.3, + any.record-wrangler ==0.1.1.0, + any.records-sop ==0.1.1.0, + any.recursion-schemes ==5.2.2.2, any.redis-io ==1.1.0, any.redis-resp ==1.0.0, - any.reducers ==3.12.3, - any.ref-fd ==0.4.0.2, + any.reducers ==3.12.4, + any.ref-fd ==0.5, + any.ref-tf ==0.5, any.refact ==0.3.0.2, + any.refined ==0.6.2, any.reflection ==2.1.6, any.reform ==0.2.7.4, any.reform-blaze ==0.2.4.3, any.reform-hamlet ==0.0.5.3, - any.reform-happstack ==0.2.5.3, + any.reform-happstack ==0.2.5.4, any.regex ==1.1.0.0, - any.regex-applicative ==0.3.3.1, + any.regex-applicative ==0.3.4, any.regex-applicative-text ==0.1.0.1, - any.regex-base ==0.94.0.0, - any.regex-compat ==0.95.2.0, + any.regex-base ==0.94.0.2, + any.regex-compat ==0.95.2.1, any.regex-compat-tdfa ==0.95.1.4, any.regex-pcre ==0.95.0.0, - any.regex-pcre-builtin ==0.95.1.2.8.43, - any.regex-posix ==0.96.0.0, - any.regex-tdfa ==1.3.1.0, + any.regex-pcre-builtin ==0.95.2.3.8.44, + any.regex-posix ==0.96.0.1, + any.regex-posix-clib ==2.7, + any.regex-tdfa ==1.3.1.1, any.regex-with-pcre ==1.1.0.0, - any.registry ==0.1.9.3, + any.registry ==0.2.0.3, any.reinterpret-cast ==0.1.0, any.relapse ==1.0.0.0, - any.relational-query ==0.12.2.3, + any.relational-query ==0.12.3.0, any.relational-query-HDBC ==0.7.2.0, any.relational-record ==0.2.2.0, any.relational-schemas ==0.1.8.0, + any.reliable-io ==0.0.1, any.relude ==0.7.0.0, any.renderable ==0.2.0.1, - any.replace-attoparsec ==1.4.1.0, - any.replace-megaparsec ==1.4.2.0, - any.repline ==0.2.2.0, - any.req ==3.2.0, - any.req-conduit ==1.0.0, - any.rerebase ==1.6.1, + any.replace-attoparsec ==1.4.5.0, + any.replace-megaparsec ==1.4.4.0, + any.repline ==0.4.0.0, + any.req ==3.9.0, + any.req-conduit ==1.0.1, + any.rerebase ==1.13.1, + any.rescue ==0.4.2.1, + any.resistor-cube ==0.0.1.2, any.resolv ==0.1.2.0, any.resource-pool ==0.2.3.2, - any.resourcet ==1.2.4.2, + any.resourcet ==1.2.4.3, any.result ==0.2.6.0, any.rethinkdb-client-driver ==0.0.25, any.retry ==0.8.1.2, any.rev-state ==0.1.2, any.rfc1751 ==0.1.3, - any.rfc5051 ==0.1.0.4, - any.rhine ==0.6.0, - any.rhine-gloss ==0.6.0.1, + any.rfc5051 ==0.2, + any.rhbzquery ==0.4.4, + any.rhine ==0.7.0, + any.rhine-gloss ==0.7.0, any.rigel-viz ==0.2.0.0, - any.rio ==0.1.18.0, - any.rio-orphans ==0.1.1.0, + any.rio ==0.1.21.0, + any.rio-orphans ==0.1.2.0, any.rio-prettyprint ==0.1.1.0, any.roc-id ==0.1.0.0, any.rocksdb-haskell ==1.0.1, - any.rocksdb-query ==0.3.2, - any.roles ==0.2.0.0, - any.rope-utf16-splay ==0.3.1.0, + any.rocksdb-haskell-jprupp ==2.1.3, + any.rocksdb-query ==0.4.2, + any.roles ==0.2.1.0, + any.rope-utf16-splay ==0.3.2.0, any.rosezipper ==0.2, any.rot13 ==0.2.0.1, - any.rpmbuild-order ==0.3.1, + any.rp-tree ==0.6, + any.rpm-nvr ==0.1.1, + any.rpmbuild-order ==0.4.5, any.runmemo ==1.0.0.1, + any.rvar ==0.2.0.6, any.safe ==0.3.19, - any.safe-decimal ==0.2.0.0, - any.safe-exceptions ==0.1.7.1, - any.safe-exceptions-checked ==0.1.0, + any.safe-coloured-text ==0.1.0.0, + any.safe-coloured-text-terminfo ==0.0.0.0, + any.safe-decimal ==0.2.1.0, + any.safe-exceptions ==0.1.7.2, any.safe-foldable ==0.1.0.0, - any.safe-json ==1.1.1, - any.safe-money ==0.9, - any.safecopy ==0.10.3, + any.safe-json ==1.1.1.1, + any.safe-money ==0.9.1, + any.safe-tensor ==0.2.1.1, + any.safecopy ==0.10.4.2, any.safeio ==0.0.5.0, - any.salak ==0.3.6, - any.salak-yaml ==0.3.5.3, - any.saltine ==0.1.1.0, - any.salve ==1.0.10, + any.saltine ==0.1.1.1, + any.salve ==1.0.11, any.sample-frame ==0.0.3, any.sample-frame-np ==0.0.4.1, any.sampling ==0.3.5, + any.sandwich ==0.1.0.9, + any.sandwich-quickcheck ==0.1.0.6, + any.sandwich-slack ==0.1.0.6, + any.sandwich-webdriver ==0.1.0.6, any.say ==0.1.0.1, any.sbp ==2.6.3, + any.sbv ==8.15, any.scalpel ==0.6.2, any.scalpel-core ==0.6.2, any.scanf ==0.1.0.0, any.scanner ==0.3.1, - any.scheduler ==1.4.2.3, - any.scientific ==0.3.6.2, - any.scotty ==0.11.6, + any.scheduler ==1.5.0, + any.scientific ==0.3.7.0, + any.scotty ==0.12, any.scrypt ==0.5.0, - any.sdl2 ==2.5.2.0, + any.sdl2 ==2.5.3.0, any.sdl2-gfx ==0.2, any.sdl2-image ==2.0.0, any.sdl2-mixer ==1.1.0, - any.sdl2-ttf ==2.1.1, + any.sdl2-ttf ==2.1.2, any.search-algorithms ==0.3.1, - any.secp256k1-haskell ==0.2.5, + any.secp256k1-haskell ==0.5.0, any.securemem ==0.1.10, any.selda ==0.5.1.0, any.selda-json ==0.1.1.0, - any.selective ==0.4.1.1, + any.selda-postgresql ==0.1.8.1, + any.selda-sqlite ==0.1.7.1, + any.selections ==0.3.0.0, + any.selective ==0.4.2, any.semialign ==1.1.0.1, any.semialign-indexed ==1.1, any.semialign-optics ==1.1, any.semigroupoid-extras ==5, - any.semigroupoids ==5.3.4, - any.semigroups ==0.19.1, + any.semigroupoids ==5.3.6, + any.semigroups ==0.19.2, any.semiring-simple ==1.0.0.1, - any.semirings ==0.5.4, - any.semver ==0.3.4, + any.semirings ==0.6, + any.semver ==0.4.0.1, any.sendfile ==0.7.11.1, + any.sendgrid-v3 ==0.3.0.0, any.seqalign ==0.2.0.4, - any.sequence-formats ==1.4.1, - any.sequenceTools ==1.4.0.5, + any.seqid ==0.6.2, + any.seqid-streams ==0.7.2, + any.sequence-formats ==1.6.1, + any.sequenceTools ==1.5.0, any.serf ==0.1.1.0, - any.serialise ==0.2.3.0, - any.servant-JuicyPixels ==0.3.0.5, - any.servant-auth ==0.3.2.0, + any.serialise ==0.2.4.0, + any.servant-auth ==0.4.0.0, + any.servant-auth-client ==0.4.1.0, any.servant-auth-docs ==0.2.10.0, - any.servant-auth-server ==0.4.5.1, - any.servant-auth-swagger ==0.2.10.0, - any.servant-blaze ==0.9, - any.servant-cassava ==0.10, - any.servant-checked-exceptions ==2.2.0.0, - any.servant-checked-exceptions-core ==2.2.0.0, + any.servant-auth-server ==0.4.6.0, + any.servant-auth-swagger ==0.2.10.1, + any.servant-auth-wordpress ==1.0.0.2, + any.servant-blaze ==0.9.1, any.servant-conduit ==0.15.1, - any.servant-docs ==0.11.4, - any.servant-docs-simple ==0.2.0.1, + any.servant-docs ==0.11.9, any.servant-elm ==0.7.2, any.servant-errors ==0.1.6.0, - any.servant-foreign ==0.15, - any.servant-js ==0.9.4.2, - any.servant-lucid ==0.9, + any.servant-exceptions ==0.2.1, + any.servant-exceptions-server ==0.2.1, + any.servant-foreign ==0.15.4, + any.servant-http-streams ==0.18.3, any.servant-machines ==0.15.1, any.servant-mock ==0.8.7, - any.servant-multipart ==0.11.5, - any.servant-pipes ==0.15.2, - any.servant-purescript ==0.10.0.0, - any.servant-rawm ==0.3.2.0, - any.servant-static-th ==0.2.4.0, - any.servant-subscriber ==0.7.0.0, - any.servant-swagger-ui ==0.3.4.3.36.1, - any.servant-swagger-ui-core ==0.3.3, - any.servant-swagger-ui-redoc ==0.3.3.1.22.3, - any.servant-websockets ==2.0.0, - any.servant-yaml ==0.1.0.1, - any.serverless-haskell ==0.11.3, - any.serversession ==1.0.1, + any.servant-multipart ==0.12.1, + any.servant-multipart-api ==0.12.1, + any.servant-openapi3 ==2.0.1.2, + any.servant-pipes ==0.15.3, + any.servant-rawm ==1.0.0.0, + any.servant-swagger-ui ==0.3.5.3.52.5, + any.servant-swagger-ui-core ==0.3.5, + any.serverless-haskell ==0.12.6, + any.serversession ==1.0.2, any.serversession-frontend-wai ==1.0, any.ses-html ==0.4.0.0, any.set-cover ==0.1.1, any.setenv ==0.1.1.3, - any.setlocale ==1.0.0.9, - any.sexp-grammar ==2.1.0, - any.shake ==0.19.1, - any.shake-plus ==0.1.10.0, + any.setlocale ==1.0.0.10, + any.sexp-grammar ==2.3.3.1, + any.shake ==0.19.6, + any.shake-language-c ==0.12.0, + any.shake-plus ==0.3.4.0, + any.shake-plus-extended ==0.4.1.0, any.shakespeare ==2.0.25, any.shared-memory ==0.2.0.0, - any.shell-conduit ==4.7.0, + any.shell-conduit ==5.0.0, any.shell-escape ==0.2.0, any.shell-utility ==0.1, - any.shellmet ==0.0.3.1, + any.shellmet ==0.0.4.0, any.shelltestrunner ==1.9, any.shelly ==1.9.0, + any.shikensu ==0.3.11, + any.shortcut-links ==0.5.1.1, any.should-not-typecheck ==2.1.0, any.show-combinators ==0.2.0.0, any.siggy-chardust ==1.0.0, any.signal ==0.1.0.4, - any.silently ==1.2.5.1, + any.silently ==1.2.5.2, any.simple-affine-space ==0.1.1, - any.simple-cabal ==0.1.2, - any.simple-cmd ==0.2.2, - any.simple-cmd-args ==0.1.6, + any.simple-cabal ==0.1.3, + any.simple-cmd ==0.2.3, + any.simple-cmd-args ==0.1.7, any.simple-log ==0.9.12, any.simple-reflect ==0.3.3, any.simple-sendfile ==0.2.30, any.simple-templates ==1.0.0, any.simple-vec3 ==0.6.0.1, - any.simplest-sqlite ==0.1.0.2, any.simplistic-generics ==2.0.0, any.since ==0.0.0, any.singleton-bool ==0.1.5, any.singleton-nats ==0.4.5, - any.singletons ==2.6, - any.singletons-presburger ==0.3.0.1, + any.singletons ==2.7, + any.singletons-presburger ==0.6.1.0, any.siphash ==1.0.3, any.sitemap-gen ==0.1.0.0, - any.size-based ==0.1.2.0, - any.sized ==0.4.0.0, + any.sized ==1.0.0.0, any.skein ==1.0.9.4, any.skews ==0.1.0.3, any.skip-var ==0.1.1.0, - any.skylighting ==0.8.5, - any.skylighting-core ==0.8.5, + any.skylighting ==0.10.5.2, + any.skylighting-core ==0.10.5.2, any.slack-api ==0.12, - any.slist ==0.1.1.0, - any.smallcheck ==1.1.7, - any.smash ==0.1.1.0, + any.slack-progressbar ==0.1.0.1, + any.slick ==1.1.2.2, + any.slist ==0.2.0.0, + any.slynx ==0.5.1.1, + any.smallcheck ==1.2.1, + any.smash ==0.1.2, any.smash-aeson ==0.1.0.0, - any.smash-lens ==0.1.0.0, + any.smash-lens ==0.1.0.1, any.smash-microlens ==0.1.0.0, any.smoothie ==0.4.2.11, - any.smtp-mail ==0.2.0.0, + any.smtp-mail ==0.3.0.0, any.snap-blaze ==0.2.1.5, any.snap-core ==1.0.4.2, - any.snap-server ==1.1.1.2, + any.snap-server ==1.1.2.0, any.snowflake ==0.1.1.1, any.soap ==0.2.3.6, + any.soap-openssl ==0.1.0.2, any.soap-tls ==0.1.1.4, + any.socket ==0.8.3.0, any.socks ==0.6.1, - any.some ==1.0.1, + any.some ==1.0.2, any.sop-core ==0.5.0.1, any.sort ==1.0.0.0, any.sorted-list ==0.2.1.0, - any.sourcemap ==0.1.6, + any.sourcemap ==0.1.6.1, any.sox ==0.2.3.1, any.soxlib ==0.0.3.1, + any.spacecookie ==1.0.0.0, any.sparse-linear-algebra ==0.3.1, - any.sparse-tensor ==0.2.1.4, + any.sparse-tensor ==0.2.1.5, any.spatial-math ==0.5.0.1, any.special-values ==0.1.0.0, - any.speculate ==0.4.2, - any.speedy-slice ==0.3.1, + any.speculate ==0.4.10, + any.speedy-slice ==0.3.2, any.splice ==0.6.1.1, + any.splint ==1.0.1.4, any.split ==0.2.3.4, - any.splitmix ==0.0.4, + any.splitmix ==0.1.0.4, + any.splitmix-distributions ==0.9.0.0, any.spoon ==0.3.1, any.spreadsheet ==0.1.3.8, any.sql-words ==0.1.6.4, any.sqlcli ==0.2.2.0, any.sqlcli-odbc ==0.2.0.1, - any.squeather ==0.4.0.0, - any.srcloc ==0.5.1.2, - any.stache ==2.1.1, - any.stack ==2.3.3, + any.sqlite-simple ==0.4.18.0, + any.squeal-postgresql ==0.7.0.1, + any.squeather ==0.8.0.0, + any.srcloc ==0.6, + any.stache ==2.3.0, + any.stack ==2.7.3, any.stack-templatizer ==0.1.0.2, - any.stackcollapse-ghc ==0.0.1.2, - any.starter ==0.3.0, + any.stackcollapse-ghc ==0.0.1.3, any.stateref ==0.3, - any.statestack ==0.3, - any.static-text ==0.2.0.6, + any.static-text ==0.2.0.7, any.statistics ==0.15.2.0, - any.status-notifier-item ==0.3.0.5, + any.status-notifier-item ==0.3.1.0, any.stb-image-redux ==0.2.1.3, any.step-function ==0.2, - any.stm-chans ==3.0.0.4, + any.stm-chans ==3.0.0.6, any.stm-conduit ==4.0.1, - any.stm-containers ==1.1.0.4, + any.stm-containers ==1.2, any.stm-delay ==0.1.1.1, any.stm-extras ==0.1.0.3, - any.stm-hamt ==1.2.0.4, + any.stm-hamt ==1.2.0.6, + any.stm-lifted ==2.5.0.0, any.stm-split ==0.0.2.1, - any.stomp-queue ==0.3.1, - any.stompl ==0.5.0, + any.stomp-queue ==0.5.1, + any.stompl ==0.6.0, any.stopwatch ==0.1.0.6, any.storable-complex ==0.2.3.0, + any.storable-endian ==0.2.6, any.storable-record ==0.0.5, any.storable-tuple ==0.0.3.3, any.storablevector ==0.2.13.1, - any.stratosphere ==0.53.0, + any.store ==0.7.14, + any.store-core ==0.4.4.4, + any.store-streaming ==0.2.0.3, + any.stratosphere ==0.59.1, any.streaming ==0.2.3.0, - any.streaming-bytestring ==0.1.6, - any.streaming-commons ==0.2.2.1, - any.streamly ==0.7.2, - any.streamly-bytestring ==0.1.2, + any.streaming-attoparsec ==1.0.0.1, + any.streaming-bytestring ==0.2.1, + any.streaming-commons ==0.2.2.2, + any.streamly ==0.7.3, any.streams ==3.3, - any.strict ==0.3.2, - any.strict-base-types ==0.6.1, + any.streamt ==0.5.0.0, + any.strict ==0.4.0.1, any.strict-concurrency ==0.2.4.3, - any.strict-list ==0.1.5, - any.strict-tuple ==0.1.3, + any.strict-list ==0.1.6, + any.strict-tuple ==0.1.4, any.strict-tuple-lens ==0.1.0.1, any.string-class ==0.1.7.0, any.string-combinators ==0.6.0.5, any.string-conv ==0.1.2, any.string-conversions ==0.4.0.1, - any.string-interpolate ==0.2.1.0, + any.string-interpolate ==0.3.1.1, any.string-qq ==0.0.4, + any.string-random ==0.1.4.1, any.string-transform ==1.1.1, any.stringbuilder ==0.5.1, any.stringsearch ==0.3.6.6, - any.stripe-concepts ==1.0.2.4, - any.stripe-signature ==1.0.0.6, - any.strive ==5.0.12, - any.structs ==0.1.3, - any.structured ==0.1, - any.structured-cli ==2.5.2.0, - any.stylish-haskell ==0.11.0.3, + any.stripe-concepts ==1.0.3, + any.stripe-core ==2.6.2, + any.stripe-haskell ==2.6.2, + any.stripe-http-client ==2.6.2, + any.strive ==5.0.16, + any.structs ==0.1.6, + any.structured ==0.1.1, + any.structured-cli ==2.7.0.1, + any.subcategories ==0.1.1.0, any.sum-type-boilerplate ==0.1.1, - any.summoner ==2.0.1.1, - any.summoner-tui ==2.0.1.1, any.sundown ==0.6, any.superbuffer ==0.3.1.1, - any.svg-builder ==0.1.1, any.svg-tree ==0.6.2.4, any.swagger ==0.3.0, - any.swagger2 ==2.5, - any.swish ==0.10.0.4, - any.syb ==0.7.1, + any.swagger2 ==2.6, + any.sweet-egison ==0.1.1.3, + any.swish ==0.10.0.8, + any.syb ==0.7.2.1, + any.sydtest ==0.2.0.0, + any.sydtest-discover ==0.0.0.1, + any.sydtest-persistent-sqlite ==0.1.0.0, + any.sydtest-servant ==0.1.0.0, + any.sydtest-wai ==0.1.0.0, + any.sydtest-yesod ==0.1.0.0, any.symbol ==0.2.4, any.symengine ==0.1.2.0, any.symmetry-operations-symbols ==0.0.2.1, @@ -2120,12 +2334,11 @@ constraints: any.AC-Angle ==1.0, any.system-argv0 ==0.1.1, any.system-fileio ==0.3.16.4, any.system-filepath ==0.4.14, - any.system-info ==0.5.1, + any.system-info ==0.5.2, any.systemd ==2.3.0, any.tabular ==0.2.2.8, - any.taffybar ==3.2.2, any.tagchup ==0.4.1.1, - any.tagged ==0.8.6, + any.tagged ==0.8.6.1, any.tagged-binary ==0.2.0.1, any.tagged-identity ==0.1.3, any.tagged-transformer ==0.8.1, @@ -2136,98 +2349,108 @@ constraints: any.AC-Angle ==1.0, tar -old-time, any.tar ==0.5.1.1, any.tar-conduit ==0.3.2, - any.tardis ==0.4.1.0, - any.tasty ==1.2.3, - any.tasty-ant-xml ==1.1.6, - any.tasty-dejafu ==2.0.0.6, - any.tasty-discover ==4.2.1, - any.tasty-expected-failure ==0.11.1.2, - any.tasty-golden ==2.3.3.2, - any.tasty-hedgehog ==1.0.0.2, - any.tasty-hspec ==1.1.5.1, - any.tasty-hunit ==0.10.0.2, + any.tardis ==0.4.3.0, + any.tasty ==1.4.2, + any.tasty-ant-xml ==1.1.8, + any.tasty-bench ==0.2.5, + any.tasty-dejafu ==2.0.0.8, + any.tasty-discover ==4.2.2, + any.tasty-expected-failure ==0.12.3, + any.tasty-focus ==1.0.1, + any.tasty-golden ==2.3.4, + any.tasty-hedgehog ==1.1.0.0, + any.tasty-hspec ==1.1.6, + any.tasty-hunit ==0.10.0.3, + any.tasty-hunit-compat ==0.2.0.1, + any.tasty-inspection-testing ==0.1, any.tasty-kat ==0.0.3, - any.tasty-leancheck ==0.0.1, - any.tasty-lua ==0.2.3, + any.tasty-leancheck ==0.0.2, + any.tasty-lua ==0.2.3.2, any.tasty-program ==1.0.5, - any.tasty-quickcheck ==0.10.1.1, - any.tasty-rerun ==1.1.17, - any.tasty-silver ==3.1.15, - any.tasty-smallcheck ==0.8.1, + any.tasty-quickcheck ==0.10.1.2, + any.tasty-rerun ==1.1.18, + any.tasty-silver ==3.2.3, + any.tasty-smallcheck ==0.8.2, + any.tasty-test-reporter ==0.1.1.4, any.tasty-th ==0.1.7, - any.tasty-wai ==0.1.1.0, + any.tasty-wai ==0.1.1.1, any.tce-conf ==1.3, - any.tdigest ==0.2.1, + any.tdigest ==0.2.1.1, any.template ==0.2.0.10, - any.template-haskell-compat-v0208 ==0.1.5, + any.template-haskell-compat-v0208 ==0.1.7, any.temporary ==1.3, any.temporary-rc ==1.2.0.3, any.temporary-resourcet ==0.1.0.1, any.tensorflow-test ==0.1.0.0, - any.tensors ==0.1.4, + any.tensors ==0.1.5, + any.termbox ==0.3.0, any.terminal-progress-bar ==0.4.1, any.terminal-size ==0.3.2.1, any.test-framework ==0.8.2.0, any.test-framework-hunit ==0.3.0.2, - any.test-framework-leancheck ==0.0.1, + any.test-framework-leancheck ==0.0.4, any.test-framework-quickcheck2 ==0.3.0.5, any.test-framework-smallcheck ==0.2, - any.test-framework-th ==0.2.4, - any.testing-feat ==1.1.0.0, + any.test-fun ==0.1.0.0, any.testing-type-modifiers ==0.1.0.1, - any.texmath ==0.12.0.2, + any.texmath ==0.12.3.2, + any.text-ansi ==0.1.1, any.text-binary ==0.2.1.1, - any.text-builder ==0.6.6.1, - any.text-conversions ==0.3.0, + any.text-builder ==0.6.6.3, + any.text-conversions ==0.3.1, any.text-format ==0.3.2, - any.text-icu ==0.7.0.1, + any.text-icu ==0.7.1.0, any.text-icu-translit ==0.1.0.7, any.text-latin1 ==0.3.1, - any.text-ldap ==0.1.1.13, - any.text-manipulate ==0.2.0.1, - any.text-metrics ==0.3.0, + any.text-ldap ==0.1.1.14, + any.text-manipulate ==0.3.0.0, + any.text-metrics ==0.3.1, any.text-postgresql ==0.0.3.1, - any.text-printer ==0.5.0.1, + any.text-printer ==0.5.0.2, + any.text-regex-replace ==0.1.1.4, any.text-region ==0.3.1.0, any.text-short ==0.1.3, - any.text-show ==3.8.5, - any.text-show-instances ==3.8.3, - any.text-zipper ==0.10.1, + any.text-show ==3.9.2, + any.text-show-instances ==3.8.4, + any.text-zipper ==0.11, any.textlocal ==0.1.0.5, any.tf-random ==0.5, - any.tfp ==1.0.1.1, - any.th-abstraction ==0.3.2.0, + any.tfp ==1.0.2, + any.th-abstraction ==0.4.3.0, any.th-bang-compat ==0.0.1.0, + any.th-compat ==0.1.3, any.th-constraint-compat ==0.0.1.0, any.th-data-compat ==0.1.0.0, - any.th-desugar ==1.10, - any.th-env ==0.1.0.2, - any.th-expand-syns ==0.4.6.0, - any.th-extras ==0.0.0.4, - any.th-lift ==0.8.1, - any.th-lift-instances ==0.1.17, + any.th-desugar ==1.11, + any.th-env ==0.1.0.3, + any.th-expand-syns ==0.4.8.0, + any.th-extras ==0.0.0.5, + any.th-lift ==0.8.2, + any.th-lift-instances ==0.1.18, any.th-nowq ==0.1.0.5, - any.th-orphans ==0.13.10, + any.th-orphans ==0.13.12, any.th-printf ==0.7, any.th-reify-compat ==0.0.1.5, - any.th-reify-many ==0.1.9, + any.th-reify-many ==0.1.10, any.th-strict-compat ==0.1.0.1, - any.th-test-utils ==1.0.2, + any.th-test-utils ==1.1.1, + any.th-utilities ==0.2.4.3, any.these ==1.1.1.1, - any.these-lens ==1.0.0.1, - any.these-optics ==1, + any.these-lens ==1.0.1.2, + any.these-optics ==1.0.1.2, + any.these-skinny ==0.7.4, any.thread-hierarchy ==0.3.0.2, any.thread-local-storage ==0.2, - any.thread-supervisor ==0.1.0.1, + any.thread-supervisor ==0.2.0.0, any.threads ==0.5.1.6, - any.threepenny-gui ==0.9.0.0, + any.threepenny-gui ==0.9.1.0, any.throttle-io-stream ==0.2.0.1, any.through-text ==0.1.0.0, any.throwable-exceptions ==0.1.0.9, any.thyme ==0.3.5.5, - any.tidal ==1.5.2, + any.tidal ==1.7.8, any.tile ==0.3.0.0, - any.time-compat ==1.9.3, + any.time-compat ==1.9.5, any.time-lens ==0.4.0.2, time-locale-compat -old-locale, any.time-locale-compat ==0.1.1.5, @@ -2237,175 +2460,195 @@ constraints: any.AC-Angle ==1.0, any.time-units ==1.0.0, any.timeit ==2.0, any.timelens ==0.2.0.2, - any.timerep ==2.0.0.2, + any.timer-wheel ==0.3.0, + any.timerep ==2.0.1.0, any.timezone-olson ==0.2.0, any.timezone-series ==0.1.9, any.tinylog ==0.15.0, any.titlecase ==1.0.1, - any.tldr ==0.6.4, + any.tldr ==0.9.2, any.tls ==1.5.5, any.tls-debug ==0.4.8, any.tls-session-manager ==0.0.4, + any.tlynx ==0.5.1.1, any.tmapchan ==0.0.3, any.tmapmvar ==0.0.4, any.tmp-postgres ==1.34.1.0, - any.tomland ==1.3.0.0, - any.tonalude ==0.1.1.0, + any.tomland ==1.3.2.0, + any.tonalude ==0.1.1.1, any.topograph ==1.0.0.1, any.torsor ==0.1, any.tostring ==0.2.1.1, - any.tracing ==0.0.5.1, + any.tracing ==0.0.7.2, any.transaction ==0.1.1.3, - any.transformers-base ==0.4.5.2, + any.transformers-base ==0.4.6, any.transformers-bifunctors ==0.1, transformers-compat +five-three, - any.transformers-compat ==0.6.5, + any.transformers-compat ==0.6.6, any.transformers-fix ==1.0, - any.traverse-with-class ==1.0.1.0, - any.tree-diff ==0.1, + any.traverse-with-class ==1.0.1.1, + any.tree-diff ==0.2.1, any.tree-fun ==0.8.1.0, - any.trifecta ==2.1, + any.tree-view ==0.5.1, + any.trifecta ==2.1.2, any.triplesec ==0.2.2.1, - any.trivial-constraint ==0.6.0.0, + any.trivial-constraint ==0.7.0.0, any.tsv2csv ==0.1.0.2, - any.ttc ==0.2.2.0, + any.ttc ==1.1.0.2, any.ttl-hashtables ==1.4.1.0, - any.ttrie ==0.1.2.1, + any.ttrie ==0.1.2.2, any.tuple ==0.3.0.2, any.tuple-sop ==0.3.1.0, any.tuple-th ==0.2.5, any.tuples-homogenous-h98 ==0.1.1.0, - any.turtle ==1.5.20, + any.turtle ==1.5.23, any.type-equality ==1, any.type-errors ==0.2.0.0, - any.type-errors-pretty ==0.0.1.1, - any.type-fun ==0.1.1, + any.type-errors-pretty ==0.0.1.2, any.type-hint ==0.1, any.type-level-integers ==0.0.1, any.type-level-kv-list ==1.1.0, + any.type-level-natural-number ==2.0, any.type-level-numbers ==0.1.1.1, any.type-map ==0.1.6.0, - any.type-natural ==0.8.3.1, - any.type-of-html ==1.5.1.0, + any.type-natural ==1.1.0.0, + any.type-of-html ==1.6.2.0, any.type-of-html-static ==0.1.0.2, any.type-operators ==0.2.0.0, any.type-spec ==0.4.0.0, - any.typed-process ==0.2.6.0, - any.typed-uuid ==0.0.0.2, - any.typenums ==0.1.2.1, + any.typecheck-plugin-nat-simple ==0.1.0.2, + any.typed-process ==0.2.7.0, + any.typed-uuid ==0.1.0.0, + any.typelits-witnesses ==0.4.0.0, + any.typenums ==0.1.4, any.typerep-map ==0.3.3.0, - any.tzdata ==0.1.20190911.0, - any.ua-parser ==0.7.5.1, + any.tzdata ==0.2.20201021.0, + any.ua-parser ==0.7.6.0, any.uglymemo ==0.1.0.1, - any.ulid ==0.3.0.0, any.unagi-chan ==0.4.1.3, - any.unbounded-delays ==0.1.1.0, + any.unbounded-delays ==0.1.1.1, any.unboxed-ref ==0.4.0.0, - any.unboxing-vector ==0.1.1.0, + any.unboxing-vector ==0.2.0.0, + any.uncaught-exception ==0.1.0, any.uncertain ==0.3.1.0, any.unconstrained ==0.1.0.2, any.unexceptionalio ==0.5.1, any.unexceptionalio-trans ==0.5.1, any.unicode ==0.0.1.1, - any.unicode-show ==0.1.0.4, - any.unicode-transforms ==0.3.7, - any.unification-fd ==0.10.0.1, + any.unicode-collation ==0.1.3.1, + any.unicode-show ==0.1.1.0, + any.unicode-transforms ==0.3.7.1, + any.unification-fd ==0.11.1, + any.union-angle ==0.1.0.1, any.union-find ==0.2, - any.uniplate ==1.6.12, + any.unipatterns ==0.0.0.0, + any.uniplate ==1.6.13, any.uniprot-kb ==0.1.2.0, - any.uniq-deep ==1.2.0, - any.unique ==0, + any.uniq-deep ==1.2.1, + any.unique ==0.0.1, any.unique-logic ==0.4, any.unique-logic-tf ==0.5.1, any.unit-constraint ==0.0.0, - any.universe ==1.2, - any.universe-base ==1.1.1, + any.universe ==1.2.1, + any.universe-base ==1.1.2, + any.universe-dependent-sum ==1.3, any.universe-instances-base ==1.1, - any.universe-instances-extended ==1.1.1, + any.universe-instances-extended ==1.1.2, any.universe-instances-trans ==1.1, - any.universe-reverse-instances ==1.1, - any.universe-some ==1.2, - any.universum ==1.6.1, - any.unix-bytestring ==0.3.7.3, - any.unix-compat ==0.5.2, + any.universe-reverse-instances ==1.1.1, + any.universe-some ==1.2.1, + any.universum ==1.7.2, + any.unix-bytestring ==0.3.7.6, + any.unix-compat ==0.5.3, any.unix-time ==0.4.7, - any.unliftio ==0.2.13, - any.unliftio-core ==0.1.2.0, + any.unliftio ==0.2.20, + any.unliftio-core ==0.2.0.1, any.unliftio-pool ==0.2.1.1, + any.unliftio-streams ==0.1.1.1, any.unlit ==0.4.0.0, - any.unordered-containers ==0.2.10.0, - any.unordered-intmap ==0.1.1, + any.unordered-containers ==0.2.15.0, any.unsafe ==0.0, any.urbit-hob ==0.3.3, - any.uri-bytestring ==0.3.2.2, + any.uri-bytestring ==0.3.3.1, any.uri-bytestring-aeson ==0.1.0.8, - any.uri-encode ==1.5.0.6, + any.uri-encode ==1.5.0.7, any.url ==2.1.3, any.users ==0.5.0.0, any.utf8-conversions ==0.1.0.4, any.utf8-light ==0.4.2, - any.utf8-string ==1.0.1.1, + any.utf8-string ==1.0.2, any.util ==0.1.17.1, - any.utility-ht ==0.0.15, - any.uuid ==1.3.13, - any.uuid-types ==1.0.3, - any.validation ==1.1, - any.validation-selective ==0.1.0.0, - any.validity ==0.11.0.0, + any.utility-ht ==0.0.16, + any.uuid ==1.3.15, + any.uuid-types ==1.0.5, + any.validation ==1.1.2, + any.validation-selective ==0.1.0.1, + any.validity ==0.11.0.1, any.validity-aeson ==0.2.0.4, any.validity-bytestring ==0.4.1.1, any.validity-containers ==0.5.0.4, any.validity-path ==0.4.0.1, + any.validity-persistent ==0.0.0.0, any.validity-primitive ==0.0.0.1, any.validity-scientific ==0.2.0.3, any.validity-text ==0.3.1.1, - any.validity-time ==0.3.0.0, + any.validity-time ==0.4.0.0, any.validity-unordered-containers ==0.2.0.3, any.validity-uuid ==0.1.0.3, any.validity-vector ==0.2.0.3, any.valor ==0.1.0.0, - any.vault ==0.3.1.4, - any.vec ==0.3, - any.vector ==0.12.1.2, - any.vector-algorithms ==0.8.0.3, - any.vector-binary-instances ==0.2.5.1, + any.vault ==0.3.1.5, + any.vcs-ignore ==0.0.1.0, + any.vec ==0.4, + any.vector ==0.12.3.1, + any.vector-algorithms ==0.8.0.4, + any.vector-binary-instances ==0.2.5.2, any.vector-buffer ==0.4.1, - any.vector-builder ==0.3.8, + any.vector-builder ==0.3.8.2, any.vector-bytes-instances ==0.1.1, + any.vector-circular ==0.1.3, any.vector-instances ==3.4, any.vector-mmap ==0.0.3, - any.vector-rotcev ==0.1.0.0, - any.vector-sized ==1.4.2, + any.vector-rotcev ==0.1.0.1, + any.vector-sized ==1.4.4, any.vector-space ==0.16, any.vector-split ==1.0.0.2, - any.vector-th-unbox ==0.2.1.7, + any.vector-th-unbox ==0.2.2, any.verbosity ==0.4.0.0, - any.versions ==3.5.4, + any.versions ==5.0.0, any.vformat ==0.14.1.0, any.vformat-aeson ==0.1.0.1, any.vformat-time ==0.1.0.0, + any.vinyl ==0.13.3, any.void ==0.7.3, - any.vty ==5.28.2, - any.wai ==3.2.2.1, + any.vty ==5.33, + any.wai ==3.2.3, any.wai-app-static ==3.1.7.2, any.wai-conduit ==3.0.0.4, any.wai-cors ==0.2.7, any.wai-enforce-https ==0.0.2.1, any.wai-eventsource ==3.0.0, - any.wai-extra ==3.0.29.2, + any.wai-extra ==3.1.7, + any.wai-feature-flags ==0.1.0.2, any.wai-handler-launch ==3.0.3.1, any.wai-logger ==2.3.6, + any.wai-middleware-auth ==0.2.5.1, any.wai-middleware-caching ==0.1.0.2, any.wai-middleware-clacks ==0.1.0.1, any.wai-middleware-gunzip ==0.0.2, - any.wai-middleware-static ==0.8.3, + any.wai-middleware-static ==0.9.1, any.wai-predicates ==1.0.0, + any.wai-rate-limit ==0.1.0.0, + any.wai-rate-limit-redis ==0.1.0.0, any.wai-route ==0.4.0, + any.wai-saml2 ==0.2.1.2, any.wai-session ==0.3.3, + any.wai-session-redis ==0.1.0.4, any.wai-slack-middleware ==0.2.0, any.wai-websockets ==3.0.1.2, + any.wakame ==0.1.0.0, any.warp ==3.3.17, - any.warp-tls ==3.2.12, + any.warp-tls ==3.3.2, any.warp-tls-uid ==0.2.0.6, any.wave ==0.2.0, any.wcwidth ==0.0.2, @@ -2413,21 +2656,22 @@ constraints: any.AC-Angle ==1.0, any.webex-teams-api ==0.2.0.1, any.webex-teams-conduit ==0.2.0.1, any.webex-teams-pipes ==0.2.0.1, + any.webgear-server ==0.2.1, any.webrtc-vad ==0.1.0.3, - any.websockets ==0.12.7.1, + any.websockets ==0.12.7.3, any.websockets-snap ==0.10.3.1, any.weigh ==0.0.16, - any.wide-word ==0.1.1.1, - any.wikicfp-scraper ==0.1.0.11, - any.wild-bind ==0.1.2.6, - any.wild-bind-x11 ==0.2.0.10, + any.wide-word ==0.1.1.2, + any.wikicfp-scraper ==0.1.0.12, + any.wild-bind ==0.1.2.7, + any.wild-bind-x11 ==0.2.0.13, windns +allow-non-windows, any.windns ==0.1.0.1, + any.witch ==0.3.4.0, any.with-location ==0.1.0, - any.with-utf8 ==1.0.2.1, - any.witherable-class ==0, - any.within ==0.1.1.0, - any.witness ==0.4, + any.with-utf8 ==1.0.2.3, + any.witherable ==0.4.2, + any.within ==0.2.0.1, any.wizards ==1.0.3, any.wl-pprint-annotated ==0.1.0.1, any.wl-pprint-console ==0.1.0.2, @@ -2436,34 +2680,33 @@ constraints: any.AC-Angle ==1.0, any.word-wrap ==0.4.1, any.word24 ==2.0.1, any.word8 ==0.1.3, + any.wordpress-auth ==1.0.0.1, any.world-peace ==1.0.2.0, any.wrap ==0.0.0, - any.wreq ==0.5.3.2, + any.wreq ==0.5.3.3, any.writer-cps-exceptions ==0.1.0.1, any.writer-cps-mtl ==0.1.1.6, any.writer-cps-transformers ==0.5.6.1, any.wss-client ==0.3.0.0, - any.wuss ==1.1.17, + any.wuss ==1.1.18, any.x11-xim ==0.0.9.0, any.x509 ==1.7.5, any.x509-system ==1.6.6, any.x509-validation ==1.6.11, any.xdg-basedir ==0.2.2, - any.xdg-desktop-entry ==0.1.1.1, any.xdg-userdirs ==0.1.0.2, - any.xeno ==0.4.2, - any.xls ==0.1.3, - any.xlsx ==0.8.1, + any.xeno ==0.4.3, + any.xlsx ==0.8.4, any.xlsx-tabular ==0.2.2.1, any.xml ==1.3.14, any.xml-basic ==0.1.3.1, - any.xml-conduit ==1.9.0.0, + any.xml-conduit ==1.9.1.1, any.xml-conduit-writer ==0.1.1.2, any.xml-hamlet ==0.5.0.1, any.xml-helpers ==1.0.0, any.xml-html-qq ==0.1.0.1, any.xml-indexed-cursor ==0.1.1.0, - any.xml-lens ==0.2, + any.xml-lens ==0.3, any.xml-picklers ==0.3.6, any.xml-to-json ==2.0.1, any.xml-to-json-fast ==2.0.0, @@ -2471,46 +2714,51 @@ constraints: any.AC-Angle ==1.0, any.xmlgen ==0.6.2.2, any.xmonad ==0.15, any.xmonad-contrib ==0.16, - any.xmonad-extras ==0.15.2, + any.xmonad-extras ==0.15.3, any.xss-sanitize ==0.3.6, - any.xturtle ==0.2.0.0, any.xxhash-ffi ==0.2.0.0, - any.yaml ==0.11.5.0, - any.yamlparse-applicative ==0.1.0.1, + any.yaml ==0.11.7.0, + any.yamlparse-applicative ==0.2.0.1, any.yes-precure5-command ==5.5.3, - any.yesod ==1.6.1.0, - any.yesod-auth ==1.6.10, - any.yesod-auth-fb ==1.10.1, - any.yesod-auth-hashdb ==1.7.1.2, - any.yesod-bin ==1.6.0.6, - any.yesod-core ==1.6.18, + any.yesod ==1.6.1.2, + any.yesod-auth ==1.6.10.5, + any.yesod-auth-hashdb ==1.7.1.7, + any.yesod-auth-oauth2 ==0.6.3.4, + any.yesod-bin ==1.6.1, + any.yesod-core ==1.6.21.0, any.yesod-fb ==0.6.1, - any.yesod-form ==1.6.7, - any.yesod-form-bootstrap4 ==3.0.0, - any.yesod-gitrev ==0.2.1, + any.yesod-form ==1.7.0, + any.yesod-gitrev ==0.2.2, + any.yesod-markdown ==0.12.6.12, any.yesod-newsfeed ==1.7.0.0, - any.yesod-persistent ==1.6.0.4, - any.yesod-recaptcha2 ==1.0.1, + any.yesod-page-cursor ==2.0.0.9, + any.yesod-paginator ==1.1.1.0, + any.yesod-persistent ==1.6.0.7, any.yesod-sitemap ==1.6.0, any.yesod-static ==1.6.1.0, - any.yesod-test ==1.6.10, - any.yesod-websockets ==0.3.0.2, + any.yesod-test ==1.6.12, + any.yesod-websockets ==0.3.0.3, any.yi-rope ==0.11, any.yjsvg ==0.2.0.1, any.yjtools ==0.9.18, any.yoga ==0.0.0.5, any.youtube ==0.2.1.1, - any.zasni-gerna ==0.0.7.1, + any.zenacy-html ==2.0.4, + any.zenacy-unicode ==1.0.1, any.zero ==0.1.5, any.zeromq4-haskell ==0.8.0, any.zeromq4-patterns ==0.3.1.0, any.zim-parser ==0.2.1.0, - any.zip ==1.5.0, + any.zio ==0.1.0.2, + any.zip ==1.7.2, any.zip-archive ==0.4.1, - any.zip-stream ==0.2.0.1, - any.zippers ==0.3, - any.zlib ==0.6.2.2, + any.zip-stream ==0.2.1.0, + any.zipper-extra ==0.1.3.2, + any.zippers ==0.3.2, + any.zlib ==0.6.2.3, any.zlib-bindings ==0.1.1.5, any.zlib-lens ==0.1.2.1, any.zot ==0.0.3, - any.zstd ==0.1.2.0 + any.zstd ==0.1.3.0, + any.ztail ==1.2.0.2, + any.zydiskell ==0.2.0.0 diff --git a/dev-packages.nix b/dev-packages.nix index 3747cc9ae2..2e227b9b1f 100644 --- a/dev-packages.nix +++ b/dev-packages.nix @@ -55,11 +55,11 @@ let pname = "stack"; version = "2.3.1"; - darwinAmd64Url = "https://github.com/commercialhaskell/stack/releases/download/v2.3.1/stack-2.3.1-osx-x86_64.tar.gz"; - darwinAmd64Sha256 = "089nrb8mxf76a0r0hdccaxfvx1ly24b5zc0cy05gs4adybjygvkk"; + darwinAmd64Url = "https://github.com/commercialhaskell/stack/releases/download/v2.7.3/stack-2.7.3-osx-x86_64.tar.gz"; + darwinAmd64Sha256 = "0c7yx670h1qi2g5l4xx9s4552pz77k31lhjjd2rafi5g00501ra2"; - linuxAmd64Url = "https://github.com/commercialhaskell/stack/releases/download/v2.3.1/stack-2.3.1-linux-x86_64-static.tar.gz"; - linuxAmd64Sha256 = "0iqfqcd88rvlwgm2h8avs0rsi9f3pdxilvcacgrxskb1n8q8ibjb"; + linuxAmd64Url = "https://github.com/commercialhaskell/stack/releases/download/v2.7.3/stack-2.7.3-linux-x86_64-static.tar.gz"; + linuxAmd64Sha256 = "sha256-xbziTe+isrhvG7sUvtTx7oO+wUxu2fzIEXTVRz+/NFA="; }; helm = staticBinaryInTarball { @@ -120,7 +120,7 @@ let pkgs.gawk pkgs.git - pkgs.haskell.compiler.ghc884 + pkgs.haskell.compiler.ghc8107 pkgs.protobuf pkgs.cryptobox @@ -163,7 +163,7 @@ in pkgs.cfssl pkgs.docker-compose pkgs.gnumake - pkgs.haskell-language-server + (pkgs.haskell-language-server.override {supportedGhcVersions = ["8107"];}) pkgs.jq pkgs.ormolu pkgs.telepresence @@ -187,4 +187,18 @@ in # We don't use pkgs.cabal-install here, as we invoke it with a wrapper # which sets LD_LIBRARY_PATH and others correctly. cabal-wrapper + pkgs.haskellPackages.implicit-hie + + # HLS needs these, TODO: extract variable and use for both cabal-wrapper and here. + pkgs.cryptobox + pkgs.geoip + pkgs.icu.out + pkgs.libsodium.out + pkgs.libxml2.out + pkgs.ncurses.out + pkgs.openssl.out + pkgs.pcre.out + pkgs.snappy.out + pkgs.zlib.out + pkgs.lzma.out ] diff --git a/libs/api-bot/api-bot.cabal b/libs/api-bot/api-bot.cabal index 5edff02e24..e7d323890e 100644 --- a/libs/api-bot/api-bot.cabal +++ b/libs/api-bot/api-bot.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 75d171e4af4336949458672c5c82f2cc7fb00e0e5ef4823cb10692f903396df1 +-- hash: e1d75e3473601a708c1154cd12e54b8990937ab09168ea17d8359c4573dd5987 name: api-bot version: 0.4.2 @@ -36,7 +36,46 @@ library Paths_api_bot hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: HaskellNet >=0.5 diff --git a/libs/api-client/api-client.cabal b/libs/api-client/api-client.cabal index 0401f2be7d..810e6bd5fc 100644 --- a/libs/api-client/api-client.cabal +++ b/libs/api-client/api-client.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: d476963623ad1a6ebc3261c3e3abea13a40f95682c9d0a696fb423037fc6360b +-- hash: 55c2d2915aedb6a1fffd5a9cf920729e473ce67d106d456c5f499572967e8034 name: api-client version: 0.4.2 @@ -35,7 +35,46 @@ library Paths_api_client hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: aeson >=0.11 diff --git a/libs/bilge/bilge.cabal b/libs/bilge/bilge.cabal index ca21e9ed25..443c91a643 100644 --- a/libs/bilge/bilge.cabal +++ b/libs/bilge/bilge.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 8edb13a7bddfafe7d2906bff5e3671bd529be1c1726e113907c70a373cfc2606 +-- hash: 35c665e33076366baa18f5cac9e0d715b8d137004bf07f93b69eb9ae99c93195 name: bilge version: 0.22.0 @@ -35,7 +35,46 @@ library Paths_bilge hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: aeson >=0.6 diff --git a/libs/brig-types/brig-types.cabal b/libs/brig-types/brig-types.cabal index 2ce16e1991..f7dad9b128 100644 --- a/libs/brig-types/brig-types.cabal +++ b/libs/brig-types/brig-types.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 42d648b07cd5a5d45e2ca36fd4631c37047fc74aea88fce77073a3efa99327a2 +-- hash: 7d28adb77d06047d2fb59e1470865a151254230ed48075e7ea0d68d35366147c name: brig-types version: 1.35.0 @@ -45,7 +45,46 @@ library Paths_brig_types hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields build-depends: QuickCheck >=2.9 @@ -80,7 +119,46 @@ test-suite brig-types-tests Paths_brig_types hs-source-dirs: test/unit - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-N build-depends: QuickCheck >=2.9 diff --git a/libs/cargohold-types/cargohold-types.cabal b/libs/cargohold-types/cargohold-types.cabal index 6626e3dd6f..e84280c1ee 100644 --- a/libs/cargohold-types/cargohold-types.cabal +++ b/libs/cargohold-types/cargohold-types.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 6e7a4ce0ec22392573f2b2764073d89b1096322eff38e0af765761e6bb2257a2 +-- hash: 4c0158ab09e984777b40e17285413a2673ba8407dd4dde0067675c3cc1c443cd name: cargohold-types version: 1.5.0 @@ -26,7 +26,46 @@ library Paths_cargohold_types hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: base ==4.* diff --git a/libs/cassandra-util/cassandra-util.cabal b/libs/cassandra-util/cassandra-util.cabal index d68adc8251..cc43fe634a 100644 --- a/libs/cassandra-util/cassandra-util.cabal +++ b/libs/cassandra-util/cassandra-util.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 0e7f101562d82c7e04fbc1824f5bc9ef427915eacf3bd7370a2412a016a022be +-- hash: a517eff209060dd72d3ddfdf3d5af57021c95a989da62cca8c98584144cbb7e3 name: cassandra-util version: 0.16.5 @@ -29,7 +29,46 @@ library Paths_cassandra_util hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: aeson >=0.7 diff --git a/libs/deriving-swagger2/deriving-swagger2.cabal b/libs/deriving-swagger2/deriving-swagger2.cabal index 258c590d50..1f2e7539bb 100644 --- a/libs/deriving-swagger2/deriving-swagger2.cabal +++ b/libs/deriving-swagger2/deriving-swagger2.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 70e4168ab448671990c8ab35db93f44679a06283813db5aeb53fe33442d4ecac +-- hash: 314df46c4097fb6a56f853e430a9148ccc7ee76375387bec6d03b68c1827f51f name: deriving-swagger2 version: 0.1.0 @@ -24,10 +24,49 @@ library Paths_deriving_swagger2 hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: - base >=4 && <5 + base ==4.* , extra , imports , swagger2 >=0.6 diff --git a/libs/dns-util/dns-util.cabal b/libs/dns-util/dns-util.cabal index 023ad5af62..21f4edea14 100644 --- a/libs/dns-util/dns-util.cabal +++ b/libs/dns-util/dns-util.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: eb1c3d83585fec582c135dbe676c68498f2546468581882f07fdba8f0d16aec3 +-- hash: b01e42f1b5b715a9443bb5579232b59dc299958ace467135606df095a90c2f2e name: dns-util version: 0.1.0 @@ -27,7 +27,46 @@ library Paths_dns_util hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: base >=4.6 && <5.0 @@ -45,7 +84,46 @@ test-suite spec Paths_dns_util hs-source-dirs: test - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-N build-tool-depends: hspec-discover:hspec-discover diff --git a/libs/extended/extended.cabal b/libs/extended/extended.cabal index aee67e062f..b3070542fe 100644 --- a/libs/extended/extended.cabal +++ b/libs/extended/extended.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 3aab57e8600541201e0b0f8cd7308f624eb479a4f5601e800399b4787656c449 +-- hash: 380f8ec2858bc5b11252ece06a472e4458f97cff4803d261b6d9624d2d0793bf name: extended version: 0.1.0 @@ -30,7 +30,46 @@ library Paths_extended hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: aeson @@ -61,7 +100,46 @@ test-suite extended-tests Paths_extended hs-source-dirs: test - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-N build-tool-depends: hspec-discover:hspec-discover diff --git a/libs/galley-types/galley-types.cabal b/libs/galley-types/galley-types.cabal index 60a176f4a1..ace5070f04 100644 --- a/libs/galley-types/galley-types.cabal +++ b/libs/galley-types/galley-types.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: ccecf8384a3050034fc05928ae9bd039006f4479289f73de11832052791a691f +-- hash: fa648be72eab493846729545f4f4ec2a9cdc0f69add8e39150054510a9e9ac24 name: galley-types version: 0.81.0 @@ -33,12 +33,51 @@ library Paths_galley_types hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: QuickCheck , aeson >=0.6 - , base >=4 && <5 + , base ==4.* , bytestring , bytestring-conversion , containers >=0.5 @@ -68,7 +107,46 @@ test-suite galley-types-tests Paths_galley_types hs-source-dirs: test/unit - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-N build-depends: QuickCheck diff --git a/libs/gundeck-types/gundeck-types.cabal b/libs/gundeck-types/gundeck-types.cabal index 50727bb802..021a011e80 100644 --- a/libs/gundeck-types/gundeck-types.cabal +++ b/libs/gundeck-types/gundeck-types.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: f194c41b1f0f872204ed3e86abc49b16601caef978949cee922fe4fa08cd7b89 +-- hash: dba11fae094eb5ca67d599427dc30c857a0263eb293cf917e14442c7101bdb97 name: gundeck-types version: 1.45.0 @@ -31,12 +31,51 @@ library Paths_gundeck_types hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: aeson >=0.6 , attoparsec >=0.10 - , base >=4 && <5 + , base ==4.* , bytestring >=0.10 , bytestring-conversion >=0.2 , containers >=0.5 diff --git a/libs/hscim/hscim.cabal b/libs/hscim/hscim.cabal index d9c9a0732e..381f3bc093 100644 --- a/libs/hscim/hscim.cabal +++ b/libs/hscim/hscim.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 8daa0bcbe43125e8d9749dd38e62f67cb01f62a1bcd57a0391e684860203e60c +-- hash: cca3008213a478b2de914ed4e3bb1946613cc6cf4103168bacbe9b002e73764b name: hscim version: 0.3.6 @@ -69,7 +69,23 @@ library Paths_hscim hs-source-dirs: src - default-extensions: ConstraintKinds DataKinds DeriveFunctor DeriveGeneric FlexibleContexts FlexibleInstances KindSignatures LambdaCase MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeApplications TypeFamilies TypeOperators TypeSynonymInstances + default-extensions: + ConstraintKinds + DataKinds + DeriveFunctor + DeriveGeneric + FlexibleContexts + FlexibleInstances + KindSignatures + LambdaCase + MultiParamTypeClasses + OverloadedStrings + RankNTypes + ScopedTypeVariables + TypeApplications + TypeFamilies + TypeOperators + TypeSynonymInstances ghc-options: -Wall -Werror build-depends: aeson >=1.4.5 && <1.5 @@ -118,7 +134,23 @@ executable hscim-server Paths_hscim hs-source-dirs: server - default-extensions: ConstraintKinds DataKinds DeriveFunctor DeriveGeneric FlexibleContexts FlexibleInstances KindSignatures LambdaCase MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeApplications TypeFamilies TypeOperators TypeSynonymInstances + default-extensions: + ConstraintKinds + DataKinds + DeriveFunctor + DeriveGeneric + FlexibleContexts + FlexibleInstances + KindSignatures + LambdaCase + MultiParamTypeClasses + OverloadedStrings + RankNTypes + ScopedTypeVariables + TypeApplications + TypeFamilies + TypeOperators + TypeSynonymInstances ghc-options: -Wall -Werror -threaded -rtsopts -with-rtsopts=-N build-depends: aeson >=1.4.5 && <1.5 @@ -183,7 +215,23 @@ test-suite spec Paths_hscim hs-source-dirs: test - default-extensions: ConstraintKinds DataKinds DeriveFunctor DeriveGeneric FlexibleContexts FlexibleInstances KindSignatures LambdaCase MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeApplications TypeFamilies TypeOperators TypeSynonymInstances + default-extensions: + ConstraintKinds + DataKinds + DeriveFunctor + DeriveGeneric + FlexibleContexts + FlexibleInstances + KindSignatures + LambdaCase + MultiParamTypeClasses + OverloadedStrings + RankNTypes + ScopedTypeVariables + TypeApplications + TypeFamilies + TypeOperators + TypeSynonymInstances ghc-options: -Wall -Werror -threaded -rtsopts -with-rtsopts=-N build-tool-depends: hspec-discover:hspec-discover diff --git a/libs/imports/imports.cabal b/libs/imports/imports.cabal index 5a7862cd30..10933ff8a2 100644 --- a/libs/imports/imports.cabal +++ b/libs/imports/imports.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 5bcdd74f4b3651bbe5b4f894d0e285677e39b1f7c4ae2992bcad1fbe3ad9310c +-- hash: 09458f8cad6c5214c9692291bb633f780944463c5690e2af99d7e516dc93e0f2 name: imports version: 0.1.0 @@ -29,7 +29,46 @@ library Paths_imports hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: base diff --git a/libs/metrics-core/metrics-core.cabal b/libs/metrics-core/metrics-core.cabal index 9920cd291b..e9e4be85d4 100644 --- a/libs/metrics-core/metrics-core.cabal +++ b/libs/metrics-core/metrics-core.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 39576413f564e6922f09dafea8363144a30845c18008270e2f357ea3b32534b9 +-- hash: ed00633977e31daad2e0efcc5e21e8e4a800a2737e5848e9b0770091f9a94b3d name: metrics-core version: 0.3.2 @@ -25,7 +25,46 @@ library Paths_metrics_core hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: base >=4.9 diff --git a/libs/metrics-wai/metrics-wai.cabal b/libs/metrics-wai/metrics-wai.cabal index 7658bf9348..422bc7598b 100644 --- a/libs/metrics-wai/metrics-wai.cabal +++ b/libs/metrics-wai/metrics-wai.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: aefa1a394ca2caa5cad577e67967aace67b79d4c94afeba4dd399b77de826a6c +-- hash: aa7fa2126e1b9420894641828a3548c191a7daa9c997585531827b092557e393 name: metrics-wai version: 0.5.7 @@ -29,7 +29,46 @@ library Paths_metrics_wai hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path ghc-prof-options: -fprof-auto build-depends: @@ -57,7 +96,46 @@ test-suite unit Paths_metrics_wai hs-source-dirs: test - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-N build-tool-depends: hspec-discover:hspec-discover diff --git a/libs/polysemy-wire-zoo/polysemy-wire-zoo.cabal b/libs/polysemy-wire-zoo/polysemy-wire-zoo.cabal index f573732a8b..9467c73c9c 100644 --- a/libs/polysemy-wire-zoo/polysemy-wire-zoo.cabal +++ b/libs/polysemy-wire-zoo/polysemy-wire-zoo.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 27700378ec8705a58122804d0ac5c5da8f428b037271401e27abab3cce46ab9f +-- hash: 4b1ed885b5ee0e7a49013f134724d41277e8cc3ff45a6023404e24793c6303c5 name: polysemy-wire-zoo version: 0.1.0 @@ -24,7 +24,46 @@ library Paths_polysemy_wire_zoo hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: base >=4.6 && <5.0 diff --git a/libs/ropes/ropes.cabal b/libs/ropes/ropes.cabal index 58fbbe9d87..58b7ae927f 100644 --- a/libs/ropes/ropes.cabal +++ b/libs/ropes/ropes.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: d71b49463ed7862c72fa0f2ce5e50bb9735fddc8270de52ec3d30e29043b6b59 +-- hash: 037e046804ad490d6ca65048cb0f7809f2b15ff57a4b513a64cf34153a2a7342 name: ropes version: 0.4.20 @@ -25,7 +25,46 @@ library Paths_ropes hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: aeson >=0.6 diff --git a/libs/schema-profunctor/schema-profunctor.cabal b/libs/schema-profunctor/schema-profunctor.cabal index 2fd553cb16..a3c1e5841a 100644 --- a/libs/schema-profunctor/schema-profunctor.cabal +++ b/libs/schema-profunctor/schema-profunctor.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 0ae8ea501bb947c4d9d743cdd9ea56a104dcc8791c62288e99bff1e8399c8ebb +-- hash: 83646796a68e282b2b169035619c5d5ca2c53e12d08311ae712682f24cd90658 name: schema-profunctor version: 0.1.0 @@ -24,11 +24,50 @@ library Paths_schema_profunctor hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: aeson >=1.0 && <1.6 - , base >=4 && <5 + , base ==4.* , bifunctors , comonad , containers @@ -49,12 +88,51 @@ test-suite schemas-tests Paths_schema_profunctor hs-source-dirs: test/unit - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: aeson , aeson-qq - , base >=4 && <5 + , base ==4.* , imports , insert-ordered-containers , lens diff --git a/libs/sodium-crypto-sign/sodium-crypto-sign.cabal b/libs/sodium-crypto-sign/sodium-crypto-sign.cabal index a1cd7844cd..d8701b66da 100644 --- a/libs/sodium-crypto-sign/sodium-crypto-sign.cabal +++ b/libs/sodium-crypto-sign/sodium-crypto-sign.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: f1ee42f25a00c893e5fa4a2dd1fde6c9aa2b39c8f0b558bfc8e217f21ecc78dd +-- hash: 7f0ee2a8b0a69d4f589716632e47f0b9bd431ca5cbfd7a8bf5dfe273c6489de0 name: sodium-crypto-sign version: 0.1.2 @@ -25,7 +25,46 @@ library Paths_sodium_crypto_sign hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path pkgconfig-depends: libsodium >= 0.4.5 diff --git a/libs/ssl-util/ssl-util.cabal b/libs/ssl-util/ssl-util.cabal index 6b76590b4f..c9a1cd65b4 100644 --- a/libs/ssl-util/ssl-util.cabal +++ b/libs/ssl-util/ssl-util.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 3699fbc088cccb96703289fb6f01c595b9dbb41fb871090b5665305eede020b3 +-- hash: d91dea84564b802aae13b5514b1babf2f1a50b0d33a58bc7dade37d6c60c2182 name: ssl-util version: 0.1.0 @@ -25,7 +25,46 @@ library Paths_ssl_util hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: HsOpenSSL >=0.11 diff --git a/libs/tasty-cannon/tasty-cannon.cabal b/libs/tasty-cannon/tasty-cannon.cabal index 11de15b68e..106ce07603 100644 --- a/libs/tasty-cannon/tasty-cannon.cabal +++ b/libs/tasty-cannon/tasty-cannon.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 3e4d6b79f93c721b5df897b6653023feaa197910713bf3a2a759ea37ca05427f +-- hash: 2d2de3cb5a7dcf524d840d49e590bea00dd40610a5488224cf4b25b15991f64b name: tasty-cannon version: 0.4.0 @@ -24,7 +24,46 @@ library Paths_tasty_cannon hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: aeson diff --git a/libs/types-common-aws/types-common-aws.cabal b/libs/types-common-aws/types-common-aws.cabal index 7f9bc911d0..9c3ca1dd1b 100644 --- a/libs/types-common-aws/types-common-aws.cabal +++ b/libs/types-common-aws/types-common-aws.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 78e336e58361643ff6e3248bd8893419b6b9984cf680fe6e26614b22d222c542 +-- hash: 4b83070073d35300a38f4eeaac64a4d3ad4822df651b881a6a8eea293aa4dfcf name: types-common-aws version: 0.16.0 @@ -35,7 +35,46 @@ library Paths_types_common_aws hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path ghc-prof-options: -fprof-auto-exported build-depends: diff --git a/libs/types-common/types-common.cabal b/libs/types-common/types-common.cabal index a5fb47da13..03402763a9 100644 --- a/libs/types-common/types-common.cabal +++ b/libs/types-common/types-common.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 53508b02f4785530bef7924e0bafe2862b003cac226877857f99805418ffcf6d +-- hash: 00836419e46c5f3ba70a9a8c3048fe32fb28f3d7176f97a681722bfb63807bd3 name: types-common version: 0.16.0 @@ -45,7 +45,46 @@ library Paths_types_common hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path ghc-prof-options: -fprof-auto-exported build-depends: @@ -107,7 +146,46 @@ test-suite tests Paths_types_common hs-source-dirs: test - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded build-depends: QuickCheck diff --git a/libs/wai-utilities/wai-utilities.cabal b/libs/wai-utilities/wai-utilities.cabal index 04ee8c4afb..8b0d7a76ba 100644 --- a/libs/wai-utilities/wai-utilities.cabal +++ b/libs/wai-utilities/wai-utilities.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 22be42374e2a06d9a91beff690fe12864bae17c8960db23f9f8d30e230bf1507 +-- hash: 52a60b4f6f7985a3b05c720cb7f00a1034117a09c5d39bbf1d9bb4f0828b86c8 name: wai-utilities version: 0.16.1 @@ -31,7 +31,46 @@ library Paths_wai_utilities hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: aeson >=0.6 diff --git a/libs/wire-api-federation/wire-api-federation.cabal b/libs/wire-api-federation/wire-api-federation.cabal index 3de5fe24a0..84e5d9d667 100644 --- a/libs/wire-api-federation/wire-api-federation.cabal +++ b/libs/wire-api-federation/wire-api-federation.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 8aa2d2b311b92915ab23a4fb07be411b474f2819936b62f46e15b64c31d027fe +-- hash: 19d4125d6114f93fe5bb454af1d9b72bfa7e6bf58cd2ee5cbf3b89ccb06bb8b5 name: wire-api-federation version: 0.1.0 @@ -33,7 +33,46 @@ library Paths_wire_api_federation hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: QuickCheck >=2.13 @@ -87,7 +126,46 @@ test-suite spec Paths_wire_api_federation hs-source-dirs: test - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-N build-tool-depends: hspec-discover:hspec-discover diff --git a/libs/wire-api/wire-api.cabal b/libs/wire-api/wire-api.cabal index ccb35be421..27c3660c32 100644 --- a/libs/wire-api/wire-api.cabal +++ b/libs/wire-api/wire-api.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: fff87c53181cb0f2cd21a3da254e2a9a5dbae2ee00ea67ac124be1593a640e5e +-- hash: d9a15a12c04d8d25bfb4143becc6cad1c00fdb77f91f52934a3d816427bad9cb name: wire-api version: 0.1.0 @@ -98,13 +98,52 @@ library Paths_wire_api hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: QuickCheck >=2.14 , aeson >=0.6 , attoparsec >=0.10 - , base >=4 && <5 + , base ==4.* , base64-bytestring >=1.0 , binary , bytestring >=0.9 @@ -423,7 +462,46 @@ test-suite wire-api-golden-tests Paths_wire_api hs-source-dirs: test/golden - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-N build-depends: QuickCheck @@ -486,7 +564,46 @@ test-suite wire-api-tests Paths_wire_api hs-source-dirs: test/unit - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-N build-depends: QuickCheck diff --git a/libs/zauth/zauth.cabal b/libs/zauth/zauth.cabal index 0118d7a461..921a1584f6 100644 --- a/libs/zauth/zauth.cabal +++ b/libs/zauth/zauth.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 0d38dff701f563388d036116d5f2757ae74b04eab0b7fe2f3d5bfd8ef2800628 +-- hash: 645c91889ea532ce07463edf54a10559d3f581091b53c20903607d9800f6fa3f name: zauth version: 0.10.3 @@ -30,7 +30,46 @@ library Paths_zauth hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields build-depends: attoparsec >=0.11 @@ -56,7 +95,46 @@ executable zauth Paths_zauth hs-source-dirs: main - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: base @@ -81,7 +159,46 @@ test-suite zauth-unit Paths_zauth hs-source-dirs: test - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: base diff --git a/nix/sources.json b/nix/sources.json index c3675c36b5..e16c0e7df5 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "18b7314c13a6d0e82113a15c14e7a5f54286327d", - "sha256": "0b2xb99nn7ddysvgzncwa4vglv0j6c0l4bgxz9hl4i3gmrlq3r59", + "rev": "5830a4dd348d77e39a0f3c4c762ff2663b602d4c", + "sha256": "1d3lsrqvci4qz2hwjrcnd8h5vfkg8aypq3sjd4g3izbc8frwz5sm", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/18b7314c13a6d0e82113a15c14e7a5f54286327d.tar.gz", + "url": "https://github.com/nmattia/niv/archive/5830a4dd348d77e39a0f3c4c762ff2663b602d4c.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { @@ -17,10 +17,10 @@ "homepage": "https://github.com/NixOS/nixpkgs", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8e1891d5b8d0b898db8890ddab73141f0cd3c2bc", - "sha256": "0a767mn0nfp4qnklsvs6bnc0vng4nc3ch566nmrz18ypk67z4zz0", + "rev": "d9896c1f8e419417ea8fc4b7e0e98ca4fc50ba8d", + "sha256": "1ysdab38jpjjvw5vc6qg1bns2f0hkwasww871hfhy9d9kxd6kaly", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/8e1891d5b8d0b898db8890ddab73141f0cd3c2bc.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/d9896c1f8e419417ea8fc4b7e0e98ca4fc50ba8d.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/nix/sources.nix b/nix/sources.nix index 8a725cb4e7..1938409ddd 100644 --- a/nix/sources.nix +++ b/nix/sources.nix @@ -6,52 +6,63 @@ let # The fetchers. fetch_ fetches specs of type . # - fetch_file = pkgs: spec: - if spec.builtin or true then - builtins_fetchurl { inherit (spec) url sha256; } - else - pkgs.fetchurl { inherit (spec) url sha256; }; - - fetch_tarball = pkgs: spec: - if spec.builtin or true then - builtins_fetchTarball { inherit (spec) url sha256; } - else - pkgs.fetchzip { inherit (spec) url sha256; }; + fetch_file = pkgs: name: spec: + let + name' = sanitizeName name + "-src"; + in + if spec.builtin or true then + builtins_fetchurl { inherit (spec) url sha256; name = name'; } + else + pkgs.fetchurl { inherit (spec) url sha256; name = name'; }; - fetch_git = spec: - builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; }; + fetch_tarball = pkgs: name: spec: + let + name' = sanitizeName name + "-src"; + in + if spec.builtin or true then + builtins_fetchTarball { name = name'; inherit (spec) url sha256; } + else + pkgs.fetchzip { name = name'; inherit (spec) url sha256; }; - fetch_builtin-tarball = spec: - builtins.trace - '' - WARNING: - The niv type "builtin-tarball" will soon be deprecated. You should - instead use `builtin = true`. + fetch_git = name: spec: + let + ref = + if spec ? ref then spec.ref else + if spec ? branch then "refs/heads/${spec.branch}" else + if spec ? tag then "refs/tags/${spec.tag}" else + abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"; + in + builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; }; - $ niv modify -a type=tarball -a builtin=true - '' - builtins_fetchTarball { inherit (spec) url sha256; }; + fetch_local = spec: spec.path; - fetch_builtin-url = spec: - builtins.trace - '' - WARNING: - The niv type "builtin-url" will soon be deprecated. You should - instead use `builtin = true`. + fetch_builtin-tarball = name: throw + ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`. + $ niv modify ${name} -a type=tarball -a builtin=true''; - $ niv modify -a type=file -a builtin=true - '' - (builtins_fetchurl { inherit (spec) url sha256; }); + fetch_builtin-url = name: throw + ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`. + $ niv modify ${name} -a type=file -a builtin=true''; # # Various helpers # + # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695 + sanitizeName = name: + ( + concatMapStrings (s: if builtins.isList s then "-" else s) + ( + builtins.split "[^[:alnum:]+._?=-]+" + ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name) + ) + ); + # The set of packages used when specs are fetched using non-builtins. - mkPkgs = sources: + mkPkgs = sources: system: let sourcesNixpkgs = - import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {}; + import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; }; hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath; hasThisAsNixpkgsPath = == ./.; in @@ -71,14 +82,27 @@ let if ! builtins.hasAttr "type" spec then abort "ERROR: niv spec ${name} does not have a 'type' attribute" - else if spec.type == "file" then fetch_file pkgs spec - else if spec.type == "tarball" then fetch_tarball pkgs spec - else if spec.type == "git" then fetch_git spec - else if spec.type == "builtin-tarball" then fetch_builtin-tarball spec - else if spec.type == "builtin-url" then fetch_builtin-url spec + else if spec.type == "file" then fetch_file pkgs name spec + else if spec.type == "tarball" then fetch_tarball pkgs name spec + else if spec.type == "git" then fetch_git name spec + else if spec.type == "local" then fetch_local spec + else if spec.type == "builtin-tarball" then fetch_builtin-tarball name + else if spec.type == "builtin-url" then fetch_builtin-url name else abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}"; + # If the environment variable NIV_OVERRIDE_${name} is set, then use + # the path directly as opposed to the fetched source. + replace = name: drv: + let + saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name; + ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}"; + in + if ersatz == "" then drv else + # this turns the string into an actual Nix path (for both absolute and + # relative paths) + if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}"; + # Ports of functions for older nix versions # a Nix version of mapAttrs if the built-in doesn't exist @@ -87,23 +111,37 @@ let listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set)) ); + # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295 + range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1); + + # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257 + stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1)); + + # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269 + stringAsChars = f: s: concatStrings (map f (stringToCharacters s)); + concatMapStrings = f: list: concatStrings (map f list); + concatStrings = builtins.concatStringsSep ""; + + # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331 + optionalAttrs = cond: as: if cond then as else {}; + # fetchTarball version that is compatible between all the versions of Nix - builtins_fetchTarball = { url, sha256 }@attrs: + builtins_fetchTarball = { url, name ? null, sha256 }@attrs: let inherit (builtins) lessThan nixVersion fetchTarball; in if lessThan nixVersion "1.12" then - fetchTarball { inherit url; } + fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) else fetchTarball attrs; # fetchurl version that is compatible between all the versions of Nix - builtins_fetchurl = { url, sha256 }@attrs: + builtins_fetchurl = { url, name ? null, sha256 }@attrs: let inherit (builtins) lessThan nixVersion fetchurl; in if lessThan nixVersion "1.12" then - fetchurl { inherit url; } + fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) else fetchurl attrs; @@ -115,14 +153,15 @@ let then abort "The values in sources.json should not have an 'outPath' attribute" else - spec // { outPath = fetch config.pkgs name spec; } + spec // { outPath = replace name (fetch config.pkgs name spec); } ) config.sources; # The "config" used by the fetchers mkConfig = - { sourcesFile ? ./sources.json - , sources ? builtins.fromJSON (builtins.readFile sourcesFile) - , pkgs ? mkPkgs sources + { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null + , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile) + , system ? builtins.currentSystem + , pkgs ? mkPkgs sources system }: rec { # The sources, i.e. the attribute set of spec name to spec inherit sources; @@ -130,5 +169,6 @@ let # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers inherit pkgs; }; + in mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); } diff --git a/services/brig/brig.cabal b/services/brig/brig.cabal index af88a6605d..a547b7c8bc 100644 --- a/services/brig/brig.cabal +++ b/services/brig/brig.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 0613764ce9b6730901fb4a909cae6c25607a3df9e7c5d97b3f51a84c80185e91 +-- hash: 5417b475e0e4287e9cf83ec5fbacd82263f43bd8f45b8240f4a89a764295145c name: brig version: 1.35.0 @@ -113,7 +113,46 @@ library Paths_brig hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields build-depends: HaskellNet >=0.3 @@ -241,7 +280,46 @@ executable brig main-is: src/Main.hs other-modules: Paths_brig - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields -threaded -with-rtsopts=-N1 -with-rtsopts=-T -rtsopts build-depends: HsOpenSSL @@ -256,7 +334,46 @@ executable brig-index main-is: index/src/Main.hs other-modules: Paths_brig - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields -threaded -with-rtsopts=-N build-depends: base @@ -301,7 +418,46 @@ executable brig-integration Paths_brig hs-source-dirs: test/integration - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields build-depends: HsOpenSSL @@ -446,7 +602,46 @@ executable brig-schema Paths_brig hs-source-dirs: schema/src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields build-depends: base @@ -471,7 +666,46 @@ test-suite brig-tests Paths_brig hs-source-dirs: test/unit - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields -threaded -with-rtsopts=-N build-depends: aeson diff --git a/services/cannon/cannon.cabal b/services/cannon/cannon.cabal index 56f3ef1f40..fb6cb6b733 100644 --- a/services/cannon/cannon.cabal +++ b/services/cannon/cannon.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 6c53d0a25079c3947f669ee6cf4a32b3e9a9472db9050997e478fc8fdb7b3858 +-- hash: 46360fb15f343337d79d60296a7b0f6880b7d2cef1c99265aee498e940ba3bb2 name: cannon version: 0.31.0 @@ -39,7 +39,46 @@ library Paths_cannon hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: aeson >=0.11 @@ -84,7 +123,46 @@ executable cannon main-is: src/Main.hs other-modules: Paths_cannon - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T -with-rtsopts=-M1g -with-rtsopts=-ki4k build-depends: base @@ -105,7 +183,46 @@ test-suite cannon-tests Paths_cannon hs-source-dirs: test - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-N build-depends: QuickCheck >=2.7 diff --git a/services/cargohold/cargohold.cabal b/services/cargohold/cargohold.cabal index e3bb71aed7..3b0aa530ca 100644 --- a/services/cargohold/cargohold.cabal +++ b/services/cargohold/cargohold.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 7476868d5acce0bd802155cbab24a29a80fd5eec48f540dd3e6dcb492a47d683 +-- hash: d44412866a2fa9501bf3c0369c483e628b0e2c30bbb3fb96f3c03eba2d9e4fb5 name: cargohold version: 1.5.0 @@ -45,7 +45,46 @@ library Paths_cargohold hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: HsOpenSSL >=0.11 @@ -56,7 +95,7 @@ library , amazonka-s3 >=1.3.7 , attoparsec >=0.12 , auto-update >=0.1.4 - , base >=4 && <5 + , base ==4.* , base64-bytestring >=1.0 , bilge >=0.21 , bytestring >=0.10 @@ -104,7 +143,46 @@ executable cargohold main-is: src/Main.hs other-modules: Paths_cargohold - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-T build-depends: HsOpenSSL >=0.11 @@ -141,7 +219,46 @@ executable cargohold-integration Paths_cargohold hs-source-dirs: test/integration - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: HsOpenSSL >=0.11 diff --git a/services/federator/federator.cabal b/services/federator/federator.cabal index fca3d7731c..b88c57731a 100644 --- a/services/federator/federator.cabal +++ b/services/federator/federator.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 2131bf1a367dd734cbccd900c4724c5b48e3f494501b2221e3f32ecaf0a12ec4 +-- hash: d0c7980381e9ff9ae4f98bd7e4b67b28f8f7afa228e971bef84e1788fe59587a name: federator version: 1.0.0 @@ -58,7 +58,46 @@ library Paths_federator hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: aeson @@ -123,7 +162,46 @@ executable federator Paths_federator hs-source-dirs: exec - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-N1 -with-rtsopts=-T -rtsopts build-depends: aeson @@ -193,7 +271,46 @@ executable federator-integration Paths_federator hs-source-dirs: test/integration - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: aeson @@ -279,7 +396,46 @@ test-suite federator-tests Paths_federator hs-source-dirs: test/unit - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-N build-depends: QuickCheck diff --git a/services/galley/galley.cabal b/services/galley/galley.cabal index 2d762d9fa2..c1a27a3b10 100644 --- a/services/galley/galley.cabal +++ b/services/galley/galley.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: a1c3b8a4df30c11f5be17b3ba16e33ebb8a41438a7cec720761222a90f271f4e +-- hash: 13fb4fb29df6aefbba8c856a0637df41bd0939220b23a9832849f607f6c28027 name: galley version: 0.83.0 @@ -126,7 +126,46 @@ library Paths_galley hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: HsOpenSSL >=0.11 @@ -222,7 +261,46 @@ executable galley main-is: src/Main.hs other-modules: Paths_galley - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-T -rtsopts build-depends: HsOpenSSL @@ -267,7 +345,46 @@ executable galley-integration Paths_galley hs-source-dirs: test/integration - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded build-depends: HsOpenSSL @@ -365,7 +482,46 @@ executable galley-migrate-data Paths_galley hs-source-dirs: migrate-data/src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: base @@ -439,7 +595,46 @@ executable galley-schema Paths_galley hs-source-dirs: schema/src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: base @@ -477,7 +672,46 @@ test-suite galley-tests Paths_galley hs-source-dirs: test/unit - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-N build-depends: QuickCheck diff --git a/services/gundeck/gundeck.cabal b/services/gundeck/gundeck.cabal index cec259bf5a..a8643ca98c 100644 --- a/services/gundeck/gundeck.cabal +++ b/services/gundeck/gundeck.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 4bb58f9c4f7c25e77c57457292940bd69410c8a372272ad5afb14252c2ac399b +-- hash: 4b94342561027580e950514565f60bb0d8d1465d92c773a7c4f588966dab6ffc name: gundeck version: 1.45.0 @@ -58,7 +58,46 @@ library Paths_gundeck hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -fwarn-incomplete-uni-patterns build-depends: HsOpenSSL >=0.11 @@ -120,7 +159,46 @@ executable gundeck main-is: src/Main.hs other-modules: Paths_gundeck - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-T build-depends: HsOpenSSL @@ -146,13 +224,52 @@ executable gundeck-integration Paths_gundeck hs-source-dirs: test/integration - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded build-depends: HsOpenSSL , aeson , async - , base >=4 && <5 + , base ==4.* , base16-bytestring >=0.1 , bilge , bytestring @@ -201,7 +318,46 @@ executable gundeck-schema Paths_gundeck hs-source-dirs: schema/src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded build-depends: base @@ -230,7 +386,46 @@ test-suite gundeck-tests Paths_gundeck hs-source-dirs: test/unit - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded build-depends: HsOpenSSL @@ -277,7 +472,46 @@ benchmark gundeck-bench Paths_gundeck hs-source-dirs: test/bench - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: HsOpenSSL diff --git a/services/proxy/proxy.cabal b/services/proxy/proxy.cabal index 73b9dc8021..0aa5d2d426 100644 --- a/services/proxy/proxy.cabal +++ b/services/proxy/proxy.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: e36a48793e77087ee1a5e60f78c9c308b686a1d9318e083dc6bb78d0e27ac056 +-- hash: 4b0eeea49373b98eff5aa94f2c7ec6e198b9db932ceeb3ff4311ffc25ab44b86 name: proxy version: 0.9.0 @@ -35,7 +35,46 @@ library Paths_proxy hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields build-depends: aeson >=1.0 @@ -70,7 +109,46 @@ executable proxy main-is: src/Main.hs other-modules: Paths_proxy - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-T build-depends: base diff --git a/services/spar/spar.cabal b/services/spar/spar.cabal index a71562b0f4..5d7ad770f5 100644 --- a/services/spar/spar.cabal +++ b/services/spar/spar.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 34138a2c7fa249191ae03bc1581a7c95c94b12080f104da084a9bc37ac54c9ad +-- hash: 2bf271794fcbbd59eb02b2f5179482e09cda2cc1de94117f93e6dd6757367b7e name: spar version: 0.1 @@ -90,7 +90,46 @@ library Paths_spar hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -j -Wno-redundant-constraints -Werror build-depends: HsOpenSSL @@ -163,7 +202,46 @@ executable spar Paths_spar hs-source-dirs: exec - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -j -Wno-redundant-constraints -Werror -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T build-depends: HsOpenSSL @@ -251,7 +329,46 @@ executable spar-integration Paths_spar hs-source-dirs: test-integration - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -j -Wno-redundant-constraints -Werror -threaded -rtsopts -with-rtsopts=-N build-tool-depends: hspec-discover:hspec-discover @@ -345,7 +462,46 @@ executable spar-migrate-data Paths_spar hs-source-dirs: migrate-data/src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -j -Wno-redundant-constraints -Werror -threaded -rtsopts -with-rtsopts=-N build-depends: HsOpenSSL @@ -436,7 +592,46 @@ executable spar-schema Paths_spar hs-source-dirs: schema/src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -j -Wno-redundant-constraints -Werror -threaded -rtsopts -with-rtsopts=-N build-depends: HsOpenSSL @@ -520,7 +715,46 @@ test-suite spec Paths_spar hs-source-dirs: test - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -j -Wno-redundant-constraints -Werror -threaded -rtsopts -with-rtsopts=-N build-tool-depends: hspec-discover:hspec-discover diff --git a/stack-deps.nix b/stack-deps.nix index b19d261cd7..f7cc47ae21 100644 --- a/stack-deps.nix +++ b/stack-deps.nix @@ -25,7 +25,7 @@ pkgs.haskell.lib.buildStackProject { zlib lzma ]; - ghc = pkgs.haskell.compiler.ghc884; + ghc = pkgs.haskell.compiler.ghc8107; # This is required as the environment variables exported before running stack # do not make it into the shell in which stack runs test. diff --git a/stack.yaml b/stack.yaml index 38c5aaded9..09a6e97570 100644 --- a/stack.yaml +++ b/stack.yaml @@ -85,7 +85,7 @@ extra-deps: # a version > 1.0.0 of wai-middleware-prometheus is available # (required: https://github.com/fimad/prometheus-haskell/pull/45) - git: https://github.com/wireapp/saml2-web-sso - commit: 60398f375987b74d6b855b5d225e45dc3a96ac06 # https://github.com/wireapp/saml2-web-sso/pull/75 (Sep 10, 2021) + commit: b761d352de12a411927a91729a5c27932d69ba9e # https://github.com/wireapp/saml2-web-sso/pull/80 (Dec 07, 2021) - git: https://github.com/kim/hs-collectd commit: 885da222be2375f78c7be36127620ed772b677c9 diff --git a/stack.yaml.lock b/stack.yaml.lock index f39be0fa05..458ed779a2 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -23,11 +23,11 @@ packages: git: https://github.com/wireapp/saml2-web-sso pantry-tree: size: 4887 - sha256: 29e0138ca6bc33500b87cd6c06bbd899fe4ddaadcfd5117b211e7769f9f80161 - commit: 60398f375987b74d6b855b5d225e45dc3a96ac06 + sha256: 9d6d175cc7bbdb57558f25557e4d0d698c4aecc250f6ca03296a3d94671bf657 + commit: b761d352de12a411927a91729a5c27932d69ba9e original: git: https://github.com/wireapp/saml2-web-sso - commit: 60398f375987b74d6b855b5d225e45dc3a96ac06 + commit: b761d352de12a411927a91729a5c27932d69ba9e - completed: name: collectd version: 0.0.0.2 diff --git a/tools/api-simulations/api-simulations.cabal b/tools/api-simulations/api-simulations.cabal index d8e720f3c1..59a2b2dfa2 100644 --- a/tools/api-simulations/api-simulations.cabal +++ b/tools/api-simulations/api-simulations.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 0bce6d3ef71a3fc2991a10dad9cb794a473111426a2f7d95762ef22bbc353058 +-- hash: cc1ee9817c17b416b041da1872f67634723249762332426dc63b0b1ab43309e8 name: api-simulations version: 0.4.2 @@ -25,7 +25,46 @@ library Paths_api_simulations hs-source-dirs: lib/src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: api-bot @@ -49,7 +88,46 @@ executable api-loadtest Paths_api_simulations hs-source-dirs: loadtest/src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-N -with-rtsopts=-T build-depends: api-bot @@ -81,7 +159,46 @@ executable api-smoketest Paths_api_simulations hs-source-dirs: smoketest/src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-N -with-rtsopts=-T build-depends: api-bot diff --git a/tools/bonanza/bonanza.cabal b/tools/bonanza/bonanza.cabal index d07743e8bc..6b3221f53e 100644 --- a/tools/bonanza/bonanza.cabal +++ b/tools/bonanza/bonanza.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: d11a5dfdfd8b16afefbb6870c4bc71c097f7f86016ffa65d6fbdc74ece7cb504 +-- hash: e99811a9a954d2a94b4ac9e909d56d22ede51a464f80aefefd5b4e1b8b93b231 name: bonanza version: 3.6.0 @@ -44,7 +44,46 @@ library Paths_bonanza hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-small-strict-fields -fno-warn-unused-do-bind build-depends: aeson >=1.0 @@ -83,7 +122,46 @@ executable bonanza main-is: main/Main.hs other-modules: Paths_bonanza - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-small-strict-fields -fno-warn-unused-do-bind -threaded -rtsopts -with-rtsopts=-T -with-rtsopts=-N build-depends: base ==4.* @@ -99,7 +177,46 @@ executable kibana-raw main-is: main/KibanaRaw.hs other-modules: Paths_bonanza - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-small-strict-fields -rtsopts build-depends: aeson >=1.0 @@ -119,7 +236,46 @@ executable kibanana main-is: main/Kibanana.hs other-modules: Paths_bonanza - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-small-strict-fields -fno-warn-unused-do-bind -threaded -rtsopts -with-rtsopts=-T -with-rtsopts=-N build-depends: async @@ -148,7 +304,46 @@ test-suite bonanza-tests Paths_bonanza hs-source-dirs: test/unit - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -with-rtsopts=-N build-depends: QuickCheck diff --git a/tools/convert-to-cabal/shell.nix b/tools/convert-to-cabal/shell.nix index 87266663a0..c708398b84 100644 --- a/tools/convert-to-cabal/shell.nix +++ b/tools/convert-to-cabal/shell.nix @@ -13,7 +13,7 @@ let "stack2cabal" = super.callCabal2nix "stack2cabal" source { }; }; - haskellPackages = pkgs.haskell.packages.ghc884.override { + haskellPackages = pkgs.haskell.packages.ghc8107.override { overrides = overlay; }; diff --git a/tools/db/auto-whitelist/auto-whitelist.cabal b/tools/db/auto-whitelist/auto-whitelist.cabal index aca9fef9ea..695b541cf3 100644 --- a/tools/db/auto-whitelist/auto-whitelist.cabal +++ b/tools/db/auto-whitelist/auto-whitelist.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: a44f3136d459b6192979fc5f06b79873931418960cec00388852fba77d4d0f47 +-- hash: aecd5a2bbe1504d3601577aed1719da584856f3d5f53327650f3c80331619269 name: auto-whitelist version: 1.0.0 @@ -24,7 +24,46 @@ executable auto-whitelist Paths_auto_whitelist hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields -threaded -with-rtsopts=-N -with-rtsopts=-T -rtsopts build-depends: base diff --git a/tools/db/billing-team-member-backfill/billing-team-member-backfill.cabal b/tools/db/billing-team-member-backfill/billing-team-member-backfill.cabal index 18b61ba03f..cec990a25c 100644 --- a/tools/db/billing-team-member-backfill/billing-team-member-backfill.cabal +++ b/tools/db/billing-team-member-backfill/billing-team-member-backfill.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: f4b64220a67932d0f5b25d2a5da2c18ee914d31f0b1d9c14b1b43c11ebb692c8 +-- hash: ada20e0991745d0c8999668355177fca0aef12891245e599d89f28228f0961d4 name: billing-team-member-backfill version: 1.0.0 @@ -24,7 +24,46 @@ executable billing-team-member-backfill Paths_billing_team_member_backfill hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields -threaded -with-rtsopts=-N -with-rtsopts=-T -rtsopts build-depends: base diff --git a/tools/db/find-undead/find-undead.cabal b/tools/db/find-undead/find-undead.cabal index 73b6442e47..3882556cc4 100644 --- a/tools/db/find-undead/find-undead.cabal +++ b/tools/db/find-undead/find-undead.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 803cec639d33ee7123c779f5eedc7c78efdda2ae46ab9ecfc58e088e168b8ebc +-- hash: 30202a4d538697375b0b0dc3d4789ad278c7b41e40169f1b41c538410d03d3da name: find-undead version: 1.0.0 @@ -24,7 +24,46 @@ executable find-undead Paths_find_undead hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields -threaded -with-rtsopts=-N -with-rtsopts=-T -rtsopts build-depends: aeson diff --git a/tools/db/migrate-sso-feature-flag/migrate-sso-feature-flag.cabal b/tools/db/migrate-sso-feature-flag/migrate-sso-feature-flag.cabal index dc80fff1e7..df88ba3683 100644 --- a/tools/db/migrate-sso-feature-flag/migrate-sso-feature-flag.cabal +++ b/tools/db/migrate-sso-feature-flag/migrate-sso-feature-flag.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 88d2d668ec329351cd3ab3108eab05b3db51898dedd0f6f9b85be620f4f1e4d5 +-- hash: 6a64c18d59c109cea4e58b9161d589c395fa1b34ba2705060aebc4926ee1f618 name: migrate-sso-feature-flag version: 1.0.0 @@ -24,7 +24,46 @@ executable migrate-sso-feature-flag Paths_migrate_sso_feature_flag hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields -threaded -with-rtsopts=-N -with-rtsopts=-T -rtsopts build-depends: base diff --git a/tools/db/move-team/move-team.cabal b/tools/db/move-team/move-team.cabal index 8b3fb1e66c..70b49422b5 100644 --- a/tools/db/move-team/move-team.cabal +++ b/tools/db/move-team/move-team.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 6f97fa57af68acb9606816e6048ebe009ec9c0f01a971d39ae9dbc5e2061346d +-- hash: 2168cecbb403740519009eb790938bbfec816c047f81bc1ec44d6157ff798516 name: move-team version: 1.0.0 @@ -28,7 +28,46 @@ library Paths_move_team hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields -threaded -with-rtsopts=-N -with-rtsopts=-T -rtsopts build-depends: aeson @@ -63,7 +102,46 @@ executable move-team Paths_move_team hs-source-dirs: move-team - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields -threaded -with-rtsopts=-N -with-rtsopts=-T -rtsopts build-depends: aeson @@ -99,7 +177,46 @@ executable move-team-generate Paths_move_team hs-source-dirs: move-team-generate - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields -threaded -with-rtsopts=-N -with-rtsopts=-T -rtsopts build-depends: aeson diff --git a/tools/db/repair-handles/repair-handles.cabal b/tools/db/repair-handles/repair-handles.cabal index a5b8fd2619..105feb8398 100644 --- a/tools/db/repair-handles/repair-handles.cabal +++ b/tools/db/repair-handles/repair-handles.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: abd13346fea0b0196ba60cf22bfa4c3b8b06b83ef7cc88c1d32c276e695b8f3c +-- hash: c8ad3a3ca71a54e03d9bb6572dad0629da8c5940cfe20febf7cf1971d549f042 name: repair-handles version: 1.0.0 @@ -26,7 +26,46 @@ executable repair-handles hs-source-dirs: repair-handles src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: base diff --git a/tools/db/service-backfill/service-backfill.cabal b/tools/db/service-backfill/service-backfill.cabal index 3bc5aa2cd0..4a1ed2deb1 100644 --- a/tools/db/service-backfill/service-backfill.cabal +++ b/tools/db/service-backfill/service-backfill.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 7e34405c46813f3294b0ecb9bf520e7b75d83db1c83cbcf779de12f46c7957b5 +-- hash: d72d11c1f8954ebb055cecdaed92fb6e31c1b534a8083b486f14bbcf5849e0ba name: service-backfill version: 1.0.0 @@ -24,7 +24,46 @@ executable service-backfill Paths_service_backfill hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields -threaded -with-rtsopts=-N -with-rtsopts=-T -rtsopts build-depends: base diff --git a/tools/makedeb/makedeb.cabal b/tools/makedeb/makedeb.cabal index 0adc3c7da9..5f2263addb 100644 --- a/tools/makedeb/makedeb.cabal +++ b/tools/makedeb/makedeb.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 7fe255326cb9428aeec3221e074cd2eec369cad640361ae18e967e7f095fd0a8 +-- hash: 80100f7bcc806d6eef6f942564fb7afa966abe1df367224e68b29a904fbe3cf2 name: makedeb version: 0.3.0 @@ -27,7 +27,46 @@ library Paths_makedeb hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: base >=4.6 && <5.0 @@ -43,7 +82,46 @@ executable makedeb main-is: src/Main.hs other-modules: Paths_makedeb - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded build-depends: base diff --git a/tools/stern/stern.cabal b/tools/stern/stern.cabal index 2f0b829f76..ac2f1c8d88 100644 --- a/tools/stern/stern.cabal +++ b/tools/stern/stern.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: c35978462e5fa7b7a1d42ade1d2c284bc4c709ce2a423d9d64ceb831b086a034 +-- hash: 0da74867ac45ba54dd475f434f41b57a45950a001354df87fe6286f1c2db55d9 name: stern version: 1.7.2 @@ -35,7 +35,46 @@ library Paths_stern hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields build-depends: aeson >=0.11 @@ -80,7 +119,46 @@ executable stern main-is: src/Main.hs other-modules: Paths_stern - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-T build-depends: base From 5c1d2bfa247600fdbc2761c984cb1871d6f34752 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 16:03:52 +0100 Subject: [PATCH 05/63] Avoid using deprecated Data.ByteString.Lazy.Builder --- libs/extended/src/System/Logger/Extended.hs | 2 +- libs/wire-api/src/Wire/API/Team/Role.hs | 2 +- services/galley/src/Galley/API/Teams.hs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/extended/src/System/Logger/Extended.hs b/libs/extended/src/System/Logger/Extended.hs index ec51ba4870..6bb4cb8ebb 100644 --- a/libs/extended/src/System/Logger/Extended.hs +++ b/libs/extended/src/System/Logger/Extended.hs @@ -36,7 +36,7 @@ import Cassandra (MonadClient) import Control.Monad.Catch import Data.Aeson as Aeson import Data.Aeson.Encoding (list, pair, text) -import qualified Data.ByteString.Lazy.Builder as B +import qualified Data.ByteString.Builder as B import qualified Data.ByteString.Lazy.Char8 as L import qualified Data.Map.Lazy as Map import Data.String.Conversions (cs) diff --git a/libs/wire-api/src/Wire/API/Team/Role.hs b/libs/wire-api/src/Wire/API/Team/Role.hs index 2a3ebca9df..d9d9d74a21 100644 --- a/libs/wire-api/src/Wire/API/Team/Role.hs +++ b/libs/wire-api/src/Wire/API/Team/Role.hs @@ -29,9 +29,9 @@ where import qualified Cassandra as Cql import Data.Aeson import Data.Attoparsec.ByteString.Char8 (string) +import Data.ByteString.Builder (toLazyByteString) import Data.ByteString.Conversion (FromByteString (..), ToByteString (..)) import Data.ByteString.Conversion.From (runParser) -import Data.ByteString.Lazy.Builder (toLazyByteString) import Data.String.Conversions (cs) import qualified Data.Swagger.Model.Api as Doc import Imports diff --git a/services/galley/src/Galley/API/Teams.hs b/services/galley/src/Galley/API/Teams.hs index 6c4d104240..3fe61dc81c 100644 --- a/services/galley/src/Galley/API/Teams.hs +++ b/services/galley/src/Galley/API/Teams.hs @@ -60,9 +60,9 @@ where import Brig.Types.Intra (accountUser) import Brig.Types.Team (TeamSize (..)) import Control.Lens +import Data.ByteString.Builder (lazyByteString) import Data.ByteString.Conversion (List, toByteString) import qualified Data.ByteString.Conversion -import Data.ByteString.Lazy.Builder (lazyByteString) import qualified Data.CaseInsensitive as CI import Data.Csv (EncodeOptions (..), Quoting (QuoteAll), encodeDefaultOrderedByNameWith) import qualified Data.Handle as Handle From 3f97341fccd671f94fa95c18e67df92700625522 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 16:04:43 +0100 Subject: [PATCH 06/63] Auto derive MonadUnliftIO instead of using askUnliftIO askUnliftIO got removed from the type class --- services/brig/src/Brig/AWS.hs | 8 ++------ services/cargohold/src/CargoHold/AWS.hs | 8 ++------ services/galley/src/Galley/Aws.hs | 8 ++------ services/gundeck/src/Gundeck/Aws.hs | 8 ++------ services/gundeck/src/Gundeck/Monad.hs | 9 ++------- 5 files changed, 10 insertions(+), 31 deletions(-) diff --git a/services/brig/src/Brig/AWS.hs b/services/brig/src/Brig/AWS.hs index 15205905c0..0e0e4aec5a 100644 --- a/services/brig/src/Brig/AWS.hs +++ b/services/brig/src/Brig/AWS.hs @@ -97,14 +97,10 @@ newtype Amazon a = Amazon MonadCatch, MonadMask, MonadReader Env, - MonadResource + MonadResource, + MonadUnliftIO ) -instance MonadUnliftIO Amazon where - askUnliftIO = Amazon . ReaderT $ \r -> - withUnliftIO $ \u -> - return (UnliftIO (unliftIO u . flip runReaderT r . unAmazon)) - instance MonadLogger Amazon where log l m = view logger >>= \g -> Logger.log g l m diff --git a/services/cargohold/src/CargoHold/AWS.hs b/services/cargohold/src/CargoHold/AWS.hs index b3b00d531f..03b8eacc44 100644 --- a/services/cargohold/src/CargoHold/AWS.hs +++ b/services/cargohold/src/CargoHold/AWS.hs @@ -90,17 +90,13 @@ newtype Amazon a = Amazon MonadCatch, MonadMask, MonadReader Env, - MonadResource + MonadResource, + MonadUnliftIO ) instance MonadLogger Amazon where log l m = view logger >>= \g -> Logger.log g l m -instance MonadUnliftIO Amazon where - askUnliftIO = Amazon . ReaderT $ \r -> - withUnliftIO $ \u -> - return (UnliftIO (unliftIO u . flip runReaderT r . unAmazon)) - instance AWS.MonadAWS Amazon where liftAWS a = view amazonkaEnv >>= flip AWS.runAWS a diff --git a/services/galley/src/Galley/Aws.hs b/services/galley/src/Galley/Aws.hs index 5f5f055a7c..9121ab4375 100644 --- a/services/galley/src/Galley/Aws.hs +++ b/services/galley/src/Galley/Aws.hs @@ -91,14 +91,10 @@ newtype Amazon a = Amazon MonadCatch, MonadMask, MonadReader Env, - MonadResource + MonadResource, + MonadUnliftIO ) -instance MonadUnliftIO Amazon where - askUnliftIO = Amazon . ReaderT $ \r -> - withUnliftIO $ \u -> - return (UnliftIO (unliftIO u . flip runReaderT r . unAmazon)) - instance MonadLogger Amazon where log l m = view logger >>= \g -> Logger.log g l m diff --git a/services/gundeck/src/Gundeck/Aws.hs b/services/gundeck/src/Gundeck/Aws.hs index b4a0508275..75bc30c195 100644 --- a/services/gundeck/src/Gundeck/Aws.hs +++ b/services/gundeck/src/Gundeck/Aws.hs @@ -136,14 +136,10 @@ newtype Amazon a = Amazon MonadCatch, MonadMask, MonadReader Env, - MonadResource + MonadResource, + MonadUnliftIO ) -instance MonadUnliftIO Amazon where - askUnliftIO = Amazon . ReaderT $ \r -> - withUnliftIO $ \u -> - return (UnliftIO (unliftIO u . flip runReaderT r . unAmazon)) - instance MonadLogger Amazon where log l m = view logger >>= \g -> Logger.log g l m diff --git a/services/gundeck/src/Gundeck/Monad.hs b/services/gundeck/src/Gundeck/Monad.hs index 22851a12d8..4bea200a2e 100644 --- a/services/gundeck/src/Gundeck/Monad.hs +++ b/services/gundeck/src/Gundeck/Monad.hs @@ -70,15 +70,10 @@ newtype Gundeck a = Gundeck MonadCatch, MonadMask, MonadReader Env, - MonadClient + MonadClient, + MonadUnliftIO ) -instance MonadUnliftIO Gundeck where - askUnliftIO = - Gundeck . ReaderT $ \r -> - withUnliftIO $ \u -> - return (UnliftIO (unliftIO u . flip runReaderT r . unGundeck)) - instance Redis.MonadClient Gundeck where liftClient m = view rstate >>= \p -> Redis.runRedis p m From fb5127d22b74f4e8afb67845d74a83338b4e56be Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 16:05:20 +0100 Subject: [PATCH 07/63] Use openFile from Imports --- libs/wire-api/test/golden/Test/Wire/API/Golden/Generator.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wire-api/test/golden/Test/Wire/API/Golden/Generator.hs b/libs/wire-api/test/golden/Test/Wire/API/Golden/Generator.hs index 4d022f0eac..bc35397159 100644 --- a/libs/wire-api/test/golden/Test/Wire/API/Golden/Generator.hs +++ b/libs/wire-api/test/golden/Test/Wire/API/Golden/Generator.hs @@ -19,7 +19,7 @@ module Test.Wire.API.Golden.Generator where import Data.Id import Imports -import System.IO (Handle, hPutStr, hPutStrLn, openFile) +import System.IO (Handle, hPutStr, hPutStrLn) import Test.Tasty.QuickCheck (Arbitrary (..), generate) import Type.Reflection (typeRep) import qualified Wire.API.Asset as Asset From 40efbba267bd879d0d63844e63479a18967f0a5d Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 16:05:36 +0100 Subject: [PATCH 08/63] Adapt for the new generic-random --- libs/wire-api/src/Wire/API/Arbitrary.hs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/wire-api/src/Wire/API/Arbitrary.hs b/libs/wire-api/src/Wire/API/Arbitrary.hs index 3df8c80d4c..de7eb3a952 100644 --- a/libs/wire-api/src/Wire/API/Arbitrary.hs +++ b/libs/wire-api/src/Wire/API/Arbitrary.hs @@ -39,6 +39,7 @@ import qualified Data.Currency as Currency import qualified Data.HashMap.Strict as HashMap import Data.ISO3166_CountryCodes (CountryCode) import Data.LanguageCodes (ISO639_1 (..)) +import Data.List.NonEmpty (NonEmpty (..)) import Data.List1 (List1, list1) import qualified Data.Map.Strict as Map import qualified Data.Set as Set @@ -79,18 +80,22 @@ instance -- | We want plug in custom generators for all occurences of '[]' and 'List1'. type CustomSizedOpts = Generic.Options + 'Generic.INCOHERENT 'Generic.Sized - (Generic.Gen1 [] :+ Generic.Gen1 List1 :+ ()) + (Generic.Gen1 [] :+ Generic.Gen1 NonEmpty :+ ()) customSizedOpts :: CustomSizedOpts customSizedOpts = Generic.setGenerators - (Generic.Gen1 listOf' :+ Generic.Gen1 list1Of' :+ ()) + (Generic.Gen1 listOf' :+ Generic.Gen1 nonEmptyListOf' :+ ()) Generic.sizedOpts list1Of' :: Gen a -> Gen (List1 a) list1Of' g = list1 <$> g <*> Generic.listOf' g +nonEmptyListOf' :: Gen a -> Gen (NonEmpty a) +nonEmptyListOf' g = (:|) <$> g <*> listOf' g + setOf' :: Ord a => Gen a -> Gen (Set a) setOf' g = Set.fromList <$> Generic.listOf' g From db5979c1b0b212dc199968bca7ff3a1fb9a3b5a1 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 16:05:49 +0100 Subject: [PATCH 09/63] Adapt for new swagger2 --- libs/wire-api/src/Wire/API/Routes/Public.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wire-api/src/Wire/API/Routes/Public.hs b/libs/wire-api/src/Wire/API/Routes/Public.hs index 9fd26ba7fe..288b7f33ae 100644 --- a/libs/wire-api/src/Wire/API/Routes/Public.hs +++ b/libs/wire-api/src/Wire/API/Routes/Public.hs @@ -129,7 +129,7 @@ type ZOptConn = ZAuthServant 'ZAuthConn '[Servant.Optional, Servant.Strict] instance HasSwagger api => HasSwagger (ZAuthServant 'ZAuthUser _opts :> api) where toSwagger _ = toSwagger (Proxy @api) - & securityDefinitions <>~ InsOrdHashMap.singleton "ZAuth" secScheme + & securityDefinitions <>~ SecurityDefinitions (InsOrdHashMap.singleton "ZAuth" secScheme) & security <>~ [SecurityRequirement $ InsOrdHashMap.singleton "ZAuth" []] where secScheme = From 87afa29994605d400e7748f9015b5f106ae1edc4 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 16:07:06 +0100 Subject: [PATCH 10/63] Adapt for new random --- services/brig/src/Brig/Data/Client.hs | 2 +- services/brig/src/Brig/Run.hs | 2 +- services/spar/test-integration/Test/Spar/Scim/UserSpec.hs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/brig/src/Brig/Data/Client.hs b/services/brig/src/Brig/Data/Client.hs index b6a322f887..491479b2c8 100644 --- a/services/brig/src/Brig/Data/Client.hs +++ b/services/brig/src/Brig/Data/Client.hs @@ -56,7 +56,7 @@ import Control.Error import qualified Control.Exception.Lens as EL import Control.Lens import Control.Monad.Catch -import Control.Monad.Random (Random (randomRIO)) +import Control.Monad.Random (randomRIO) import Control.Retry import qualified Data.ByteString.Base64 as B64 import Data.ByteString.Conversion (toByteString, toByteString') diff --git a/services/brig/src/Brig/Run.hs b/services/brig/src/Brig/Run.hs index 46179f9e37..f4402dce55 100644 --- a/services/brig/src/Brig/Run.hs +++ b/services/brig/src/Brig/Run.hs @@ -44,7 +44,7 @@ import qualified Control.Concurrent.Async as Async import Control.Exception.Safe (catchAny) import Control.Lens (view, (.~), (^.)) import Control.Monad.Catch (MonadCatch, finally) -import Control.Monad.Random (Random (randomRIO)) +import Control.Monad.Random (randomRIO) import qualified Data.Aeson as Aeson import Data.Default (Default (def)) import Data.Id (RequestId (..)) diff --git a/services/spar/test-integration/Test/Spar/Scim/UserSpec.hs b/services/spar/test-integration/Test/Spar/Scim/UserSpec.hs index a73b15ed14..cfd940fc2d 100644 --- a/services/spar/test-integration/Test/Spar/Scim/UserSpec.hs +++ b/services/spar/test-integration/Test/Spar/Scim/UserSpec.hs @@ -35,7 +35,7 @@ import Brig.Types.User as Brig import qualified Control.Exception import Control.Lens import Control.Monad.Except (MonadError (throwError)) -import Control.Monad.Random (Random (randomRIO)) +import Control.Monad.Random (randomRIO) import Control.Monad.Trans.Except import Control.Monad.Trans.Maybe import Control.Retry (exponentialBackoff, limitRetries, recovering) From 9dbe88f487e2fac6da12fbb97a304532e26471ab Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 16:12:34 +0100 Subject: [PATCH 11/63] Adapt for new HaskellNet `sendMimeMail2` is deprecated, `sendMail`'s API changed and is recommended instead of `sendMimeMail2`. --- services/brig/src/Brig/SMTP.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/brig/src/Brig/SMTP.hs b/services/brig/src/Brig/SMTP.hs index 59818297d8..f176be2dda 100644 --- a/services/brig/src/Brig/SMTP.hs +++ b/services/brig/src/Brig/SMTP.hs @@ -84,4 +84,4 @@ initSMTP lg host port credentials connType = do Logger.log lg Logger.Debug (msg $ val "Closing connection to: " +++ host) sendMail :: MonadIO m => SMTP -> Mail -> m () -sendMail s m = liftIO $ withResource (s ^. pool) $ SMTP.sendMimeMail2 m +sendMail s m = liftIO $ withResource (s ^. pool) $ SMTP.sendMail m From 98de4dc292ee9a8e4fe35677d036835f2e6d8535 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 16:28:41 +0100 Subject: [PATCH 12/63] Deal with -Wunused-record-wildcards --- tools/db/move-team/src/Schema.hs | 52 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/tools/db/move-team/src/Schema.hs b/tools/db/move-team/src/Schema.hs index 1958fb705b..b8b04f631b 100644 --- a/tools/db/move-team/src/Schema.hs +++ b/tools/db/move-team/src/Schema.hs @@ -57,7 +57,7 @@ readBrigClientsAll Env {..} = paginateC selectBrigClientsAll (paramsP LocalQuorum () envPageSize) x5 exportBrigClientsFull :: Env -> FilePath -> IO () -exportBrigClientsFull env@Env {..} path = do +exportBrigClientsFull env path = do putStrLn $ "Exporting " <> "brig.clients" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -103,7 +103,7 @@ readBrigConnectionAll Env {..} = paginateC selectBrigConnectionAll (paramsP LocalQuorum () envPageSize) x5 exportBrigConnectionFull :: Env -> FilePath -> IO () -exportBrigConnectionFull env@Env {..} path = do +exportBrigConnectionFull env path = do putStrLn $ "Exporting " <> "brig.connection" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -149,7 +149,7 @@ readBrigLoginCodesAll Env {..} = paginateC selectBrigLoginCodesAll (paramsP LocalQuorum () envPageSize) x5 exportBrigLoginCodesFull :: Env -> FilePath -> IO () -exportBrigLoginCodesFull env@Env {..} path = do +exportBrigLoginCodesFull env path = do putStrLn $ "Exporting " <> "brig.login_codes" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -195,7 +195,7 @@ readBrigPasswordResetAll Env {..} = paginateC selectBrigPasswordResetAll (paramsP LocalQuorum () envPageSize) x5 exportBrigPasswordResetFull :: Env -> FilePath -> IO () -exportBrigPasswordResetFull env@Env {..} path = do +exportBrigPasswordResetFull env path = do putStrLn $ "Exporting " <> "brig.password_reset" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -241,7 +241,7 @@ readBrigPrekeysAll Env {..} = paginateC selectBrigPrekeysAll (paramsP LocalQuorum () envPageSize) x5 exportBrigPrekeysFull :: Env -> FilePath -> IO () -exportBrigPrekeysFull env@Env {..} path = do +exportBrigPrekeysFull env path = do putStrLn $ "Exporting " <> "brig.prekeys" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -287,7 +287,7 @@ readBrigPropertiesAll Env {..} = paginateC selectBrigPropertiesAll (paramsP LocalQuorum () envPageSize) x5 exportBrigPropertiesFull :: Env -> FilePath -> IO () -exportBrigPropertiesFull env@Env {..} path = do +exportBrigPropertiesFull env path = do putStrLn $ "Exporting " <> "brig.properties" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -333,7 +333,7 @@ readBrigRichInfoAll Env {..} = paginateC selectBrigRichInfoAll (paramsP LocalQuorum () envPageSize) x5 exportBrigRichInfoFull :: Env -> FilePath -> IO () -exportBrigRichInfoFull env@Env {..} path = do +exportBrigRichInfoFull env path = do putStrLn $ "Exporting " <> "brig.rich_info" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -379,7 +379,7 @@ readBrigUserAll Env {..} = paginateC selectBrigUserAll (paramsP LocalQuorum () envPageSize) x5 exportBrigUserFull :: Env -> FilePath -> IO () -exportBrigUserFull env@Env {..} path = do +exportBrigUserFull env path = do putStrLn $ "Exporting " <> "brig.user" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -425,7 +425,7 @@ readBrigUserHandleAll Env {..} = paginateC selectBrigUserHandleAll (paramsP LocalQuorum () envPageSize) x5 exportBrigUserHandleFull :: Env -> FilePath -> IO () -exportBrigUserHandleFull env@Env {..} path = do +exportBrigUserHandleFull env path = do putStrLn $ "Exporting " <> "brig.user_handle" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -471,7 +471,7 @@ readBrigUserKeysAll Env {..} = paginateC selectBrigUserKeysAll (paramsP LocalQuorum () envPageSize) x5 exportBrigUserKeysFull :: Env -> FilePath -> IO () -exportBrigUserKeysFull env@Env {..} path = do +exportBrigUserKeysFull env path = do putStrLn $ "Exporting " <> "brig.user_keys" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -517,7 +517,7 @@ readBrigUserKeysHashAll Env {..} = paginateC selectBrigUserKeysHashAll (paramsP LocalQuorum () envPageSize) x5 exportBrigUserKeysHashFull :: Env -> FilePath -> IO () -exportBrigUserKeysHashFull env@Env {..} path = do +exportBrigUserKeysHashFull env path = do putStrLn $ "Exporting " <> "brig.user_keys_hash" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -563,7 +563,7 @@ readGalleyBillingTeamMemberAll Env {..} = paginateC selectGalleyBillingTeamMemberAll (paramsP LocalQuorum () envPageSize) x5 exportGalleyBillingTeamMemberFull :: Env -> FilePath -> IO () -exportGalleyBillingTeamMemberFull env@Env {..} path = do +exportGalleyBillingTeamMemberFull env path = do putStrLn $ "Exporting " <> "galley.billing_team_member" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -609,7 +609,7 @@ readGalleyClientsAll Env {..} = paginateC selectGalleyClientsAll (paramsP LocalQuorum () envPageSize) x5 exportGalleyClientsFull :: Env -> FilePath -> IO () -exportGalleyClientsFull env@Env {..} path = do +exportGalleyClientsFull env path = do putStrLn $ "Exporting " <> "galley.clients" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -655,7 +655,7 @@ readGalleyConversationAll Env {..} = paginateC selectGalleyConversationAll (paramsP LocalQuorum () envPageSize) x5 exportGalleyConversationFull :: Env -> FilePath -> IO () -exportGalleyConversationFull env@Env {..} path = do +exportGalleyConversationFull env path = do putStrLn $ "Exporting " <> "galley.conversation" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -701,7 +701,7 @@ readGalleyMemberAll Env {..} = paginateC selectGalleyMemberAll (paramsP LocalQuorum () envPageSize) x5 exportGalleyMemberFull :: Env -> FilePath -> IO () -exportGalleyMemberFull env@Env {..} path = do +exportGalleyMemberFull env path = do putStrLn $ "Exporting " <> "galley.member" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -747,7 +747,7 @@ readGalleyTeamAll Env {..} = paginateC selectGalleyTeamAll (paramsP LocalQuorum () envPageSize) x5 exportGalleyTeamFull :: Env -> FilePath -> IO () -exportGalleyTeamFull env@Env {..} path = do +exportGalleyTeamFull env path = do putStrLn $ "Exporting " <> "galley.team" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -793,7 +793,7 @@ readGalleyTeamConvAll Env {..} = paginateC selectGalleyTeamConvAll (paramsP LocalQuorum () envPageSize) x5 exportGalleyTeamConvFull :: Env -> FilePath -> IO () -exportGalleyTeamConvFull env@Env {..} path = do +exportGalleyTeamConvFull env path = do putStrLn $ "Exporting " <> "galley.team_conv" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -839,7 +839,7 @@ readGalleyTeamFeaturesAll Env {..} = paginateC selectGalleyTeamFeaturesAll (paramsP LocalQuorum () envPageSize) x5 exportGalleyTeamFeaturesFull :: Env -> FilePath -> IO () -exportGalleyTeamFeaturesFull env@Env {..} path = do +exportGalleyTeamFeaturesFull env path = do putStrLn $ "Exporting " <> "galley.team_features" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -885,7 +885,7 @@ readGalleyTeamMemberAll Env {..} = paginateC selectGalleyTeamMemberAll (paramsP LocalQuorum () envPageSize) x5 exportGalleyTeamMemberFull :: Env -> FilePath -> IO () -exportGalleyTeamMemberFull env@Env {..} path = do +exportGalleyTeamMemberFull env path = do putStrLn $ "Exporting " <> "galley.team_member" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -931,7 +931,7 @@ readGalleyTeamNotificationsAll Env {..} = paginateC selectGalleyTeamNotificationsAll (paramsP LocalQuorum () envPageSize) x5 exportGalleyTeamNotificationsFull :: Env -> FilePath -> IO () -exportGalleyTeamNotificationsFull env@Env {..} path = do +exportGalleyTeamNotificationsFull env path = do putStrLn $ "Exporting " <> "galley.team_notifications" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -977,7 +977,7 @@ readGalleyUserAll Env {..} = paginateC selectGalleyUserAll (paramsP LocalQuorum () envPageSize) x5 exportGalleyUserFull :: Env -> FilePath -> IO () -exportGalleyUserFull env@Env {..} path = do +exportGalleyUserFull env path = do putStrLn $ "Exporting " <> "galley.user" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -1023,7 +1023,7 @@ readGalleyUserTeamAll Env {..} = paginateC selectGalleyUserTeamAll (paramsP LocalQuorum () envPageSize) x5 exportGalleyUserTeamFull :: Env -> FilePath -> IO () -exportGalleyUserTeamFull env@Env {..} path = do +exportGalleyUserTeamFull env path = do putStrLn $ "Exporting " <> "galley.user_team" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -1069,7 +1069,7 @@ readGundeckNotificationsAll Env {..} = paginateC selectGundeckNotificationsAll (paramsP LocalQuorum () envPageSize) x5 exportGundeckNotificationsFull :: Env -> FilePath -> IO () -exportGundeckNotificationsFull env@Env {..} path = do +exportGundeckNotificationsFull env path = do putStrLn $ "Exporting " <> "gundeck.notifications" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -1115,7 +1115,7 @@ readSparScimExternalAll Env {..} = paginateC selectSparScimExternalAll (paramsP LocalQuorum () envPageSize) x5 exportSparScimExternalFull :: Env -> FilePath -> IO () -exportSparScimExternalFull env@Env {..} path = do +exportSparScimExternalFull env path = do putStrLn $ "Exporting " <> "spar.scim_external" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -1161,7 +1161,7 @@ readSparScimUserTimesAll Env {..} = paginateC selectSparScimUserTimesAll (paramsP LocalQuorum () envPageSize) x5 exportSparScimUserTimesFull :: Env -> FilePath -> IO () -exportSparScimUserTimesFull env@Env {..} path = do +exportSparScimUserTimesFull env path = do putStrLn $ "Exporting " <> "spar.scim_user_times" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ @@ -1207,7 +1207,7 @@ readSparUserAll Env {..} = paginateC selectSparUserAll (paramsP LocalQuorum () envPageSize) x5 exportSparUserFull :: Env -> FilePath -> IO () -exportSparUserFull env@Env {..} path = do +exportSparUserFull env path = do putStrLn $ "Exporting " <> "spar.user" <> " to " <> path withBinaryFile path WriteMode $ \handle -> runConduit $ From c4f94ae472544f7ac770813732eceb66b67f5b43 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 16:30:01 +0100 Subject: [PATCH 13/63] move-team: HLint --- tools/db/move-team/src/Schema.hs | 104 +++++++++++++++---------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/tools/db/move-team/src/Schema.hs b/tools/db/move-team/src/Schema.hs index b8b04f631b..6706e6ebee 100644 --- a/tools/db/move-team/src/Schema.hs +++ b/tools/db/move-team/src/Schema.hs @@ -40,7 +40,7 @@ import Wire.API.User.Password (PasswordResetKey) type RowBrigClients = (Maybe UUID, Maybe Text, Maybe Int32, Maybe Text, Maybe IP, Maybe Text, Maybe Double, Maybe Double, Maybe Text, Maybe UTCTime, Maybe Int32) -selectBrigClients :: PrepQuery R (Identity ([UserId])) RowBrigClients +selectBrigClients :: PrepQuery R (Identity [UserId]) RowBrigClients selectBrigClients = "SELECT user, client, class, cookie, ip, label, lat, lon, model, tstamp, type FROM clients WHERE user in ?" readBrigClients :: Env -> [UserId] -> ConduitM () [RowBrigClients] IO () @@ -74,7 +74,7 @@ importBrigClients Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "brig.clients" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envBrig) (sinkTableRows insertBrigClients) @@ -86,7 +86,7 @@ importBrigClients Env {..} path = do type RowBrigConnection = (Maybe UUID, Maybe UUID, Maybe UUID, Maybe UTCTime, Maybe Text, Maybe Int32) -selectBrigConnection :: PrepQuery R (Identity ([UserId])) RowBrigConnection +selectBrigConnection :: PrepQuery R (Identity [UserId]) RowBrigConnection selectBrigConnection = "SELECT left, right, conv, last_update, message, status FROM connection WHERE left in ?" readBrigConnection :: Env -> [UserId] -> ConduitM () [RowBrigConnection] IO () @@ -120,7 +120,7 @@ importBrigConnection Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "brig.connection" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envBrig) (sinkTableRows insertBrigConnection) @@ -132,7 +132,7 @@ importBrigConnection Env {..} path = do type RowBrigLoginCodes = (Maybe UUID, Maybe Text, Maybe Int32, Maybe UTCTime) -selectBrigLoginCodes :: PrepQuery R (Identity ([UserId])) RowBrigLoginCodes +selectBrigLoginCodes :: PrepQuery R (Identity [UserId]) RowBrigLoginCodes selectBrigLoginCodes = "SELECT user, code, retries, timeout FROM login_codes WHERE user in ?" readBrigLoginCodes :: Env -> [UserId] -> ConduitM () [RowBrigLoginCodes] IO () @@ -166,7 +166,7 @@ importBrigLoginCodes Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "brig.login_codes" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envBrig) (sinkTableRows insertBrigLoginCodes) @@ -178,7 +178,7 @@ importBrigLoginCodes Env {..} path = do type RowBrigPasswordReset = (Maybe Ascii, Maybe Ascii, Maybe Int32, Maybe UTCTime, Maybe UUID) -selectBrigPasswordReset :: PrepQuery R (Identity ([PasswordResetKey])) RowBrigPasswordReset +selectBrigPasswordReset :: PrepQuery R (Identity [PasswordResetKey]) RowBrigPasswordReset selectBrigPasswordReset = "SELECT key, code, retries, timeout, user FROM password_reset WHERE key in ?" readBrigPasswordReset :: Env -> [PasswordResetKey] -> ConduitM () [RowBrigPasswordReset] IO () @@ -212,7 +212,7 @@ importBrigPasswordReset Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "brig.password_reset" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envBrig) (sinkTableRows insertBrigPasswordReset) @@ -224,7 +224,7 @@ importBrigPasswordReset Env {..} path = do type RowBrigPrekeys = (Maybe UUID, Maybe Text, Maybe Int32, Maybe Text) -selectBrigPrekeys :: PrepQuery R (Identity ([UserId])) RowBrigPrekeys +selectBrigPrekeys :: PrepQuery R (Identity [UserId]) RowBrigPrekeys selectBrigPrekeys = "SELECT user, client, key, data FROM prekeys WHERE user in ?" readBrigPrekeys :: Env -> [UserId] -> ConduitM () [RowBrigPrekeys] IO () @@ -258,7 +258,7 @@ importBrigPrekeys Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "brig.prekeys" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envBrig) (sinkTableRows insertBrigPrekeys) @@ -270,7 +270,7 @@ importBrigPrekeys Env {..} path = do type RowBrigProperties = (Maybe UUID, Maybe Ascii, Maybe Blob) -selectBrigProperties :: PrepQuery R (Identity ([UserId])) RowBrigProperties +selectBrigProperties :: PrepQuery R (Identity [UserId]) RowBrigProperties selectBrigProperties = "SELECT user, key, value FROM properties WHERE user in ?" readBrigProperties :: Env -> [UserId] -> ConduitM () [RowBrigProperties] IO () @@ -304,7 +304,7 @@ importBrigProperties Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "brig.properties" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envBrig) (sinkTableRows insertBrigProperties) @@ -316,7 +316,7 @@ importBrigProperties Env {..} path = do type RowBrigRichInfo = (Maybe UUID, Maybe Blob) -selectBrigRichInfo :: PrepQuery R (Identity ([UserId])) RowBrigRichInfo +selectBrigRichInfo :: PrepQuery R (Identity [UserId]) RowBrigRichInfo selectBrigRichInfo = "SELECT user, json FROM rich_info WHERE user in ?" readBrigRichInfo :: Env -> [UserId] -> ConduitM () [RowBrigRichInfo] IO () @@ -350,7 +350,7 @@ importBrigRichInfo Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "brig.rich_info" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envBrig) (sinkTableRows insertBrigRichInfo) @@ -362,7 +362,7 @@ importBrigRichInfo Env {..} path = do type RowBrigUser = (Maybe UUID, Maybe [Float], Maybe Int32, Maybe Bool, Maybe [AssetIgnoreData], Maybe Ascii, Maybe Text, Maybe UTCTime, Maybe Text, Maybe Ascii, Maybe Int32, Maybe Text, Maybe Blob, Maybe Text, Maybe [Blob], Maybe UUID, Maybe Bool, Maybe UUID, Maybe Text, Maybe Int32, Maybe UUID) -selectBrigUser :: PrepQuery R (Identity ([UserId])) RowBrigUser +selectBrigUser :: PrepQuery R (Identity [UserId]) RowBrigUser selectBrigUser = "SELECT id, accent, accent_id, activated, assets, country, email, expires, handle, language, managed_by, name, password, phone, picture, provider, searchable, service, sso_id, status, team FROM user WHERE id in ?" readBrigUser :: Env -> [UserId] -> ConduitM () [RowBrigUser] IO () @@ -396,7 +396,7 @@ importBrigUser Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "brig.user" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envBrig) (sinkTableRows insertBrigUser) @@ -408,7 +408,7 @@ importBrigUser Env {..} path = do type RowBrigUserHandle = (Maybe Text, Maybe UUID) -selectBrigUserHandle :: PrepQuery R (Identity ([Handle])) RowBrigUserHandle +selectBrigUserHandle :: PrepQuery R (Identity [Handle]) RowBrigUserHandle selectBrigUserHandle = "SELECT handle, user FROM user_handle WHERE handle in ?" readBrigUserHandle :: Env -> [Handle] -> ConduitM () [RowBrigUserHandle] IO () @@ -442,7 +442,7 @@ importBrigUserHandle Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "brig.user_handle" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envBrig) (sinkTableRows insertBrigUserHandle) @@ -454,7 +454,7 @@ importBrigUserHandle Env {..} path = do type RowBrigUserKeys = (Maybe Text, Maybe UUID) -selectBrigUserKeys :: PrepQuery R (Identity ([Int32])) RowBrigUserKeys +selectBrigUserKeys :: PrepQuery R (Identity [Int32]) RowBrigUserKeys selectBrigUserKeys = "SELECT key, user FROM user_keys WHERE key in ?" readBrigUserKeys :: Env -> [Int32] -> ConduitM () [RowBrigUserKeys] IO () @@ -488,7 +488,7 @@ importBrigUserKeys Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "brig.user_keys" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envBrig) (sinkTableRows insertBrigUserKeys) @@ -500,7 +500,7 @@ importBrigUserKeys Env {..} path = do type RowBrigUserKeysHash = (Maybe Blob, Maybe Int32, Maybe UUID) -selectBrigUserKeysHash :: PrepQuery R (Identity ([Int32])) RowBrigUserKeysHash +selectBrigUserKeysHash :: PrepQuery R (Identity [Int32]) RowBrigUserKeysHash selectBrigUserKeysHash = "SELECT key, key_type, user FROM user_keys_hash WHERE key in ?" readBrigUserKeysHash :: Env -> [Int32] -> ConduitM () [RowBrigUserKeysHash] IO () @@ -534,7 +534,7 @@ importBrigUserKeysHash Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "brig.user_keys_hash" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envBrig) (sinkTableRows insertBrigUserKeysHash) @@ -546,7 +546,7 @@ importBrigUserKeysHash Env {..} path = do type RowGalleyBillingTeamMember = (Maybe UUID, Maybe UUID) -selectGalleyBillingTeamMember :: PrepQuery R (Identity (TeamId)) RowGalleyBillingTeamMember +selectGalleyBillingTeamMember :: PrepQuery R (Identity TeamId) RowGalleyBillingTeamMember selectGalleyBillingTeamMember = "SELECT team, user FROM billing_team_member WHERE team = ?" readGalleyBillingTeamMember :: Env -> TeamId -> ConduitM () [RowGalleyBillingTeamMember] IO () @@ -580,7 +580,7 @@ importGalleyBillingTeamMember Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "galley.billing_team_member" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envGalley) (sinkTableRows insertGalleyBillingTeamMember) @@ -592,7 +592,7 @@ importGalleyBillingTeamMember Env {..} path = do type RowGalleyClients = (Maybe UUID, Maybe (Cassandra.Set Text)) -selectGalleyClients :: PrepQuery R (Identity ([UserId])) RowGalleyClients +selectGalleyClients :: PrepQuery R (Identity [UserId]) RowGalleyClients selectGalleyClients = "SELECT user, clients FROM clients WHERE user in ?" readGalleyClients :: Env -> [UserId] -> ConduitM () [RowGalleyClients] IO () @@ -626,7 +626,7 @@ importGalleyClients Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "galley.clients" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envGalley) (sinkTableRows insertGalleyClients) @@ -638,7 +638,7 @@ importGalleyClients Env {..} path = do type RowGalleyConversation = (Maybe UUID, Maybe (Cassandra.Set Int32), Maybe Int32, Maybe UUID, Maybe Bool, Maybe Int64, Maybe Text, Maybe Int32, Maybe UUID, Maybe Int32) -selectGalleyConversation :: PrepQuery R (Identity ([ConvId])) RowGalleyConversation +selectGalleyConversation :: PrepQuery R (Identity [ConvId]) RowGalleyConversation selectGalleyConversation = "SELECT conv, access, access_role, creator, deleted, message_timer, name, receipt_mode, team, type FROM conversation WHERE conv in ?" readGalleyConversation :: Env -> [ConvId] -> ConduitM () [RowGalleyConversation] IO () @@ -672,7 +672,7 @@ importGalleyConversation Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "galley.conversation" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envGalley) (sinkTableRows insertGalleyConversation) @@ -684,7 +684,7 @@ importGalleyConversation Env {..} path = do type RowGalleyMember = (Maybe UUID, Maybe UUID, Maybe Text, Maybe Bool, Maybe Text, Maybe Bool, Maybe Text, Maybe Bool, Maybe Text, Maybe Int32, Maybe UUID, Maybe UUID, Maybe Int32, Maybe Text, Maybe UUID) -selectGalleyMember :: PrepQuery R (Identity ([ConvId])) RowGalleyMember +selectGalleyMember :: PrepQuery R (Identity [ConvId]) RowGalleyMember selectGalleyMember = "SELECT conv, user, conversation_role, hidden, hidden_ref, otr_archived, otr_archived_ref, otr_muted, otr_muted_ref, otr_muted_status, provider, service, status, user_remote_domain, user_remote_id FROM member WHERE conv in ?" readGalleyMember :: Env -> [ConvId] -> ConduitM () [RowGalleyMember] IO () @@ -718,7 +718,7 @@ importGalleyMember Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "galley.member" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envGalley) (sinkTableRows insertGalleyMember) @@ -730,7 +730,7 @@ importGalleyMember Env {..} path = do type RowGalleyTeam = (Maybe UUID, Maybe Bool, Maybe UUID, Maybe Bool, Maybe Text, Maybe Text, Maybe Text, Maybe Int32, Maybe Int32) -selectGalleyTeam :: PrepQuery R (Identity (TeamId)) RowGalleyTeam +selectGalleyTeam :: PrepQuery R (Identity TeamId) RowGalleyTeam selectGalleyTeam = "SELECT team, binding, creator, deleted, icon, icon_key, name, search_visibility, status FROM team WHERE team = ?" readGalleyTeam :: Env -> TeamId -> ConduitM () [RowGalleyTeam] IO () @@ -764,7 +764,7 @@ importGalleyTeam Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "galley.team" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envGalley) (sinkTableRows insertGalleyTeam) @@ -776,7 +776,7 @@ importGalleyTeam Env {..} path = do type RowGalleyTeamConv = (Maybe UUID, Maybe UUID, Maybe Bool) -selectGalleyTeamConv :: PrepQuery R (Identity (TeamId)) RowGalleyTeamConv +selectGalleyTeamConv :: PrepQuery R (Identity TeamId) RowGalleyTeamConv selectGalleyTeamConv = "SELECT team, conv, managed FROM team_conv WHERE team = ?" readGalleyTeamConv :: Env -> TeamId -> ConduitM () [RowGalleyTeamConv] IO () @@ -810,7 +810,7 @@ importGalleyTeamConv Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "galley.team_conv" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envGalley) (sinkTableRows insertGalleyTeamConv) @@ -822,7 +822,7 @@ importGalleyTeamConv Env {..} path = do type RowGalleyTeamFeatures = (Maybe UUID, Maybe Int32, Maybe Int32, Maybe Int32, Maybe Int32, Maybe Int32, Maybe Int32, Maybe Int32, Maybe Int32) -selectGalleyTeamFeatures :: PrepQuery R (Identity (TeamId)) RowGalleyTeamFeatures +selectGalleyTeamFeatures :: PrepQuery R (Identity TeamId) RowGalleyTeamFeatures selectGalleyTeamFeatures = "SELECT team_id, app_lock_enforce, app_lock_inactivity_timeout_secs, app_lock_status, digital_signatures, legalhold_status, search_visibility_status, sso_status, validate_saml_emails FROM team_features WHERE team_id = ?" readGalleyTeamFeatures :: Env -> TeamId -> ConduitM () [RowGalleyTeamFeatures] IO () @@ -856,7 +856,7 @@ importGalleyTeamFeatures Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "galley.team_features" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envGalley) (sinkTableRows insertGalleyTeamFeatures) @@ -868,7 +868,7 @@ importGalleyTeamFeatures Env {..} path = do type RowGalleyTeamMember = (Maybe UUID, Maybe UUID, Maybe UTCTime, Maybe UUID, Maybe Int32, Maybe Permissions) -selectGalleyTeamMember :: PrepQuery R (Identity (TeamId)) RowGalleyTeamMember +selectGalleyTeamMember :: PrepQuery R (Identity TeamId) RowGalleyTeamMember selectGalleyTeamMember = "SELECT team, user, invited_at, invited_by, legalhold_status, perms FROM team_member WHERE team = ?" readGalleyTeamMember :: Env -> TeamId -> ConduitM () [RowGalleyTeamMember] IO () @@ -902,7 +902,7 @@ importGalleyTeamMember Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "galley.team_member" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envGalley) (sinkTableRows insertGalleyTeamMember) @@ -914,7 +914,7 @@ importGalleyTeamMember Env {..} path = do type RowGalleyTeamNotifications = (Maybe UUID, Maybe TimeUuid, Maybe Blob) -selectGalleyTeamNotifications :: PrepQuery R (Identity (TeamId)) RowGalleyTeamNotifications +selectGalleyTeamNotifications :: PrepQuery R (Identity TeamId) RowGalleyTeamNotifications selectGalleyTeamNotifications = "SELECT team, id, payload FROM team_notifications WHERE team = ?" readGalleyTeamNotifications :: Env -> TeamId -> ConduitM () [RowGalleyTeamNotifications] IO () @@ -948,7 +948,7 @@ importGalleyTeamNotifications Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "galley.team_notifications" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envGalley) (sinkTableRows insertGalleyTeamNotifications) @@ -960,7 +960,7 @@ importGalleyTeamNotifications Env {..} path = do type RowGalleyUser = (Maybe UUID, Maybe UUID, Maybe Text, Maybe UUID) -selectGalleyUser :: PrepQuery R (Identity ([UserId])) RowGalleyUser +selectGalleyUser :: PrepQuery R (Identity [UserId]) RowGalleyUser selectGalleyUser = "SELECT user, conv, conv_remote_domain, conv_remote_id FROM user WHERE user in ?" readGalleyUser :: Env -> [UserId] -> ConduitM () [RowGalleyUser] IO () @@ -994,7 +994,7 @@ importGalleyUser Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "galley.user" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envGalley) (sinkTableRows insertGalleyUser) @@ -1006,7 +1006,7 @@ importGalleyUser Env {..} path = do type RowGalleyUserTeam = (Maybe UUID, Maybe UUID) -selectGalleyUserTeam :: PrepQuery R (Identity ([UserId])) RowGalleyUserTeam +selectGalleyUserTeam :: PrepQuery R (Identity [UserId]) RowGalleyUserTeam selectGalleyUserTeam = "SELECT user, team FROM user_team WHERE user in ?" readGalleyUserTeam :: Env -> [UserId] -> ConduitM () [RowGalleyUserTeam] IO () @@ -1040,7 +1040,7 @@ importGalleyUserTeam Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "galley.user_team" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envGalley) (sinkTableRows insertGalleyUserTeam) @@ -1052,7 +1052,7 @@ importGalleyUserTeam Env {..} path = do type RowGundeckNotifications = (Maybe UUID, Maybe TimeUuid, Maybe (Cassandra.Set Text), Maybe Blob) -selectGundeckNotifications :: PrepQuery R (Identity ([UserId])) RowGundeckNotifications +selectGundeckNotifications :: PrepQuery R (Identity [UserId]) RowGundeckNotifications selectGundeckNotifications = "SELECT user, id, clients, payload FROM notifications WHERE user in ?" readGundeckNotifications :: Env -> [UserId] -> ConduitM () [RowGundeckNotifications] IO () @@ -1086,7 +1086,7 @@ importGundeckNotifications Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "gundeck.notifications" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envGundeck) (sinkTableRows insertGundeckNotifications) @@ -1098,7 +1098,7 @@ importGundeckNotifications Env {..} path = do type RowSparScimExternal = (Maybe UUID, Maybe Text, Maybe UUID) -selectSparScimExternal :: PrepQuery R (Identity (TeamId)) RowSparScimExternal +selectSparScimExternal :: PrepQuery R (Identity TeamId) RowSparScimExternal selectSparScimExternal = "SELECT team, external_id, user FROM scim_external WHERE team = ?" readSparScimExternal :: Env -> TeamId -> ConduitM () [RowSparScimExternal] IO () @@ -1132,7 +1132,7 @@ importSparScimExternal Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "spar.scim_external" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envSpar) (sinkTableRows insertSparScimExternal) @@ -1144,7 +1144,7 @@ importSparScimExternal Env {..} path = do type RowSparScimUserTimes = (Maybe UUID, Maybe UTCTime, Maybe UTCTime) -selectSparScimUserTimes :: PrepQuery R (Identity ([UserId])) RowSparScimUserTimes +selectSparScimUserTimes :: PrepQuery R (Identity [UserId]) RowSparScimUserTimes selectSparScimUserTimes = "SELECT uid, created_at, last_updated_at FROM scim_user_times WHERE uid in ?" readSparScimUserTimes :: Env -> [UserId] -> ConduitM () [RowSparScimUserTimes] IO () @@ -1178,7 +1178,7 @@ importSparScimUserTimes Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "spar.scim_user_times" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envSpar) (sinkTableRows insertSparScimUserTimes) @@ -1190,7 +1190,7 @@ importSparScimUserTimes Env {..} path = do type RowSparUser = (Maybe Text, Maybe Text, Maybe UUID) -selectSparUser :: PrepQuery R (Identity ([Text])) RowSparUser +selectSparUser :: PrepQuery R (Identity [Text]) RowSparUser selectSparUser = "SELECT issuer, sso_id, uid FROM user WHERE issuer in ?" readSparUser :: Env -> [Text] -> ConduitM () [RowSparUser] IO () @@ -1224,7 +1224,7 @@ importSparUser Env {..} path = do if exists then do putStrLn $ "Importing " <> path <> " to " <> "spar.user" - withBinaryFile path ReadMode $ \handle -> do + withBinaryFile path ReadMode $ \handle -> runConduit $ sourceJsonLines handle .| transPipe (runClient envSpar) (sinkTableRows insertSparUser) From 6c4af3744b98a9c9b5d5a7f97af7206fd2630a4f Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 16:40:29 +0100 Subject: [PATCH 14/63] Adapt for new quickcheck-state-machine --- services/gundeck/test/unit/ThreadBudget.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/gundeck/test/unit/ThreadBudget.hs b/services/gundeck/test/unit/ThreadBudget.hs index 2d03c38827..a4da34c10c 100644 --- a/services/gundeck/test/unit/ThreadBudget.hs +++ b/services/gundeck/test/unit/ThreadBudget.hs @@ -307,10 +307,10 @@ sm = STM.postcondition = postcondition, STM.invariant = Nothing, STM.generator = generator, - STM.distribution = Nothing, STM.shrinker = shrinker, STM.semantics = semantics, - STM.mock = mock + STM.mock = mock, + STM.cleanup = const (pure ()) } -- | Remove resources created by the concrete 'STM.Commands', namely watcher and budgeted From 55b0c5016273d50c7148dcc4b248530045ccb01e Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 16:54:49 +0100 Subject: [PATCH 15/63] Remvoe redandant import --- services/gundeck/test/unit/ThreadBudget.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/services/gundeck/test/unit/ThreadBudget.hs b/services/gundeck/test/unit/ThreadBudget.hs index a4da34c10c..b730e43d5b 100644 --- a/services/gundeck/test/unit/ThreadBudget.hs +++ b/services/gundeck/test/unit/ThreadBudget.hs @@ -28,7 +28,6 @@ import Control.Monad.Catch (MonadCatch, catch) import Data.Metrics.Middleware (metrics) import Data.String.Conversions (cs) import Data.Time -import Data.TreeDiff.Class (ToExpr) import GHC.Generics import Gundeck.Options import Gundeck.ThreadBudget.Internal From 1c8970fd36667e222b3844831bfaa71bd8c6514b Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 16:55:06 +0100 Subject: [PATCH 16/63] THIS EMPTY COMMIT SHOW MY HAPPINESS THAT EVERYTHING COMPILES!! From 63777807fefa706d9705ee4d2584e6e692f61848 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 17:04:06 +0100 Subject: [PATCH 17/63] Remvoe accidental saml2-web-sso --- cabal.project | 2 -- 1 file changed, 2 deletions(-) diff --git a/cabal.project b/cabal.project index 7cd4f6077e..2666788e77 100644 --- a/cabal.project +++ b/cabal.project @@ -237,8 +237,6 @@ package rex ghc-options: -Werror package ropes ghc-options: -Werror -package saml2-web-sso - ghc-options: -Werror package schema-profunctor ghc-options: -Werror package service-backfill From 59c7d7fee44e973b0fe533a4a4b70411fd3a09fc Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 17:18:12 +0100 Subject: [PATCH 18/63] Use merged commit of saml2-web-sso --- stack.yaml | 2 +- stack.yaml.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stack.yaml b/stack.yaml index 09a6e97570..241cc60600 100644 --- a/stack.yaml +++ b/stack.yaml @@ -85,7 +85,7 @@ extra-deps: # a version > 1.0.0 of wai-middleware-prometheus is available # (required: https://github.com/fimad/prometheus-haskell/pull/45) - git: https://github.com/wireapp/saml2-web-sso - commit: b761d352de12a411927a91729a5c27932d69ba9e # https://github.com/wireapp/saml2-web-sso/pull/80 (Dec 07, 2021) + commit: 4227e38be5c0810012dc472fc6931f6087fbce68 # master (Dec 07, 2021) - git: https://github.com/kim/hs-collectd commit: 885da222be2375f78c7be36127620ed772b677c9 diff --git a/stack.yaml.lock b/stack.yaml.lock index 458ed779a2..5825dda0bf 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -24,10 +24,10 @@ packages: pantry-tree: size: 4887 sha256: 9d6d175cc7bbdb57558f25557e4d0d698c4aecc250f6ca03296a3d94671bf657 - commit: b761d352de12a411927a91729a5c27932d69ba9e + commit: 4227e38be5c0810012dc472fc6931f6087fbce68 original: git: https://github.com/wireapp/saml2-web-sso - commit: b761d352de12a411927a91729a5c27932d69ba9e + commit: 4227e38be5c0810012dc472fc6931f6087fbce68 - completed: name: collectd version: 0.0.0.2 From ff459524ad748e21d99fb646412f810921dd168e Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 7 Dec 2021 17:18:43 +0100 Subject: [PATCH 19/63] zauth: Update cargoSha256 --- nix/overlays/wire-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/overlays/wire-server.nix b/nix/overlays/wire-server.nix index 602b42059f..dd5a6b8188 100644 --- a/nix/overlays/wire-server.nix +++ b/nix/overlays/wire-server.nix @@ -37,7 +37,7 @@ self: super: { src = self.nix-gitignore.gitignoreSourcePure [ ../../.gitignore ] ../../libs/libzauth; sourceRoot = "libzauth/libzauth-c"; - cargoSha256 = "10ijvi3rnnqpy589hhhp8s4p7xfpsbb1c3mzqnf65ra96q4nd6bf"; # self.lib.fakeSha256; + cargoSha256 = "sha256-umwOVCFHtszu64aIc8eqMPGCS7vt1nYQFAQh2XuV+v4="; # self.lib.fakeSha256; patchLibs = super.lib.optionalString super.stdenv.isDarwin '' install_name_tool -id $out/lib/libzauth.dylib $out/lib/libzauth.dylib From b710c749a80cd777323a67a805bdc6e9a7b88da0 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 10:13:52 +0100 Subject: [PATCH 20/63] Dockerfile.prebuilder: Bump ghc and stack versions --- build/alpine/Dockerfile.prebuilder | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/alpine/Dockerfile.prebuilder b/build/alpine/Dockerfile.prebuilder index 3f84e00a7a..5cb0374017 100644 --- a/build/alpine/Dockerfile.prebuilder +++ b/build/alpine/Dockerfile.prebuilder @@ -42,12 +42,12 @@ RUN apk add --no-cache \ sed # get static version of Haskell Stack and use system ghc by default -ARG STACK_ALPINE_VERSION=2.3.1 +ARG STACK_ALPINE_VERSION=2.7.3 RUN curl -sSfL https://github.com/commercialhaskell/stack/releases/download/v${STACK_ALPINE_VERSION}/stack-${STACK_ALPINE_VERSION}-linux-x86_64-static.tar.gz \ | tar --wildcards -C /usr/local/bin --strip-components=1 -xzvf - '*/stack' && chmod 755 /usr/local/bin/stack && \ stack config set system-ghc --global true -ARG GHC_VERSION=8.8.4 +ARG GHC_VERSION=8.10.7 RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org \ | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=${GHC_VERSION} sh From 1360219d8b8a63f6c28767312647639664c5f4eb Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 12:55:11 +0100 Subject: [PATCH 21/63] Add integer-gmp to stack.yaml --- stack.yaml | 4 ++++ stack.yaml.lock | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/stack.yaml b/stack.yaml index 241cc60600..ca1a351a84 100644 --- a/stack.yaml +++ b/stack.yaml @@ -253,6 +253,10 @@ extra-deps: - proto-lens-setup-0.4.0.5 - tracing-0.0.7.2 +# This is supposed to alredy be present in the snapshot but CI fails for some +# reason. TODO: investigate +- integer-gmp-1.0.3.0@sha256:514e81647473ce380cf1814821664c0dcedc2801ad8dbf41b19a10f916e1cc75,2138 + ############################################################ # Development tools ############################################################ diff --git a/stack.yaml.lock b/stack.yaml.lock index 5825dda0bf..da3d145b29 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -738,6 +738,13 @@ packages: sha256: b3059324bf8fea08874dd4f5518105f3edd6e469104242e652698f488a5227d5 original: hackage: tracing-0.0.7.2 +- completed: + hackage: integer-gmp-1.0.3.0@sha256:514e81647473ce380cf1814821664c0dcedc2801ad8dbf41b19a10f916e1cc75,2138 + pantry-tree: + size: 1109 + sha256: 5b3253cddae6067147ee898921258b5b3ffec16f280e86ffb872f129556f6f12 + original: + hackage: integer-gmp-1.0.3.0@sha256:514e81647473ce380cf1814821664c0dcedc2801ad8dbf41b19a10f916e1cc75,2138 - completed: hackage: ormolu-0.1.4.1@sha256:ed404eac6e4eb64da1ca5fb749e0f99907431a9633e6ba34e44d260e7d7728ba,6499 pantry-tree: From 6c486779ecd71837ac92c0673a764c43b46ee32b Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 14:39:15 +0100 Subject: [PATCH 22/63] Dockerfile.prebuilder: Add binutils-gold Some packages don't compile without this --- build/alpine/Dockerfile.prebuilder | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/alpine/Dockerfile.prebuilder b/build/alpine/Dockerfile.prebuilder index 5cb0374017..f82961a64d 100644 --- a/build/alpine/Dockerfile.prebuilder +++ b/build/alpine/Dockerfile.prebuilder @@ -39,7 +39,8 @@ RUN apk add --no-cache \ git \ ncurses \ ncurses-dev \ - sed + sed \ + binutils-gold # get static version of Haskell Stack and use system ghc by default ARG STACK_ALPINE_VERSION=2.7.3 From 7ddefe48e2b84f61299864825279626b53ed7b2c Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 16:58:18 +0100 Subject: [PATCH 23/63] Start docker build with ubuntu:20.04 --- build/ubuntu/Dockefile.builder | 26 +++++++++++++ build/ubuntu/Dockerfile.deps | 26 +++++++++++++ build/ubuntu/Dockerfile.prebuilder | 62 ++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 build/ubuntu/Dockefile.builder create mode 100644 build/ubuntu/Dockerfile.deps create mode 100644 build/ubuntu/Dockerfile.prebuilder diff --git a/build/ubuntu/Dockefile.builder b/build/ubuntu/Dockefile.builder new file mode 100644 index 0000000000..2d8a7280c7 --- /dev/null +++ b/build/ubuntu/Dockefile.builder @@ -0,0 +1,26 @@ +ARG prebuilder=quay.io/wire/alpine-prebuilder + +FROM ${prebuilder} +WORKDIR / + +# Download stack indices and compile/cache dependencies to speed up subsequent +# container creation. +# +# We build docs for haskell-src-exts without hyperlinking enabled to avoid +# a Haddock segfault. See https://github.com/haskell/haddock/issues/928 + +ARG wire_server_branch=develop +ARG THREADS=4 +RUN set -x && \ + echo ${wire_server_branch} && \ + git clone -b ${wire_server_branch} https://github.com/wireapp/wire-server.git && \ + cd /wire-server && \ + stack update && \ + echo "allow-different-user: true" >> /root/.stack/config.yaml && \ + stack build --haddock --dependencies-only haskell-src-exts && \ + stack build --haddock --no-haddock-hyperlink-source haskell-src-exts && \ + stack build --pedantic --haddock --test --no-run-tests --bench --no-run-benchmarks --dependencies-only -j${THREADS} && \ + stack install ormolu && \ + cd / && \ + # we run the build only to cache the built source in /root/.stack, we can remove the source code itself + rm -rf /wire-server diff --git a/build/ubuntu/Dockerfile.deps b/build/ubuntu/Dockerfile.deps new file mode 100644 index 0000000000..945ac2a33e --- /dev/null +++ b/build/ubuntu/Dockerfile.deps @@ -0,0 +1,26 @@ +FROM ubuntu:20.04 as cryptobox-builder + +# compile cryptobox-c +RUN apt-get update && apt-get install -y cargo file libsodium-dev git && \ + cd /tmp && \ + git clone https://github.com/wireapp/cryptobox-c.git && \ + cd cryptobox-c && \ + export SODIUM_USE_PKG_CONFIG=1 && \ + cargo build --release + +# Minimal dependencies for alpine-compiled, dynamically linked wire-server Haskell services +FROM ubuntu:20.04 + +COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib + +RUN apt-get update && apt-get install -y \ + libsodium \ + libssl \ + libgmp10 \ + libffi8 \ + libicu67 \ + geoip-bin \ + ca-certificates \ + dumb-init \ + libxml2 \ + ncurses diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder new file mode 100644 index 0000000000..fdbd0ac37d --- /dev/null +++ b/build/ubuntu/Dockerfile.prebuilder @@ -0,0 +1,62 @@ +FROM ubuntu:20.04 as cryptobox-builder + +# compile cryptobox-c +RUN apt-get update && apt-get install -y cargo file libsodium-dev git && \ + cd /tmp && \ + git clone https://github.com/wireapp/cryptobox-c.git && \ + cd cryptobox-c && \ + export SODIUM_USE_PKG_CONFIG=1 && \ + cargo build --release + +FROM ubuntu:20.04 + +# install cryptobox-c in the new container +COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib/libcryptobox.so +COPY --from=cryptobox-builder /tmp/cryptobox-c/src/cbox.h /usr/include/cbox.h + +# development packages required for wire-server Haskell services +RUN apt-get update \ + && apt-get install -y \ + ca-certificates \ + build-essentials \ + clang \ + debhelper \ + dh-autoreconf \ + libgeoip-dev \ + libglib2.0-dev \ + libicu-dev \ + libleveldb1 \ + libleveldb-dev \ + libossp-uuid-dev \ + libpcre3-dev \ + libsnappy-dev \ + libssl-dev \ + libstatgrab-dev \ + pkg-config \ + tcl \ + upx-ucl \ + zlib1g-dev \ + libbz2-dev \ + libpq-dev \ + curl \ + wget \ + git \ + libffi-dev \ + libffi6\ + libgmp-dev\ + libgmp10\ + libncurses-dev\ + libncurses5\ + libtinfo5 + +# get static version of Haskell Stack and use system ghc by default +ARG STACK_ALPINE_VERSION=2.7.3 +RUN curl -sSfL https://github.com/commercialhaskell/stack/releases/download/v${STACK_ALPINE_VERSION}/stack-${STACK_ALPINE_VERSION}-linux-x86_64-static.tar.gz \ + | tar --wildcards -C /usr/local/bin --strip-components=1 -xzvf - '*/stack' && chmod 755 /usr/local/bin/stack && \ + stack config set system-ghc --global true + +ARG GHC_VERSION=8.10.7 +RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org \ + | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=${GHC_VERSION} sh + +ENV PATH=/root/.ghcup/bin:${PATH} From 07d71e3cba15cbe86329ab0c6b699ce759e4a6a6 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 17:29:08 +0100 Subject: [PATCH 24/63] Fix ubuntu dockerfiles --- build/ubuntu/{Dockefile.builder => Dockerfile.builder} | 0 build/ubuntu/Dockerfile.deps | 1 - build/ubuntu/Dockerfile.prebuilder | 1 - 3 files changed, 2 deletions(-) rename build/ubuntu/{Dockefile.builder => Dockerfile.builder} (100%) diff --git a/build/ubuntu/Dockefile.builder b/build/ubuntu/Dockerfile.builder similarity index 100% rename from build/ubuntu/Dockefile.builder rename to build/ubuntu/Dockerfile.builder diff --git a/build/ubuntu/Dockerfile.deps b/build/ubuntu/Dockerfile.deps index 945ac2a33e..9131da7bef 100644 --- a/build/ubuntu/Dockerfile.deps +++ b/build/ubuntu/Dockerfile.deps @@ -5,7 +5,6 @@ RUN apt-get update && apt-get install -y cargo file libsodium-dev git && \ cd /tmp && \ git clone https://github.com/wireapp/cryptobox-c.git && \ cd cryptobox-c && \ - export SODIUM_USE_PKG_CONFIG=1 && \ cargo build --release # Minimal dependencies for alpine-compiled, dynamically linked wire-server Haskell services diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index fdbd0ac37d..12d5941c71 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -5,7 +5,6 @@ RUN apt-get update && apt-get install -y cargo file libsodium-dev git && \ cd /tmp && \ git clone https://github.com/wireapp/cryptobox-c.git && \ cd cryptobox-c && \ - export SODIUM_USE_PKG_CONFIG=1 && \ cargo build --release FROM ubuntu:20.04 From e1c98e8b909d06b2665aaab9d93e9041b9ffe822 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 17:35:26 +0100 Subject: [PATCH 25/63] ubuntu/docker: Install pkg-config to install cryptobox --- build/ubuntu/Dockerfile.deps | 3 ++- build/ubuntu/Dockerfile.prebuilder | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/ubuntu/Dockerfile.deps b/build/ubuntu/Dockerfile.deps index 9131da7bef..3c04767f77 100644 --- a/build/ubuntu/Dockerfile.deps +++ b/build/ubuntu/Dockerfile.deps @@ -1,10 +1,11 @@ FROM ubuntu:20.04 as cryptobox-builder # compile cryptobox-c -RUN apt-get update && apt-get install -y cargo file libsodium-dev git && \ +RUN apt-get update && apt-get install -y cargo file libsodium-dev git pkg-config && \ cd /tmp && \ git clone https://github.com/wireapp/cryptobox-c.git && \ cd cryptobox-c && \ + export SODIUM_USE_PKG_CONFIG=1 && \ cargo build --release # Minimal dependencies for alpine-compiled, dynamically linked wire-server Haskell services diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index 12d5941c71..50d6d147f3 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -1,10 +1,11 @@ FROM ubuntu:20.04 as cryptobox-builder # compile cryptobox-c -RUN apt-get update && apt-get install -y cargo file libsodium-dev git && \ +RUN apt-get update && apt-get install -y cargo file libsodium-dev git pkg-config && \ cd /tmp && \ git clone https://github.com/wireapp/cryptobox-c.git && \ cd cryptobox-c && \ + export SODIUM_USE_PKG_CONFIG=1 && \ cargo build --release FROM ubuntu:20.04 From 36e5e4bc28238b8defced35532b13ff634c751e9 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 17:39:06 +0100 Subject: [PATCH 26/63] ubuntu/docker: Ensure installation is noninteractive --- build/ubuntu/Dockerfile.deps | 4 +++- build/ubuntu/Dockerfile.prebuilder | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build/ubuntu/Dockerfile.deps b/build/ubuntu/Dockerfile.deps index 3c04767f77..b5694e389e 100644 --- a/build/ubuntu/Dockerfile.deps +++ b/build/ubuntu/Dockerfile.deps @@ -1,7 +1,9 @@ FROM ubuntu:20.04 as cryptobox-builder # compile cryptobox-c -RUN apt-get update && apt-get install -y cargo file libsodium-dev git pkg-config && \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y cargo file libsodium-dev git pkg-config && \ cd /tmp && \ git clone https://github.com/wireapp/cryptobox-c.git && \ cd cryptobox-c && \ diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index 50d6d147f3..830d055b97 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -1,7 +1,9 @@ FROM ubuntu:20.04 as cryptobox-builder # compile cryptobox-c -RUN apt-get update && apt-get install -y cargo file libsodium-dev git pkg-config && \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y cargo file libsodium-dev git pkg-config && \ cd /tmp && \ git clone https://github.com/wireapp/cryptobox-c.git && \ cd cryptobox-c && \ From 0876da4e7bf5c950efd87bb36b4b0b5f637138d6 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 17:44:31 +0100 Subject: [PATCH 27/63] ubuntu/docker: Use new package for libleveldb1 --- build/ubuntu/Dockerfile.prebuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index 830d055b97..359a2d104a 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -27,7 +27,7 @@ RUN apt-get update \ libgeoip-dev \ libglib2.0-dev \ libicu-dev \ - libleveldb1 \ + libleveldb1d \ libleveldb-dev \ libossp-uuid-dev \ libpcre3-dev \ From df636416d16e3c501cfa73aba402cd0373d14c2e Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 17:47:53 +0100 Subject: [PATCH 28/63] ubutu/dockerfile.deps: Better apt package names --- build/ubuntu/Dockerfile.deps | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/ubuntu/Dockerfile.deps b/build/ubuntu/Dockerfile.deps index b5694e389e..aa6b880f22 100644 --- a/build/ubuntu/Dockerfile.deps +++ b/build/ubuntu/Dockerfile.deps @@ -16,13 +16,13 @@ FROM ubuntu:20.04 COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib RUN apt-get update && apt-get install -y \ - libsodium \ - libssl \ + libsodium23 \ + libssl1.1 \ libgmp10 \ - libffi8 \ - libicu67 \ + libffi7 \ + libicu66 \ geoip-bin \ ca-certificates \ dumb-init \ libxml2 \ - ncurses + libncurses6 From a74c51bace0bd7648c014ebf1f179c2ede11fd47 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 17:49:21 +0100 Subject: [PATCH 29/63] ubuntu/dockefile.prebuilder: Better package names --- build/ubuntu/Dockerfile.prebuilder | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index 359a2d104a..fe9297c02a 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -20,7 +20,7 @@ COPY --from=cryptobox-builder /tmp/cryptobox-c/src/cbox.h /usr/include/cbox.h RUN apt-get update \ && apt-get install -y \ ca-certificates \ - build-essentials \ + build-essential \ clang \ debhelper \ dh-autoreconf \ @@ -44,7 +44,7 @@ RUN apt-get update \ wget \ git \ libffi-dev \ - libffi6\ + libffi7 \ libgmp-dev\ libgmp10\ libncurses-dev\ From 9790536c4d404dfddc9cce69ea3d36ed6a793436 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 17:55:25 +0100 Subject: [PATCH 30/63] ubuntu/dockerfile: More noninteractive frontend --- build/ubuntu/Dockerfile.prebuilder | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index fe9297c02a..365bdfa0dd 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -17,7 +17,8 @@ COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /u COPY --from=cryptobox-builder /tmp/cryptobox-c/src/cbox.h /usr/include/cbox.h # development packages required for wire-server Haskell services -RUN apt-get update \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update \ && apt-get install -y \ ca-certificates \ build-essential \ From 5a2b0fe8bc87d57ef0ad04ee147a913b53407202 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 17:56:12 +0100 Subject: [PATCH 31/63] Even more noninteractive apt installs --- build/ubuntu/Dockerfile.deps | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/ubuntu/Dockerfile.deps b/build/ubuntu/Dockerfile.deps index aa6b880f22..738b5ac14d 100644 --- a/build/ubuntu/Dockerfile.deps +++ b/build/ubuntu/Dockerfile.deps @@ -15,7 +15,9 @@ FROM ubuntu:20.04 COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib -RUN apt-get update && apt-get install -y \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y \ libsodium23 \ libssl1.1 \ libgmp10 \ From e3c47506ffe3a17feca35ffd9993ec93a1223e0b Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 18:23:38 +0100 Subject: [PATCH 32/63] ubuntu/docker: Add rest of the dockerfiles --- build/ubuntu/Dockerfile.executable | 22 ++++++++++++++++++++++ build/ubuntu/Dockerfile.fast-intermediate | 18 ++++++++++++++++++ build/ubuntu/Dockerfile.intermediate | 18 ++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 build/ubuntu/Dockerfile.executable create mode 100644 build/ubuntu/Dockerfile.fast-intermediate create mode 100644 build/ubuntu/Dockerfile.intermediate diff --git a/build/ubuntu/Dockerfile.executable b/build/ubuntu/Dockerfile.executable new file mode 100644 index 0000000000..76621ef4e2 --- /dev/null +++ b/build/ubuntu/Dockerfile.executable @@ -0,0 +1,22 @@ +ARG intermediate=quay.io/wire/ubuntu20-intermediate +ARG deps=quay.io/wire/ubuntu20-deps + +#--- Intermediate stage --- +FROM ${intermediate} as intermediate + +#--- Minified stage --- +FROM ${deps} + +ARG executable + +COPY --from=intermediate /dist/${executable} /usr/bin/${executable} + +# TODO: only if executable=brig, also copy templates. Docker image conditionals seem hacky: +# https://stackoverflow.com/questions/31528384/conditional-copy-add-in-dockerfile +# For now, adds ~2 MB of additional files into every container +COPY --from=intermediate /dist/templates/ /usr/share/wire/templates/ + +# ARGs are not available at runtime, create symlink at build time +# more info: https://stackoverflow.com/questions/40902445/using-variable-interpolation-in-string-in-docker +RUN ln -s /usr/bin/${executable} /usr/bin/service +ENTRYPOINT ["/usr/bin/dumb-init", "--", "/usr/bin/service"] diff --git a/build/ubuntu/Dockerfile.fast-intermediate b/build/ubuntu/Dockerfile.fast-intermediate new file mode 100644 index 0000000000..a4563d0ffc --- /dev/null +++ b/build/ubuntu/Dockerfile.fast-intermediate @@ -0,0 +1,18 @@ +ARG builder=quay.io/wire/ubuntu20-builder +ARG deps=quay.io/wire/ubuntu-deps + +#--- Builder stage --- +FROM ${builder} as builder + +WORKDIR /wire-server/ + +COPY . /wire-server/ + +RUN make clean fast + +#--- Minified stage --- +FROM ${deps} + +COPY --from=builder /wire-server/dist/ /dist/ +# brig also needs some templates. +COPY --from=builder /wire-server/services/brig/deb/opt/brig/templates/ /dist/templates/ diff --git a/build/ubuntu/Dockerfile.intermediate b/build/ubuntu/Dockerfile.intermediate new file mode 100644 index 0000000000..0e768df0cc --- /dev/null +++ b/build/ubuntu/Dockerfile.intermediate @@ -0,0 +1,18 @@ +ARG builder=quay.io/wire/ubuntu20-builder +ARG deps=quay.io/wire/ubuntu20-deps + +#--- Builder stage --- +FROM ${builder} as builder + +WORKDIR /wire-server/ + +COPY . /wire-server/ + +RUN make clean install + +#--- Minified stage --- +FROM ${deps} + +COPY --from=builder /wire-server/dist/ /dist/ +# brig also needs some templates. +COPY --from=builder /wire-server/services/brig/deb/opt/brig/templates/ /dist/templates/ From 2550cd57df7efcf820877420fcf91489dffdc20c Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 18:27:28 +0100 Subject: [PATCH 33/63] ubuntu/docker: set locale --- build/ubuntu/Dockerfile.prebuilder | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index 365bdfa0dd..a5c56ee74b 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -63,3 +63,5 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org \ | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=${GHC_VERSION} sh ENV PATH=/root/.ghcup/bin:${PATH} + LANG=C.UTF-8 \ + LC_ALL=C.UTF-8 \ From 67f03186cb619b97dd851de73d6385d34a0dff8a Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 8 Dec 2021 18:39:49 +0100 Subject: [PATCH 34/63] Fix dockerfile --- build/ubuntu/Dockerfile.prebuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index a5c56ee74b..16453a306c 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -62,6 +62,6 @@ ARG GHC_VERSION=8.10.7 RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org \ | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=${GHC_VERSION} sh -ENV PATH=/root/.ghcup/bin:${PATH} +ENV PATH=/root/.ghcup/bin:${PATH} \ LANG=C.UTF-8 \ LC_ALL=C.UTF-8 \ From f39ea0f7e535d2157d935ebdbedc6495cc0c9a11 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Thu, 9 Dec 2021 09:09:44 +0100 Subject: [PATCH 35/63] ubuntu/docker: Add missing libs --- build/ubuntu/Dockerfile.deps | 3 ++- build/ubuntu/Dockerfile.prebuilder | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/ubuntu/Dockerfile.deps b/build/ubuntu/Dockerfile.deps index 738b5ac14d..e1f130f034 100644 --- a/build/ubuntu/Dockerfile.deps +++ b/build/ubuntu/Dockerfile.deps @@ -27,4 +27,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ca-certificates \ dumb-init \ libxml2 \ - libncurses6 + libncurses6 \ + zlib1g diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index 16453a306c..c4dad7fc92 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -40,6 +40,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ upx-ucl \ zlib1g-dev \ libbz2-dev \ + liblzma-dev \ + liblzma5 \ libpq-dev \ curl \ wget \ From 276c405578b422830e51b77d230e12686700450b Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Thu, 9 Dec 2021 09:24:14 +0100 Subject: [PATCH 36/63] ubuntu/docker: Add libsodium --- build/ubuntu/Dockerfile.deps | 2 +- build/ubuntu/Dockerfile.prebuilder | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/ubuntu/Dockerfile.deps b/build/ubuntu/Dockerfile.deps index e1f130f034..4dbf93f989 100644 --- a/build/ubuntu/Dockerfile.deps +++ b/build/ubuntu/Dockerfile.deps @@ -10,7 +10,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ export SODIUM_USE_PKG_CONFIG=1 && \ cargo build --release -# Minimal dependencies for alpine-compiled, dynamically linked wire-server Haskell services +# Minimal dependencies for ubuntu-compiled, dynamically linked wire-server Haskell services FROM ubuntu:20.04 COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index c4dad7fc92..ee4a9215b9 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -42,6 +42,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libbz2-dev \ liblzma-dev \ liblzma5 \ + libsodium-dev \ + libsodium23 \ libpq-dev \ curl \ wget \ From 07eb13cb7ca4c42f08bff9d9b4ebfbe69b7556ea Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Thu, 9 Dec 2021 09:43:49 +0100 Subject: [PATCH 37/63] ubuntu/docker: Add libxml2 --- build/ubuntu/Dockerfile.prebuilder | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index ee4a9215b9..dcb08a9d4b 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -45,6 +45,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsodium-dev \ libsodium23 \ libpq-dev \ + libxml2-dev \ + libxml2 \ curl \ wget \ git \ From b32442b0cc3fd8055bb8fffa77aa805a54d95d39 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Thu, 9 Dec 2021 09:54:55 +0100 Subject: [PATCH 38/63] ubuntu/docker: Add protobuf-compiler --- build/ubuntu/Dockerfile.prebuilder | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index dcb08a9d4b..505993fe3d 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -52,11 +52,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ git \ libffi-dev \ libffi7 \ - libgmp-dev\ - libgmp10\ - libncurses-dev\ - libncurses5\ - libtinfo5 + libgmp-dev \ + libgmp10 \ + libncurses-dev \ + libncurses5 \ + libtinfo5 \ + protobuf-compiler # get static version of Haskell Stack and use system ghc by default ARG STACK_ALPINE_VERSION=2.7.3 From 81603406a688704c5eb31fa4827d7fbca0650183 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Thu, 9 Dec 2021 10:18:05 +0100 Subject: [PATCH 39/63] alpine/docker: Patch stack.yaml to use integer-simple, upgrade alpine --- build/alpine/Dockerfile.builder | 1 + build/alpine/Dockerfile.deps | 4 ++-- build/alpine/Dockerfile.prebuilder | 7 ++++--- hack/bin/alpine-stack-patch.sh | 9 +++++++++ stack.yaml | 5 ++--- stack.yaml.lock | 8 ++++---- 6 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 hack/bin/alpine-stack-patch.sh diff --git a/build/alpine/Dockerfile.builder b/build/alpine/Dockerfile.builder index 52203d7a58..d525f442fe 100644 --- a/build/alpine/Dockerfile.builder +++ b/build/alpine/Dockerfile.builder @@ -18,6 +18,7 @@ RUN set -x && \ cd /wire-server && \ stack update && \ echo "allow-different-user: true" >> /root/.stack/config.yaml && \ + ./hack/bin/alpine-stack-patch.sh stack build --haddock --dependencies-only haskell-src-exts && \ stack build --haddock --no-haddock-hyperlink-source haskell-src-exts && \ stack build --pedantic --haddock --test --no-run-tests --bench --no-run-benchmarks --dependencies-only -j${THREADS} && \ diff --git a/build/alpine/Dockerfile.deps b/build/alpine/Dockerfile.deps index 9ef4958bb1..d4d5f50e2c 100644 --- a/build/alpine/Dockerfile.deps +++ b/build/alpine/Dockerfile.deps @@ -1,6 +1,6 @@ # Requires docker >= 17.05 (requires support for multi-stage builds) -FROM alpine:3.12 as cryptobox-builder +FROM alpine:3.15 as cryptobox-builder # compile cryptobox-c RUN apk add --no-cache cargo file libsodium-dev git && \ @@ -11,7 +11,7 @@ RUN apk add --no-cache cargo file libsodium-dev git && \ cargo build --release # Minimal dependencies for alpine-compiled, dynamically linked wire-server Haskell services -FROM alpine:3.12 +FROM alpine:3.15 COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib diff --git a/build/alpine/Dockerfile.prebuilder b/build/alpine/Dockerfile.prebuilder index f82961a64d..e6d7b045d4 100644 --- a/build/alpine/Dockerfile.prebuilder +++ b/build/alpine/Dockerfile.prebuilder @@ -1,6 +1,6 @@ # Requires docker >= 17.05 (requires support for multi-stage builds) -FROM alpine:3.12 as cryptobox-builder +FROM alpine:3.15 as cryptobox-builder # compile cryptobox-c RUN apk add --no-cache cargo file libsodium-dev git && \ @@ -10,7 +10,7 @@ RUN apk add --no-cache cargo file libsodium-dev git && \ export SODIUM_USE_PKG_CONFIG=1 && \ cargo build --release -FROM alpine:3.12 +FROM alpine:3.15 # install cryptobox-c in the new container COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib/libcryptobox.so @@ -40,7 +40,8 @@ RUN apk add --no-cache \ ncurses \ ncurses-dev \ sed \ - binutils-gold + binutils-gold \ + yq # get static version of Haskell Stack and use system ghc by default ARG STACK_ALPINE_VERSION=2.7.3 diff --git a/hack/bin/alpine-stack-patch.sh b/hack/bin/alpine-stack-patch.sh new file mode 100644 index 0000000000..d80da0e839 --- /dev/null +++ b/hack/bin/alpine-stack-patch.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -e +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +TOP_LEVEL="$(cd "$DIR/../.." && pwd)" + +tmpStackYaml=$(mktemp) +yq '. + {flags: {cryptonite: {"integer-gmp": false}, hashable: {"interger-gmp": false}, "integer-logarithms": {"integer-gmp": false}, scientific: {"integer-simple": true}}}' "$TOP_LEVEL/stack.yaml" > $tmpStackYaml +cp $tmpStackYaml "$TOP_LEVEL/stack.yaml" diff --git a/stack.yaml b/stack.yaml index ca1a351a84..2c1e112e28 100644 --- a/stack.yaml +++ b/stack.yaml @@ -253,9 +253,8 @@ extra-deps: - proto-lens-setup-0.4.0.5 - tracing-0.0.7.2 -# This is supposed to alredy be present in the snapshot but CI fails for some -# reason. TODO: investigate -- integer-gmp-1.0.3.0@sha256:514e81647473ce380cf1814821664c0dcedc2801ad8dbf41b19a10f916e1cc75,2138 +# This is required for compiling on Alpine Linux +- integer-simple-0.1.1.1@sha256:edfa49fb19eb8e14ce4e0edd03327f13dfb71d186295df9f8dcd4ca59321c0a8,1002 ############################################################ # Development tools diff --git a/stack.yaml.lock b/stack.yaml.lock index da3d145b29..400e410a7c 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -739,12 +739,12 @@ packages: original: hackage: tracing-0.0.7.2 - completed: - hackage: integer-gmp-1.0.3.0@sha256:514e81647473ce380cf1814821664c0dcedc2801ad8dbf41b19a10f916e1cc75,2138 + hackage: integer-simple-0.1.1.1@sha256:edfa49fb19eb8e14ce4e0edd03327f13dfb71d186295df9f8dcd4ca59321c0a8,1002 pantry-tree: - size: 1109 - sha256: 5b3253cddae6067147ee898921258b5b3ffec16f280e86ffb872f129556f6f12 + size: 487 + sha256: d20ef6171d3ae1459afcdf238b152404fe7f1eaaab37ab04333f04de8a2dd082 original: - hackage: integer-gmp-1.0.3.0@sha256:514e81647473ce380cf1814821664c0dcedc2801ad8dbf41b19a10f916e1cc75,2138 + hackage: integer-simple-0.1.1.1@sha256:edfa49fb19eb8e14ce4e0edd03327f13dfb71d186295df9f8dcd4ca59321c0a8,1002 - completed: hackage: ormolu-0.1.4.1@sha256:ed404eac6e4eb64da1ca5fb749e0f99907431a9633e6ba34e44d260e7d7728ba,6499 pantry-tree: From cc65ebad1610570a901b1ed289e2f59776fd56c0 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Thu, 9 Dec 2021 10:26:11 +0100 Subject: [PATCH 40/63] alpine/docker: Better patch not dependant on yq alpine distribution has a different yq --- hack/bin/alpine-stack-patch.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) mode change 100644 => 100755 hack/bin/alpine-stack-patch.sh diff --git a/hack/bin/alpine-stack-patch.sh b/hack/bin/alpine-stack-patch.sh old mode 100644 new mode 100755 index d80da0e839..3cbb6ced4e --- a/hack/bin/alpine-stack-patch.sh +++ b/hack/bin/alpine-stack-patch.sh @@ -4,6 +4,14 @@ set -e DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" TOP_LEVEL="$(cd "$DIR/../.." && pwd)" -tmpStackYaml=$(mktemp) -yq '. + {flags: {cryptonite: {"integer-gmp": false}, hashable: {"interger-gmp": false}, "integer-logarithms": {"integer-gmp": false}, scientific: {"integer-simple": true}}}' "$TOP_LEVEL/stack.yaml" > $tmpStackYaml -cp $tmpStackYaml "$TOP_LEVEL/stack.yaml" +cat >>$TOP_LEVEL/stack.yaml < Date: Thu, 9 Dec 2021 10:37:12 +0100 Subject: [PATCH 41/63] alpine/docker: Add slash --- build/alpine/Dockerfile.builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/alpine/Dockerfile.builder b/build/alpine/Dockerfile.builder index d525f442fe..5b5647f7e6 100644 --- a/build/alpine/Dockerfile.builder +++ b/build/alpine/Dockerfile.builder @@ -18,7 +18,7 @@ RUN set -x && \ cd /wire-server && \ stack update && \ echo "allow-different-user: true" >> /root/.stack/config.yaml && \ - ./hack/bin/alpine-stack-patch.sh + ./hack/bin/alpine-stack-patch.sh \ stack build --haddock --dependencies-only haskell-src-exts && \ stack build --haddock --no-haddock-hyperlink-source haskell-src-exts && \ stack build --pedantic --haddock --test --no-run-tests --bench --no-run-benchmarks --dependencies-only -j${THREADS} && \ From 166094975dd5acc79d5f3fd48dccd7cadc0bae93 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Thu, 9 Dec 2021 10:38:07 +0100 Subject: [PATCH 42/63] Go back to alpine 3.12 --- build/alpine/Dockerfile.deps | 4 ++-- build/alpine/Dockerfile.prebuilder | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/alpine/Dockerfile.deps b/build/alpine/Dockerfile.deps index d4d5f50e2c..9ef4958bb1 100644 --- a/build/alpine/Dockerfile.deps +++ b/build/alpine/Dockerfile.deps @@ -1,6 +1,6 @@ # Requires docker >= 17.05 (requires support for multi-stage builds) -FROM alpine:3.15 as cryptobox-builder +FROM alpine:3.12 as cryptobox-builder # compile cryptobox-c RUN apk add --no-cache cargo file libsodium-dev git && \ @@ -11,7 +11,7 @@ RUN apk add --no-cache cargo file libsodium-dev git && \ cargo build --release # Minimal dependencies for alpine-compiled, dynamically linked wire-server Haskell services -FROM alpine:3.15 +FROM alpine:3.12 COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib diff --git a/build/alpine/Dockerfile.prebuilder b/build/alpine/Dockerfile.prebuilder index e6d7b045d4..fad6cf0c03 100644 --- a/build/alpine/Dockerfile.prebuilder +++ b/build/alpine/Dockerfile.prebuilder @@ -1,6 +1,6 @@ # Requires docker >= 17.05 (requires support for multi-stage builds) -FROM alpine:3.15 as cryptobox-builder +FROM alpine:3.12 as cryptobox-builder # compile cryptobox-c RUN apk add --no-cache cargo file libsodium-dev git && \ @@ -10,7 +10,7 @@ RUN apk add --no-cache cargo file libsodium-dev git && \ export SODIUM_USE_PKG_CONFIG=1 && \ cargo build --release -FROM alpine:3.15 +FROM alpine:3.12 # install cryptobox-c in the new container COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib/libcryptobox.so From 2448eb374f06abb54ea85c0c7855f145928b40f6 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Thu, 9 Dec 2021 10:47:36 +0100 Subject: [PATCH 43/63] alpine/docker: no need for yq --- build/alpine/Dockerfile.prebuilder | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/alpine/Dockerfile.prebuilder b/build/alpine/Dockerfile.prebuilder index fad6cf0c03..f82961a64d 100644 --- a/build/alpine/Dockerfile.prebuilder +++ b/build/alpine/Dockerfile.prebuilder @@ -40,8 +40,7 @@ RUN apk add --no-cache \ ncurses \ ncurses-dev \ sed \ - binutils-gold \ - yq + binutils-gold # get static version of Haskell Stack and use system ghc by default ARG STACK_ALPINE_VERSION=2.7.3 From b52ed589d5c3851766e70fed1d3c5e9ada1cfdff Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Thu, 9 Dec 2021 11:15:57 +0100 Subject: [PATCH 44/63] alpine/docker: Add ghc boot dependencies stack complains that these packages have been pruned --- hack/bin/alpine-stack-patch.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hack/bin/alpine-stack-patch.sh b/hack/bin/alpine-stack-patch.sh index 3cbb6ced4e..b6bc8f8205 100755 --- a/hack/bin/alpine-stack-patch.sh +++ b/hack/bin/alpine-stack-patch.sh @@ -5,6 +5,11 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" TOP_LEVEL="$(cd "$DIR/../.." && pwd)" cat >>$TOP_LEVEL/stack.yaml < Date: Thu, 9 Dec 2021 11:18:54 +0100 Subject: [PATCH 45/63] ubuntu/docker: Do not build haddocks --- build/ubuntu/Dockerfile.builder | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/ubuntu/Dockerfile.builder b/build/ubuntu/Dockerfile.builder index 2d8a7280c7..fe5b25423f 100644 --- a/build/ubuntu/Dockerfile.builder +++ b/build/ubuntu/Dockerfile.builder @@ -17,9 +17,9 @@ RUN set -x && \ cd /wire-server && \ stack update && \ echo "allow-different-user: true" >> /root/.stack/config.yaml && \ - stack build --haddock --dependencies-only haskell-src-exts && \ - stack build --haddock --no-haddock-hyperlink-source haskell-src-exts && \ - stack build --pedantic --haddock --test --no-run-tests --bench --no-run-benchmarks --dependencies-only -j${THREADS} && \ + stack build --dependencies-only haskell-src-exts && \ + stack build haskell-src-exts && \ + stack build --pedantic --test --no-run-tests --bench --no-run-benchmarks --dependencies-only -j${THREADS} && \ stack install ormolu && \ cd / && \ # we run the build only to cache the built source in /root/.stack, we can remove the source code itself From ba1be166ed5279a70eb5c32421cb464d1e7568c3 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Thu, 9 Dec 2021 17:33:04 +0100 Subject: [PATCH 46/63] dev-packages.nix: Fix metadata about stack --- dev-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-packages.nix b/dev-packages.nix index 2e227b9b1f..becc1f8a99 100644 --- a/dev-packages.nix +++ b/dev-packages.nix @@ -51,14 +51,14 @@ let }; pinned = { - stack = staticBinaryInTarball { + stack = staticBinaryInTarball rec { pname = "stack"; - version = "2.3.1"; + version = "2.7.3"; - darwinAmd64Url = "https://github.com/commercialhaskell/stack/releases/download/v2.7.3/stack-2.7.3-osx-x86_64.tar.gz"; + darwinAmd64Url = "https://github.com/commercialhaskell/stack/releases/download/v${version}/stack-${version}-osx-x86_64.tar.gz"; darwinAmd64Sha256 = "0c7yx670h1qi2g5l4xx9s4552pz77k31lhjjd2rafi5g00501ra2"; - linuxAmd64Url = "https://github.com/commercialhaskell/stack/releases/download/v2.7.3/stack-2.7.3-linux-x86_64-static.tar.gz"; + linuxAmd64Url = "https://github.com/commercialhaskell/stack/releases/download/v${version}/stack-${version}-linux-x86_64-static.tar.gz"; linuxAmd64Sha256 = "sha256-xbziTe+isrhvG7sUvtTx7oO+wUxu2fzIEXTVRz+/NFA="; }; From 71cf9805604eafd2552224c1fbb96fe78e6ce7dd Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Mon, 3 Jan 2022 10:33:35 +0100 Subject: [PATCH 47/63] Update cabal.project --- cabal.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index a02f9c2e4a..be2bc1ee31 100644 --- a/cabal.project +++ b/cabal.project @@ -140,7 +140,7 @@ source-repository-package source-repository-package type: git location: https://github.com/wireapp/saml2-web-sso - tag: b761d352de12a411927a91729a5c27932d69ba9e + tag: 4227e38be5c0810012dc472fc6931f6087fbce68 source-repository-package type: git From 87e804d390a92223179b7748dc7c7995eb8de3f7 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Mon, 3 Jan 2022 13:40:53 +0100 Subject: [PATCH 48/63] build/ubuntu/Dockerfile.deps: Only install geoip-database Neither the binary nor the lib is required to run wire-server. --- build/ubuntu/Dockerfile.deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ubuntu/Dockerfile.deps b/build/ubuntu/Dockerfile.deps index 4dbf93f989..c336192d5c 100644 --- a/build/ubuntu/Dockerfile.deps +++ b/build/ubuntu/Dockerfile.deps @@ -23,7 +23,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libgmp10 \ libffi7 \ libicu66 \ - geoip-bin \ + geoip-database \ ca-certificates \ dumb-init \ libxml2 \ From 20754674ae30f57d2803caf6255ca5ec6531de8c Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Mon, 3 Jan 2022 15:20:25 +0100 Subject: [PATCH 49/63] build/ubuntu/Dockerfile.deps: Install netbase Required for federator to work with default /etc/resolv.conf --- build/ubuntu/Dockerfile.deps | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/ubuntu/Dockerfile.deps b/build/ubuntu/Dockerfile.deps index c336192d5c..86c929fa50 100644 --- a/build/ubuntu/Dockerfile.deps +++ b/build/ubuntu/Dockerfile.deps @@ -28,4 +28,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ dumb-init \ libxml2 \ libncurses6 \ - zlib1g + zlib1g \ + netbase From 4c249a3bb6889107321acb007f6b5cbadd0151e1 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Mon, 3 Jan 2022 16:31:45 +0100 Subject: [PATCH 50/63] build/ubuntu/Dockerfile.deps: Remove apt lists to reduce image size --- build/ubuntu/Dockerfile.deps | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/ubuntu/Dockerfile.deps b/build/ubuntu/Dockerfile.deps index 86c929fa50..85531bd85f 100644 --- a/build/ubuntu/Dockerfile.deps +++ b/build/ubuntu/Dockerfile.deps @@ -29,4 +29,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2 \ libncurses6 \ zlib1g \ - netbase + netbase && \ + rm -rf /var/lib/apt/lists/* From b1e31ca3b18d0ab9f55980b932c39c1319f01a07 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 5 Jan 2022 11:24:52 +0100 Subject: [PATCH 51/63] Make Ubuntu builds as default for all haskell components Alpine is still used for nginz. --- Makefile | 26 +++++------ README.md | 8 ++-- build/alpine/Dockerfile.builder | 28 ------------ build/alpine/Dockerfile.deps | 31 ------------- build/alpine/Dockerfile.executable | 30 ------------- build/alpine/Dockerfile.fast-intermediate | 26 ----------- build/alpine/Dockerfile.intermediate | 26 ----------- build/alpine/Dockerfile.prebuilder | 55 ----------------------- build/alpine/Makefile | 23 ---------- build/alpine/ghc/build.mk | 10 ----- build/alpine/ghc/config.yaml | 10 ----- build/ubuntu/Dockerfile.builder | 2 +- build/ubuntu/Dockerfile.prebuilder | 4 +- build/ubuntu/Makefile | 23 ++++++++++ build/{alpine => ubuntu}/README.md | 10 ++--- docs/developer/dependencies.md | 7 +-- hack/bin/alpine-stack-patch.sh | 22 --------- hack/bin/buildah-compile.sh | 6 +-- hack/bin/buildah-make-images.sh | 2 +- services/brig/Makefile | 2 +- services/cannon/Makefile | 2 +- services/cargohold/Makefile | 2 +- services/galley/Makefile | 2 +- services/gundeck/Makefile | 2 +- services/proxy/Makefile | 2 +- services/spar/Makefile | 2 +- stack.yaml | 3 -- tools/rex/Makefile | 8 ---- tools/stern/Makefile | 2 +- 29 files changed, 59 insertions(+), 317 deletions(-) delete mode 100644 build/alpine/Dockerfile.builder delete mode 100644 build/alpine/Dockerfile.deps delete mode 100644 build/alpine/Dockerfile.executable delete mode 100644 build/alpine/Dockerfile.fast-intermediate delete mode 100644 build/alpine/Dockerfile.intermediate delete mode 100644 build/alpine/Dockerfile.prebuilder delete mode 100644 build/alpine/Makefile delete mode 100644 build/alpine/ghc/build.mk delete mode 100644 build/alpine/ghc/config.yaml create mode 100644 build/ubuntu/Makefile rename build/{alpine => ubuntu}/README.md (76%) delete mode 100755 hack/bin/alpine-stack-patch.sh diff --git a/Makefile b/Makefile index 1401d4d4c4..31e3bb6643 100644 --- a/Makefile +++ b/Makefile @@ -189,30 +189,30 @@ i-%: .PHONY: docker-prebuilder docker-prebuilder: # `docker-prebuilder` needs to be built or pulled only once (unless native dependencies change) - $(MAKE) -C build/alpine prebuilder + $(MAKE) -C build/ubuntu prebuilder .PHONY: docker-deps docker-deps: # `docker-deps` needs to be built or pulled only once (unless native dependencies change) - $(MAKE) -C build/alpine deps + $(MAKE) -C build/ubuntu deps .PHONY: docker-builder docker-builder: # `docker-builder` needs to be built or pulled only once (unless native dependencies change) - $(MAKE) -C build/alpine builder + $(MAKE) -C build/ubuntu builder .PHONY: docker-intermediate docker-intermediate: # `docker-intermediate` needs to be built whenever code changes - this essentially runs `stack clean && stack install` on the whole repo - docker build -t $(DOCKER_USER)/alpine-intermediate:$(DOCKER_TAG) -f build/alpine/Dockerfile.intermediate --build-arg builder=$(DOCKER_USER)/alpine-builder:develop --build-arg deps=$(DOCKER_USER)/alpine-deps:develop .; - docker tag $(DOCKER_USER)/alpine-intermediate:$(DOCKER_TAG) $(DOCKER_USER)/alpine-intermediate:latest; - if test -n "$$DOCKER_PUSH"; then docker login -u $(DOCKER_USERNAME) -p $(DOCKER_PASSWORD); docker push $(DOCKER_USER)/alpine-intermediate:$(DOCKER_TAG); docker push $(DOCKER_USER)/alpine-intermediate:latest; fi; + docker build -t $(DOCKER_USER)/ubuntu20-intermediate:$(DOCKER_TAG) -f build/ubuntu/Dockerfile.intermediate --build-arg builder=$(DOCKER_USER)/ubuntu20-builder:develop --build-arg deps=$(DOCKER_USER)/ubuntu20-deps:develop .; + docker tag $(DOCKER_USER)/ubuntu20-intermediate:$(DOCKER_TAG) $(DOCKER_USER)/ubuntu20-intermediate:latest; + if test -n "$$DOCKER_PUSH"; then docker login -u $(DOCKER_USERNAME) -p $(DOCKER_PASSWORD); docker push $(DOCKER_USER)/ubuntu20-intermediate:$(DOCKER_TAG); docker push $(DOCKER_USER)/ubuntu20-intermediate:latest; fi; .PHONY: docker-exe-% docker-exe-%: - docker image ls | grep $(DOCKER_USER)/alpine-deps > /dev/null || (echo "'make docker-deps' required.", exit 1) - docker image ls | grep $(DOCKER_USER)/alpine-intermediate > /dev/null || (echo "'make docker-intermediate' required."; exit 1) - docker build -t $(DOCKER_USER)/"$*":$(DOCKER_TAG) -f build/alpine/Dockerfile.executable --build-arg executable="$*" --build-arg intermediate=$(DOCKER_USER)/alpine-intermediate --build-arg deps=$(DOCKER_USER)/alpine-deps . + docker image ls | grep $(DOCKER_USER)/ubuntu20-deps > /dev/null || (echo "'make docker-deps' required.", exit 1) + docker image ls | grep $(DOCKER_USER)/ubuntu20-intermediate > /dev/null || (echo "'make docker-intermediate' required."; exit 1) + docker build -t $(DOCKER_USER)/"$*":$(DOCKER_TAG) -f build/ubuntu/Dockerfile.executable --build-arg executable="$*" --build-arg intermediate=$(DOCKER_USER)/ubuntu20-intermediate --build-arg deps=$(DOCKER_USER)/ubuntu20-deps . docker tag $(DOCKER_USER)/"$*":$(DOCKER_TAG) $(DOCKER_USER)/"$*":latest if test -n "$$DOCKER_PUSH"; then docker login -u $(DOCKER_USERNAME) -p $(DOCKER_PASSWORD); docker push $(DOCKER_USER)/"$*":$(DOCKER_TAG); docker push $(DOCKER_USER)/"$*":latest; fi; @@ -220,8 +220,8 @@ docker-exe-%: docker-services: # make docker-services doesn't compile, only makes small images out of the `docker-intermediate` image # to recompile, run `docker-intermediate` first. - docker image ls | grep $(DOCKER_USER)/alpine-deps > /dev/null || (echo "'make docker-deps' required.", exit 1) - docker image ls | grep $(DOCKER_USER)/alpine-intermediate > /dev/null || (echo "'make docker-intermediate' required."; exit 1) + docker image ls | grep $(DOCKER_USER)/ubuntu20-deps > /dev/null || (echo "'make docker-deps' required.", exit 1) + docker image ls | grep $(DOCKER_USER)/ubuntu20-intermediate > /dev/null || (echo "'make docker-intermediate' required."; exit 1) # `make -C services/brig docker` == `make docker-exe-brig docker-exe-brig-integration docker-exe-brig-schema docker-exe-brig-index` $(MAKE) -C services/brig docker $(MAKE) -C services/gundeck docker @@ -235,10 +235,10 @@ docker-services: DOCKER_DEV_NETWORK := --net=host DOCKER_DEV_VOLUMES := -v `pwd`:/wire-server -DOCKER_DEV_IMAGE := quay.io/wire/alpine-builder:$(DOCKER_TAG) +DOCKER_DEV_IMAGE := quay.io/wire/ubuntu20-builder:$(DOCKER_TAG) .PHONY: run-docker-builder run-docker-builder: - @echo "if this does not work, consider 'docker pull', 'docker tag', or 'make -C build-alpine builder'." + @echo "if this does not work, consider 'docker pull', 'docker tag', or 'make -C build/ubuntu builder'." docker run --workdir /wire-server -it $(DOCKER_DEV_NETWORK) $(DOCKER_DEV_VOLUMES) --rm $(DOCKER_DEV_IMAGE) /bin/bash .PHONY: git-add-cassandra-schema diff --git a/README.md b/README.md index f5d86ab3e7..240f9850ea 100644 --- a/README.md +++ b/README.md @@ -108,22 +108,22 @@ For building nginz, see [services/nginz/README.md](services/nginz/README.md) #### 2. Use docker -*If you don't wish to build all docker images from scratch (e.g. the `alpine-builder` takes a very long time), ready-built images can be downloaded from [here](https://quay.io/organization/wire).* +*If you don't wish to build all docker images from scratch (e.g. the `ubuntu20-builder` takes a very long time), ready-built images can be downloaded from [here](https://quay.io/organization/wire).* If you wish to build your own docker images, you need [docker version >= 17.05](https://www.docker.com/) and [`make`](https://www.gnu.org/software/make/). Then, ```bash # optionally: -# make docker-builder # if you don't run this, it pulls the alpine-builder image from quay.io +# make docker-builder # if you don't run this, it pulls the ubuntu20-builder image from quay.io make docker-deps docker-intermediate docker-services # subsequent times, after changing code, if you wish to re-create docker images, it's sufficient to make docker-intermediate docker-services ``` -will, eventually, have built a range of docker images. Make sure to [give Docker enough RAM](https://github.com/wireapp/wire-server/issues/562); if you see `make: *** [builder] Error 137`, it might be a sign that the build ran out of memory. You can also mix and match – e.g. pull the [`alpine-builder`](https://quay.io/repository/wire/alpine-builder?tab=tags) image and build the rest locally. +will, eventually, have built a range of docker images. Make sure to [give Docker enough RAM](https://github.com/wireapp/wire-server/issues/562); if you see `make: *** [builder] Error 137`, it might be a sign that the build ran out of memory. You can also mix and match – e.g. pull the [`ubuntu20-builder`](https://quay.io/repository/wire/ubuntu20-builder?tab=tags) image and build the rest locally. -See the `Makefile`s and `Dockerfile`s, as well as [build/alpine/README.md](build/alpine/README.md) for details. +See the `Makefile`s and `Dockerfile`s, as well as [build/ubuntu/README.md](build/ubuntu/README.md) for details. ### How to run integration tests diff --git a/build/alpine/Dockerfile.builder b/build/alpine/Dockerfile.builder deleted file mode 100644 index 5b5647f7e6..0000000000 --- a/build/alpine/Dockerfile.builder +++ /dev/null @@ -1,28 +0,0 @@ -# Requires docker >= 17.05 (requires support for multi-stage builds) -ARG prebuilder=quay.io/wire/alpine-prebuilder - -FROM ${prebuilder} -WORKDIR / - -# Download stack indices and compile/cache dependencies to speed up subsequent -# container creation. -# -# We build docs for haskell-src-exts without hyperlinking enabled to avoid -# a Haddock segfault. See https://github.com/haskell/haddock/issues/928 - -ARG wire_server_branch=develop -ARG THREADS=4 -RUN set -x && \ - echo ${wire_server_branch} && \ - git clone -b ${wire_server_branch} https://github.com/wireapp/wire-server.git && \ - cd /wire-server && \ - stack update && \ - echo "allow-different-user: true" >> /root/.stack/config.yaml && \ - ./hack/bin/alpine-stack-patch.sh \ - stack build --haddock --dependencies-only haskell-src-exts && \ - stack build --haddock --no-haddock-hyperlink-source haskell-src-exts && \ - stack build --pedantic --haddock --test --no-run-tests --bench --no-run-benchmarks --dependencies-only -j${THREADS} && \ - stack install ormolu && \ - cd / && \ - # we run the build only to cache the built source in /root/.stack, we can remove the source code itself - rm -rf /wire-server diff --git a/build/alpine/Dockerfile.deps b/build/alpine/Dockerfile.deps deleted file mode 100644 index 9ef4958bb1..0000000000 --- a/build/alpine/Dockerfile.deps +++ /dev/null @@ -1,31 +0,0 @@ -# Requires docker >= 17.05 (requires support for multi-stage builds) - -FROM alpine:3.12 as cryptobox-builder - -# compile cryptobox-c -RUN apk add --no-cache cargo file libsodium-dev git && \ - cd /tmp && \ - git clone https://github.com/wireapp/cryptobox-c.git && \ - cd cryptobox-c && \ - export SODIUM_USE_PKG_CONFIG=1 && \ - cargo build --release - -# Minimal dependencies for alpine-compiled, dynamically linked wire-server Haskell services -FROM alpine:3.12 - -COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib - -RUN apk add --no-cache \ - libsodium \ - openssl \ - gmp \ - libgcc \ - libffi \ - libstdc++ \ - icu \ - geoip \ - llvm-libunwind \ - ca-certificates \ - dumb-init \ - libxml2 \ - ncurses diff --git a/build/alpine/Dockerfile.executable b/build/alpine/Dockerfile.executable deleted file mode 100644 index d00e2dc314..0000000000 --- a/build/alpine/Dockerfile.executable +++ /dev/null @@ -1,30 +0,0 @@ -# Produces final docker image with a single executable $executable - -# Requires docker version >= 17.05 (requires support for multi-stage builds) -# Requires to have created the wire-server-builder and wire-server-deps docker images (run `make` in this directory) -# Usage example: -# (from wire-server root directory) -# export EXECUTABLE=galley-schema; docker build -t $EXECUTABLE -f build/alpine/Dockerfile.executable --build-arg executable=$EXECUTABLE . - -ARG intermediate=quay.io/wire/alpine-intermediate -ARG deps=quay.io/wire/alpine-deps - -#--- Intermediate stage --- -FROM ${intermediate} as intermediate - -#--- Minified stage --- -FROM ${deps} - -ARG executable - -COPY --from=intermediate /dist/${executable} /usr/bin/${executable} - -# TODO: only if executable=brig, also copy templates. Docker image conditionals seem hacky: -# https://stackoverflow.com/questions/31528384/conditional-copy-add-in-dockerfile -# For now, adds ~2 MB of additional files into every container -COPY --from=intermediate /dist/templates/ /usr/share/wire/templates/ - -# ARGs are not available at runtime, create symlink at build time -# more info: https://stackoverflow.com/questions/40902445/using-variable-interpolation-in-string-in-docker -RUN ln -s /usr/bin/${executable} /usr/bin/service -ENTRYPOINT ["/usr/bin/dumb-init", "--", "/usr/bin/service"] diff --git a/build/alpine/Dockerfile.fast-intermediate b/build/alpine/Dockerfile.fast-intermediate deleted file mode 100644 index 91fcf399d6..0000000000 --- a/build/alpine/Dockerfile.fast-intermediate +++ /dev/null @@ -1,26 +0,0 @@ -# Produces intermediate docker image with all executables under /dist using fast option - -# Requires docker version >= 17.05 (requires support for multi-stage builds) -# Requires to have created the wire-server-builder and wire-server-deps docker images (run `make` in this directory) -# Usage example: -# (from wire-server root directory) -# docker build -f build/alpine/Dockerfile.fastintermediate . - -ARG builder=quay.io/wire/alpine-builder -ARG deps=quay.io/wire/alpine-deps - -#--- Builder stage --- -FROM ${builder} as builder - -WORKDIR /wire-server/ - -COPY . /wire-server/ - -RUN make clean fast - -#--- Minified stage --- -FROM ${deps} - -COPY --from=builder /wire-server/dist/ /dist/ -# brig also needs some templates. -COPY --from=builder /wire-server/services/brig/deb/opt/brig/templates/ /dist/templates/ diff --git a/build/alpine/Dockerfile.intermediate b/build/alpine/Dockerfile.intermediate deleted file mode 100644 index de58eb1618..0000000000 --- a/build/alpine/Dockerfile.intermediate +++ /dev/null @@ -1,26 +0,0 @@ -# Produces intermediate docker image with all executables under /dist - -# Requires docker version >= 17.05 (requires support for multi-stage builds) -# Requires to have created the wire-server-builder and wire-server-deps docker images (run `make` in this directory) -# Usage example: -# (from wire-server root directory) -# docker build -f build/alpine/Dockerfile.intermediate . - -ARG builder=quay.io/wire/alpine-builder -ARG deps=quay.io/wire/alpine-deps - -#--- Builder stage --- -FROM ${builder} as builder - -WORKDIR /wire-server/ - -COPY . /wire-server/ - -RUN make clean install - -#--- Minified stage --- -FROM ${deps} - -COPY --from=builder /wire-server/dist/ /dist/ -# brig also needs some templates. -COPY --from=builder /wire-server/services/brig/deb/opt/brig/templates/ /dist/templates/ diff --git a/build/alpine/Dockerfile.prebuilder b/build/alpine/Dockerfile.prebuilder deleted file mode 100644 index f82961a64d..0000000000 --- a/build/alpine/Dockerfile.prebuilder +++ /dev/null @@ -1,55 +0,0 @@ -# Requires docker >= 17.05 (requires support for multi-stage builds) - -FROM alpine:3.12 as cryptobox-builder - -# compile cryptobox-c -RUN apk add --no-cache cargo file libsodium-dev git && \ - cd /tmp && \ - git clone https://github.com/wireapp/cryptobox-c.git && \ - cd cryptobox-c && \ - export SODIUM_USE_PKG_CONFIG=1 && \ - cargo build --release - -FROM alpine:3.12 - -# install cryptobox-c in the new container -COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib/libcryptobox.so -COPY --from=cryptobox-builder /tmp/cryptobox-c/src/cbox.h /usr/include/cbox.h - -# development packages required for wire-server Haskell services -RUN apk add --no-cache \ - alpine-sdk \ - ca-certificates \ - linux-headers \ - zlib-dev \ - perl \ - gmp-dev \ - libffi-dev \ - make \ - libsodium-dev \ - openssl-dev \ - protobuf \ - icu-dev \ - geoip-dev \ - snappy-dev \ - llvm-libunwind-dev \ - bash \ - xz \ - libxml2-dev \ - git \ - ncurses \ - ncurses-dev \ - sed \ - binutils-gold - -# get static version of Haskell Stack and use system ghc by default -ARG STACK_ALPINE_VERSION=2.7.3 -RUN curl -sSfL https://github.com/commercialhaskell/stack/releases/download/v${STACK_ALPINE_VERSION}/stack-${STACK_ALPINE_VERSION}-linux-x86_64-static.tar.gz \ - | tar --wildcards -C /usr/local/bin --strip-components=1 -xzvf - '*/stack' && chmod 755 /usr/local/bin/stack && \ - stack config set system-ghc --global true - -ARG GHC_VERSION=8.10.7 -RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org \ - | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=${GHC_VERSION} sh - -ENV PATH=/root/.ghcup/bin:${PATH} diff --git a/build/alpine/Makefile b/build/alpine/Makefile deleted file mode 100644 index 90b1aa5e64..0000000000 --- a/build/alpine/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -LANG := en_US.UTF-8 -DOCKER_USER ?= quay.io/wire -DOCKER_TAG ?= local - -default: deps prebuilder builder - -.PHONY: deps -deps: - docker build -t $(DOCKER_USER)/alpine-deps:$(DOCKER_TAG) -f Dockerfile.deps . - docker tag $(DOCKER_USER)/alpine-deps:$(DOCKER_TAG) $(DOCKER_USER)/alpine-deps:latest - if test -n "$$DOCKER_PUSH"; then docker push $(DOCKER_USER)/alpine-deps:$(DOCKER_TAG); docker push $(DOCKER_USER)/alpine-deps:latest; fi; - -.PHONY: prebuilder -prebuilder: - docker build -t $(DOCKER_USER)/alpine-prebuilder:$(DOCKER_TAG) -f Dockerfile.prebuilder . - docker tag $(DOCKER_USER)/alpine-prebuilder:$(DOCKER_TAG) $(DOCKER_USER)/alpine-prebuilder:latest - if test -n "$$DOCKER_PUSH"; then docker push $(DOCKER_USER)/alpine-prebuilder:$(DOCKER_TAG); docker push $(DOCKER_USER)/alpine-prebuilder:latest; fi; - -.PHONY: builder -builder: - docker build --build-arg prebuilder=$(DOCKER_USER)/alpine-prebuilder -t $(DOCKER_USER)/alpine-builder:$(DOCKER_TAG) -f Dockerfile.builder . - docker tag $(DOCKER_USER)/alpine-builder:$(DOCKER_TAG) $(DOCKER_USER)/alpine-builder:latest - if test -n "$$DOCKER_PUSH"; then docker push $(DOCKER_USER)/alpine-builder:$(DOCKER_TAG); docker push $(DOCKER_USER)/alpine-builder:latest; fi; diff --git a/build/alpine/ghc/build.mk b/build/alpine/ghc/build.mk deleted file mode 100644 index c9c5dfebf8..0000000000 --- a/build/alpine/ghc/build.mk +++ /dev/null @@ -1,10 +0,0 @@ -SRC_HC_OPTS = -O -H256m -GhcStage1HcOpts = -O -GhcStage2HcOpts = -O2 -GhcLibHcOpts = -O2 -BUILD_PROF_LIBS = YES -SplitSections = YES -BUILD_SPHINX_HTML = YES -BUILD_SPHINX_PDF = NO -HADDOCK_DOCS = YES -EXTRA_HADDOCK_OPTS += --hyperlinked-source diff --git a/build/alpine/ghc/config.yaml b/build/alpine/ghc/config.yaml deleted file mode 100644 index 063311f04f..0000000000 --- a/build/alpine/ghc/config.yaml +++ /dev/null @@ -1,10 +0,0 @@ -build: - prefetch: true -ghc-build: standard -system-ghc: true -ghc-options: - "$everything": -split-sections -package-indices: - - name: HackageOrig - download-prefix: https://hackage.haskell.org/package/ - http: https://hackage.haskell.org/01-index.tar.gz diff --git a/build/ubuntu/Dockerfile.builder b/build/ubuntu/Dockerfile.builder index fe5b25423f..f34e4fc91d 100644 --- a/build/ubuntu/Dockerfile.builder +++ b/build/ubuntu/Dockerfile.builder @@ -1,4 +1,4 @@ -ARG prebuilder=quay.io/wire/alpine-prebuilder +ARG prebuilder=quay.io/wire/ubuntu20-prebuilder FROM ${prebuilder} WORKDIR / diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index 505993fe3d..b796676ddb 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -60,8 +60,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ protobuf-compiler # get static version of Haskell Stack and use system ghc by default -ARG STACK_ALPINE_VERSION=2.7.3 -RUN curl -sSfL https://github.com/commercialhaskell/stack/releases/download/v${STACK_ALPINE_VERSION}/stack-${STACK_ALPINE_VERSION}-linux-x86_64-static.tar.gz \ +ARG STACK_VERSION=2.7.3 +RUN curl -sSfL https://github.com/commercialhaskell/stack/releases/download/v${STACK_VERSION}/stack-${STACK_VERSION}-linux-x86_64-static.tar.gz \ | tar --wildcards -C /usr/local/bin --strip-components=1 -xzvf - '*/stack' && chmod 755 /usr/local/bin/stack && \ stack config set system-ghc --global true diff --git a/build/ubuntu/Makefile b/build/ubuntu/Makefile new file mode 100644 index 0000000000..5db0b8c91f --- /dev/null +++ b/build/ubuntu/Makefile @@ -0,0 +1,23 @@ +LANG := en_US.UTF-8 +DOCKER_USER ?= quay.io/wire +DOCKER_TAG ?= local + +default: deps prebuilder builder + +.PHONY: deps +deps: + docker build -t $(DOCKER_USER)/ubuntu20-deps:$(DOCKER_TAG) -f Dockerfile.deps . + docker tag $(DOCKER_USER)/ubuntu20-deps:$(DOCKER_TAG) $(DOCKER_USER)/ubuntu20-deps:latest + if test -n "$$DOCKER_PUSH"; then docker push $(DOCKER_USER)/ubuntu20-deps:$(DOCKER_TAG); docker push $(DOCKER_USER)/ubuntu20-deps:latest; fi; + +.PHONY: prebuilder +prebuilder: + docker build -t $(DOCKER_USER)/ubuntu20-prebuilder:$(DOCKER_TAG) -f Dockerfile.prebuilder . + docker tag $(DOCKER_USER)/ubuntu20-prebuilder:$(DOCKER_TAG) $(DOCKER_USER)/ubuntu20-prebuilder:latest + if test -n "$$DOCKER_PUSH"; then docker push $(DOCKER_USER)/ubuntu20-prebuilder:$(DOCKER_TAG); docker push $(DOCKER_USER)/ubuntu20-prebuilder:latest; fi; + +.PHONY: builder +builder: + docker build --build-arg prebuilder=$(DOCKER_USER)/ubuntu20-prebuilder -t $(DOCKER_USER)/ubuntu20-builder:$(DOCKER_TAG) -f Dockerfile.builder . + docker tag $(DOCKER_USER)/ubuntu20-builder:$(DOCKER_TAG) $(DOCKER_USER)/ubuntu20-builder:latest + if test -n "$$DOCKER_PUSH"; then docker push $(DOCKER_USER)/ubuntu20-builder:$(DOCKER_TAG); docker push $(DOCKER_USER)/ubuntu20-builder:latest; fi; diff --git a/build/alpine/README.md b/build/ubuntu/README.md similarity index 76% rename from build/alpine/README.md rename to build/ubuntu/README.md index f42a12ebf9..397afdb5a0 100644 --- a/build/alpine/README.md +++ b/build/ubuntu/README.md @@ -2,15 +2,14 @@ To create docker images, you need to install [docker version >= 17.05](https://www.docker.com/) and [`make`](https://www.gnu.org/software/make/). -* `Dockerfile.builder` contains all the compile-time dependencies necessary to compile any of the Haskell services (it also downloads, builds and caches some Haskell libraries). This image is fairly large, ~4GB uncompressed. -* `Dockerfile.deps` contains all the run-time dependencies e.g. shared libraries, at a total size of ~18MB compressed. +* `Dockerfile.builder` contains all the compile-time dependencies necessary to compile any of the Haskell services (it also downloads, builds and caches some Haskell libraries). This image is fairly large, ~1.7GB compressed. +* `Dockerfile.deps` contains all the run-time dependencies e.g. shared libraries, at a total size of ~52MB compressed. Both of the above need to be built first (only once) to be able to actually build a service docker image. * `Dockerfile.intermediate` - based on `Dockerfile.deps`/`Dockerfile.builder`, this is an intermediate image compiling all dynamically linked binaries (obtained when running `make install` in the top-level directory). * `Dockerfile.executable` - based on `Dockerfile.deps`/`Dockerfile.intermediate`, this extracts a single executable from the intermediate image, yielding a small image (~30MB compressed) with a single dynamically linked binary. - ### Build the `builder` and `deps` docker images locally (from within the `wire-server` directory) @@ -28,7 +27,4 @@ make docker-exe-brig # this only extracts one binary from the intermediate image ## Other dockerfiles -* `Dockerfile.migrations` - same as `Dockerfile.executable`, with a fixed set of database migration binaries. -* `Dockerfile.prebuilder` - dependencies of `Dockerfile.builder` that are expected to change very rarely (GHC, system libraries). Currently we're able to use system GHC, but if we require a newer version of GHC than the one provided by Alpine, we could build GHC in `Dockerfile.prebuilder` (as it has been [done before][2018-11-28]). - -[2018-11-28]: https://github.com/wireapp/wire-server/releases/tag/v2018-11-28 +* `Dockerfile.prebuilder` - dependencies of `Dockerfile.builder` that are expected to change very rarely (GHC, system libraries). diff --git a/docs/developer/dependencies.md b/docs/developer/dependencies.md index 878132cebf..0d5d01619f 100644 --- a/docs/developer/dependencies.md +++ b/docs/developer/dependencies.md @@ -4,11 +4,6 @@ This page documents how to install necessary dependencies to work with the wire- This repository makes use of git submodules. When cloning or updating, use `git submodule update --init --recursive` to check out the code dependencies. -In addition to the information below, you can also consult the Dockerfiles for Alpine Linux, that could serve as inspiration: - -* [alpine setup for Haskell services](../../build/alpine/Dockerfile.builder) -* [alpine setup for nginz](../../services/nginz/Dockerfile) - ## General package dependencies (needed to compile Haskell services) *Note: all the below sections for getting compile-time dependencies necessary to compile all of wire-server may potentially go out of date; if you spot a mistake please open an issue or PR* @@ -89,7 +84,7 @@ sudo installer -pkg /Library/Developer/CommandLineTools/Packages/macOS_SDK_heade Please refer to [Stack's installation instructions](https://docs.haskellstack.org/en/stable/README/#how-to-install). -When you're done, ensure `stack --version` is the same as `STACK_ALPINE_VERSION` in [`build/alpine/Dockerfile.prebuilder`](../../build/alpine/Dockerfile.prebuilder). +When you're done, ensure `stack --version` is the same as `STACK_VERSION` in [`build/ubuntu/Dockerfile.prebuilder`](../../build/ubuntu/Dockerfile.prebuilder). If you have to, you can downgrade stack with this command: diff --git a/hack/bin/alpine-stack-patch.sh b/hack/bin/alpine-stack-patch.sh deleted file mode 100755 index b6bc8f8205..0000000000 --- a/hack/bin/alpine-stack-patch.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -set -e -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -TOP_LEVEL="$(cd "$DIR/../.." && pwd)" - -cat >>$TOP_LEVEL/stack.yaml < /dev/null \ || buildah run "$CONTAINER_NAME" -- cp -a /root/.stack/. /src/.stack-root-buildah/ diff --git a/hack/bin/buildah-make-images.sh b/hack/bin/buildah-make-images.sh index a52c470282..4fa8089911 100755 --- a/hack/bin/buildah-make-images.sh +++ b/hack/bin/buildah-make-images.sh @@ -10,7 +10,7 @@ CONTAINER_NAME="output" DOCKER_TAG=${DOCKER_TAG:-$USER} buildah containers | awk '{print $5}' | grep "$CONTAINER_NAME" || - buildah from --name "$CONTAINER_NAME" -v "${TOP_LEVEL}":/src --pull quay.io/wire/alpine-deps:develop + buildah from --name "$CONTAINER_NAME" -v "${TOP_LEVEL}":/src --pull quay.io/wire/ubuntu20-deps:develop # Only brig needs these templates, but for simplicity we add them to all resulting images (optimization FUTUREWORK) buildah run "$CONTAINER_NAME" -- sh -c 'mkdir -p /usr/share/wire/ && cp -r "/src/services/brig/deb/opt/brig/templates/." "/usr/share/wire/templates"' diff --git a/services/brig/Makefile b/services/brig/Makefile index c8acd90884..2f09ec7032 100644 --- a/services/brig/Makefile +++ b/services/brig/Makefile @@ -147,7 +147,7 @@ index-reset: install docker: $(foreach executable,$(EXECUTABLES),\ docker build -t $(DOCKER_USER)/$(executable):$(DOCKER_TAG) \ - -f ../../build/alpine/Dockerfile.executable \ + -f ../../build/ubuntu/Dockerfile.executable \ --build-arg executable=$(executable) \ ../.. && \ docker tag $(DOCKER_USER)/$(executable):$(DOCKER_TAG) $(DOCKER_USER)/$(executable):latest && \ diff --git a/services/cannon/Makefile b/services/cannon/Makefile index 42372fe7d7..965ec95d0c 100644 --- a/services/cannon/Makefile +++ b/services/cannon/Makefile @@ -58,7 +58,7 @@ $(DEB): docker: $(foreach executable,$(EXECUTABLES),\ docker build -t $(DOCKER_USER)/$(executable):$(DOCKER_TAG) \ - -f ../../build/alpine/Dockerfile.executable \ + -f ../../build/ubuntu/Dockerfile.executable \ --build-arg executable=$(executable) \ ../.. && \ docker tag $(DOCKER_USER)/$(executable):$(DOCKER_TAG) $(DOCKER_USER)/$(executable):latest && \ diff --git a/services/cargohold/Makefile b/services/cargohold/Makefile index 5e7bbf94cd..5a5c25265a 100644 --- a/services/cargohold/Makefile +++ b/services/cargohold/Makefile @@ -103,7 +103,7 @@ integration-%: fast docker: $(foreach executable,$(EXECUTABLES),\ docker build -t $(DOCKER_USER)/$(executable):$(DOCKER_TAG) \ - -f ../../build/alpine/Dockerfile.executable \ + -f ../../build/ubuntu/Dockerfile.executable \ --build-arg executable=$(executable) \ ../.. && \ docker tag $(DOCKER_USER)/$(executable):$(DOCKER_TAG) $(DOCKER_USER)/$(executable):latest && \ diff --git a/services/galley/Makefile b/services/galley/Makefile index 0ab7e4bc27..5dbde93dab 100644 --- a/services/galley/Makefile +++ b/services/galley/Makefile @@ -127,7 +127,7 @@ db-migrate-data: docker: $(foreach executable,$(EXECUTABLES),\ docker build -t $(DOCKER_USER)/$(executable):$(DOCKER_TAG) \ - -f ../../build/alpine/Dockerfile.executable \ + -f ../../build/ubuntu/Dockerfile.executable \ --build-arg executable=$(executable) \ ../.. && \ docker tag $(DOCKER_USER)/$(executable):$(DOCKER_TAG) $(DOCKER_USER)/$(executable):latest && \ diff --git a/services/gundeck/Makefile b/services/gundeck/Makefile index ef0059ce50..fcedb3ce78 100644 --- a/services/gundeck/Makefile +++ b/services/gundeck/Makefile @@ -127,7 +127,7 @@ db-migrate: fast docker: $(foreach executable,$(EXECUTABLES),\ docker build -t $(DOCKER_USER)/$(executable):$(DOCKER_TAG) \ - -f ../../build/alpine/Dockerfile.executable \ + -f ../../build/ubuntu/Dockerfile.executable \ --build-arg executable=$(executable) \ ../.. && \ docker tag $(DOCKER_USER)/$(executable):$(DOCKER_TAG) $(DOCKER_USER)/$(executable):latest && \ diff --git a/services/proxy/Makefile b/services/proxy/Makefile index 17a9564297..ed032ae8b2 100644 --- a/services/proxy/Makefile +++ b/services/proxy/Makefile @@ -58,7 +58,7 @@ $(DEB): docker: $(foreach executable,$(EXECUTABLES),\ docker build -t $(DOCKER_USER)/$(executable):$(DOCKER_TAG) \ - -f ../../build/alpine/Dockerfile.executable \ + -f ../../build/ubuntu/Dockerfile.executable \ --build-arg executable=$(executable) \ ../.. && \ docker tag $(DOCKER_USER)/$(executable):$(DOCKER_TAG) $(DOCKER_USER)/$(executable):latest && \ diff --git a/services/spar/Makefile b/services/spar/Makefile index b3846b0a81..523ac6c9e7 100644 --- a/services/spar/Makefile +++ b/services/spar/Makefile @@ -115,7 +115,7 @@ db-migrate: fast docker: $(foreach executable,$(EXECUTABLES),\ docker build -t $(DOCKER_USER)/$(executable):$(DOCKER_TAG) \ - -f ../../build/alpine/Dockerfile.executable \ + -f ../../build/ubuntu/Dockerfile.executable \ --build-arg executable=$(executable) \ ../.. && \ docker tag $(DOCKER_USER)/$(executable):$(DOCKER_TAG) $(DOCKER_USER)/$(executable):latest && \ diff --git a/stack.yaml b/stack.yaml index 3556a87b80..15a73f6b12 100644 --- a/stack.yaml +++ b/stack.yaml @@ -251,9 +251,6 @@ extra-deps: - proto-lens-setup-0.4.0.5 - tracing-0.0.7.2 -# This is required for compiling on Alpine Linux -- integer-simple-0.1.1.1@sha256:edfa49fb19eb8e14ce4e0edd03327f13dfb71d186295df9f8dcd4ca59321c0a8,1002 - ############################################################ # Development tools ############################################################ diff --git a/tools/rex/Makefile b/tools/rex/Makefile index ea9333710b..1e2b30bf8c 100644 --- a/tools/rex/Makefile +++ b/tools/rex/Makefile @@ -33,11 +33,3 @@ fast: init .PHONY: compile: stack build . --pedantic --test --bench --no-run-benchmarks --no-copy-bins - -# build a statically linked binary by compiling on alpine. Will result in a 'rex-static' binary in dist. -.PHONY: static -static: $(SRC) - docker run --rm \ - -v $(CURDIR)/../..:/wire-server \ - quay.io/wire/alpine-builder:develop \ - sh -c 'apk add --no-cache zlib-static && cd /wire-server/tools/rex && stack --system-ghc --local-bin-path . --allow-different-user install --flag rex:static . && mv rex dist/rex-static' diff --git a/tools/stern/Makefile b/tools/stern/Makefile index 8c3e13ba01..f44dd49a56 100644 --- a/tools/stern/Makefile +++ b/tools/stern/Makefile @@ -58,7 +58,7 @@ $(DEB): docker: $(foreach executable,$(EXECUTABLES),\ docker build -t $(DOCKER_USER)/$(executable):$(DOCKER_TAG) \ - -f ../../build/alpine/Dockerfile.executable \ + -f ../../build/ubuntu/Dockerfile.executable \ --build-arg executable=$(executable) \ ../.. && \ docker tag $(DOCKER_USER)/$(executable):$(DOCKER_TAG) $(DOCKER_USER)/$(executable):latest && \ From c34abc2e1c765b5d6fc95ca87817b853638394b3 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 5 Jan 2022 11:34:42 +0100 Subject: [PATCH 52/63] Add changelog --- changelog.d/0-release-notes/ubuntu-images | 3 +++ changelog.d/5-internal/ghc-8107 | 1 + 2 files changed, 4 insertions(+) create mode 100644 changelog.d/0-release-notes/ubuntu-images create mode 100644 changelog.d/5-internal/ghc-8107 diff --git a/changelog.d/0-release-notes/ubuntu-images b/changelog.d/0-release-notes/ubuntu-images new file mode 100644 index 0000000000..16c9c4dd5b --- /dev/null +++ b/changelog.d/0-release-notes/ubuntu-images @@ -0,0 +1,3 @@ +From this release onwards, the images for haskell components (brig, galley, +cargohold, etc.) will be using Ubuntu 20.04 as the base. The images are about +30-35 MB larger than the previous alpine based images. \ No newline at end of file diff --git a/changelog.d/5-internal/ghc-8107 b/changelog.d/5-internal/ghc-8107 new file mode 100644 index 0000000000..b1581527d9 --- /dev/null +++ b/changelog.d/5-internal/ghc-8107 @@ -0,0 +1 @@ +Use GHC 8.10.7 and stack 2.7.3 for builds \ No newline at end of file From 7f683618d364185d1b7add8c3940a9425bc02da8 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 5 Jan 2022 11:36:27 +0100 Subject: [PATCH 53/63] build/ubuntu/Dockerfile.executable: Add the comment back --- build/ubuntu/Dockerfile.executable | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build/ubuntu/Dockerfile.executable b/build/ubuntu/Dockerfile.executable index 76621ef4e2..1afa4103b4 100644 --- a/build/ubuntu/Dockerfile.executable +++ b/build/ubuntu/Dockerfile.executable @@ -1,3 +1,10 @@ +# Produces final docker image with a single executable $executable + +# Requires docker version >= 17.05 (requires support for multi-stage builds) +# Requires to have created the wire-server-builder and wire-server-deps docker images (run `make` in this directory) +# Usage example: +# (from wire-server root directory) +# export EXECUTABLE=galley-schema; docker build -t $EXECUTABLE -f build/ubuntu/Dockerfile.executable --build-arg executable=$EXECUTABLE . ARG intermediate=quay.io/wire/ubuntu20-intermediate ARG deps=quay.io/wire/ubuntu20-deps From 76a2485846dfcf97c5c2f989aa67b3369543143b Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Wed, 5 Jan 2022 12:18:00 +0100 Subject: [PATCH 54/63] dev-packages.nix: De-duplicate list of C library out deps --- dev-packages.nix | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/dev-packages.nix b/dev-packages.nix index becc1f8a99..73522c868e 100644 --- a/dev-packages.nix +++ b/dev-packages.nix @@ -109,6 +109,19 @@ let }; }; + c-lib-out-deps = [ + pkgs.cryptobox + pkgs.icu.out + pkgs.libsodium.out + pkgs.libxml2.out + pkgs.ncurses.out + pkgs.openssl.out + pkgs.pcre.out + pkgs.snappy.out + pkgs.zlib.out + pkgs.lzma.out + ]; + compile-deps = pkgs.buildEnv { name = "wire-server-compile-deps"; paths = [ @@ -124,26 +137,16 @@ let pkgs.protobuf pkgs.cryptobox - pkgs.geoip pkgs.icu.dev - pkgs.icu.out pkgs.libsodium.dev - pkgs.libsodium.out pkgs.libxml2.dev - pkgs.libxml2.out pkgs.ncurses.dev - pkgs.ncurses.out pkgs.openssl.dev - pkgs.openssl.out pkgs.pcre.dev - pkgs.pcre.out pkgs.snappy.dev - pkgs.snappy.out pkgs.zlib.dev - pkgs.zlib.out pkgs.lzma.dev - pkgs.lzma.out - ]; + ] ++ c-lib-out-deps; }; # This performs roughly the same setup as direnv's load_prefix function, but @@ -188,17 +191,5 @@ in # which sets LD_LIBRARY_PATH and others correctly. cabal-wrapper pkgs.haskellPackages.implicit-hie - - # HLS needs these, TODO: extract variable and use for both cabal-wrapper and here. - pkgs.cryptobox - pkgs.geoip - pkgs.icu.out - pkgs.libsodium.out - pkgs.libxml2.out - pkgs.ncurses.out - pkgs.openssl.out - pkgs.pcre.out - pkgs.snappy.out - pkgs.zlib.out - pkgs.lzma.out ] +++ c-lib-out-deps # Required to run HLS From 1dc38566a7f9e8939653d84abf6b95859093b6df Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Mon, 10 Jan 2022 09:12:59 +0100 Subject: [PATCH 55/63] Regen stack.lock --- stack.yaml.lock | 7 ------- 1 file changed, 7 deletions(-) diff --git a/stack.yaml.lock b/stack.yaml.lock index 0aa65e9185..1e1c531b53 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -731,13 +731,6 @@ packages: sha256: b3059324bf8fea08874dd4f5518105f3edd6e469104242e652698f488a5227d5 original: hackage: tracing-0.0.7.2 -- completed: - hackage: integer-simple-0.1.1.1@sha256:edfa49fb19eb8e14ce4e0edd03327f13dfb71d186295df9f8dcd4ca59321c0a8,1002 - pantry-tree: - size: 487 - sha256: d20ef6171d3ae1459afcdf238b152404fe7f1eaaab37ab04333f04de8a2dd082 - original: - hackage: integer-simple-0.1.1.1@sha256:edfa49fb19eb8e14ce4e0edd03327f13dfb71d186295df9f8dcd4ca59321c0a8,1002 - completed: hackage: ormolu-0.1.4.1@sha256:ed404eac6e4eb64da1ca5fb749e0f99907431a9633e6ba34e44d260e7d7728ba,6499 pantry-tree: From 8c96a0993bfd576b82f6278e39f7b1df4289a69b Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Mon, 10 Jan 2022 11:04:36 +0100 Subject: [PATCH 56/63] Fixup --- libs/dns-util/dns-util.cabal | 86 +++++++++++- services/brig/brig.cabal | 250 +++++++++++++++++++++++++++++++++-- 2 files changed, 322 insertions(+), 14 deletions(-) diff --git a/libs/dns-util/dns-util.cabal b/libs/dns-util/dns-util.cabal index e74687b6ab..a674dc7486 100644 --- a/libs/dns-util/dns-util.cabal +++ b/libs/dns-util/dns-util.cabal @@ -1,10 +1,8 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack --- --- hash: 2025228a75d939373b4d108c8d9848c70c7e85debb5f2380344806e5b5b0314d name: dns-util version: 0.1.0 @@ -27,7 +25,46 @@ library Paths_dns_util hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path build-depends: base >=4.6 && <5.0 @@ -46,7 +83,46 @@ test-suite spec Paths_dns_util hs-source-dirs: test - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-N build-tool-depends: hspec-discover:hspec-discover diff --git a/services/brig/brig.cabal b/services/brig/brig.cabal index fbefb12ab3..02903b6c4a 100644 --- a/services/brig/brig.cabal +++ b/services/brig/brig.cabal @@ -1,10 +1,8 @@ cabal-version: 2.0 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack --- --- hash: 350e615ec20264419ad3244b5ba5b93c8a0bbea7dc35db5f300a3fbf3ef4e4c0 name: brig version: 2.0 @@ -128,7 +126,46 @@ library Brig.Docs.Swagger hs-source-dirs: src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields build-depends: HaskellNet >=0.3 @@ -256,7 +293,46 @@ executable brig main-is: src/Main.hs other-modules: Paths_brig - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields -threaded -with-rtsopts=-N1 -with-rtsopts=-T -rtsopts build-depends: HsOpenSSL @@ -271,7 +347,46 @@ executable brig-index main-is: index/src/Main.hs other-modules: Paths_brig - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields -threaded -with-rtsopts=-N build-depends: base @@ -316,7 +431,46 @@ executable brig-integration Paths_brig hs-source-dirs: test/integration - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields build-depends: HsOpenSSL @@ -461,7 +615,46 @@ executable brig-schema Paths_brig hs-source-dirs: schema/src - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields build-depends: base @@ -486,7 +679,46 @@ test-suite brig-tests Paths_brig hs-source-dirs: test/unit - default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DerivingVia DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns + default-extensions: + AllowAmbiguousTypes + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DerivingStrategies + DerivingVia + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + InstanceSigs + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + NoImplicitPrelude + OverloadedStrings + PackageImports + PatternSynonyms + PolyKinds + QuasiQuotes + RankNTypes + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeApplications + TypeFamilies + TypeFamilyDependencies + TypeOperators + UndecidableInstances + ViewPatterns ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -funbox-strict-fields -threaded -with-rtsopts=-N build-depends: aeson From d02fb0dabe491ccd883135c8ae18c14b63e633ce Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Mon, 10 Jan 2022 11:33:35 +0100 Subject: [PATCH 57/63] build/ubuntu/intermediate: Add deleted comment --- build/ubuntu/Dockerfile.intermediate | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build/ubuntu/Dockerfile.intermediate b/build/ubuntu/Dockerfile.intermediate index 0e768df0cc..61562ab4f0 100644 --- a/build/ubuntu/Dockerfile.intermediate +++ b/build/ubuntu/Dockerfile.intermediate @@ -1,3 +1,10 @@ +# Produces intermediate docker image with all executables under /dist + +# Requires to have created the wire-server-builder and wire-server-deps docker images (run `make` in this directory) +# Usage example: +# (from wire-server root directory) +# docker build -f build/alpine/Dockerfile.intermediate + ARG builder=quay.io/wire/ubuntu20-builder ARG deps=quay.io/wire/ubuntu20-deps From 25cc49dbcce42fe01bae709d79a115a61070b5c2 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Mon, 10 Jan 2022 11:37:03 +0100 Subject: [PATCH 58/63] Add changelog entry about nixpkgs bump --- changelog.d/5-internal/nixpkgs | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/5-internal/nixpkgs diff --git a/changelog.d/5-internal/nixpkgs b/changelog.d/5-internal/nixpkgs new file mode 100644 index 0000000000..750845b483 --- /dev/null +++ b/changelog.d/5-internal/nixpkgs @@ -0,0 +1 @@ +Upgrade nixpkgs pin used to provision developement dependencies \ No newline at end of file From 26a240373dac3d7e45ac9b787d15afcd6206dc1d Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Mon, 10 Jan 2022 11:53:44 +0100 Subject: [PATCH 59/63] ubuntu-builds: Use ghcup to install stack --- build/ubuntu/Dockerfile.prebuilder | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index b796676ddb..3281eb692d 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -59,16 +59,13 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libtinfo5 \ protobuf-compiler -# get static version of Haskell Stack and use system ghc by default -ARG STACK_VERSION=2.7.3 -RUN curl -sSfL https://github.com/commercialhaskell/stack/releases/download/v${STACK_VERSION}/stack-${STACK_VERSION}-linux-x86_64-static.tar.gz \ - | tar --wildcards -C /usr/local/bin --strip-components=1 -xzvf - '*/stack' && chmod 755 /usr/local/bin/stack && \ - stack config set system-ghc --global true - ARG GHC_VERSION=8.10.7 RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org \ - | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=${GHC_VERSION} sh + | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=${GHC_VERSION} sh ENV PATH=/root/.ghcup/bin:${PATH} \ LANG=C.UTF-8 \ LC_ALL=C.UTF-8 \ + +ARG STACK_VERSION=2.7.3 +RUN ghcup install stack ${STACK_VERSION} From 9eafe75847dbd6ed2ce61fe723ccf7881fcf8a50 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Mon, 10 Jan 2022 12:07:13 +0100 Subject: [PATCH 60/63] ubuntu-builds: Fix prebuilder dockerfile --- build/ubuntu/Dockerfile.prebuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ubuntu/Dockerfile.prebuilder b/build/ubuntu/Dockerfile.prebuilder index 3281eb692d..22f8dc04c6 100644 --- a/build/ubuntu/Dockerfile.prebuilder +++ b/build/ubuntu/Dockerfile.prebuilder @@ -65,7 +65,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org \ ENV PATH=/root/.ghcup/bin:${PATH} \ LANG=C.UTF-8 \ - LC_ALL=C.UTF-8 \ + LC_ALL=C.UTF-8 ARG STACK_VERSION=2.7.3 RUN ghcup install stack ${STACK_VERSION} From d6c904998711d2fad3e09bfd50108d0a96c01f96 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Mon, 10 Jan 2022 12:21:30 +0100 Subject: [PATCH 61/63] wire-api/Arbitrary: Delete dead code --- libs/wire-api/src/Wire/API/Arbitrary.hs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libs/wire-api/src/Wire/API/Arbitrary.hs b/libs/wire-api/src/Wire/API/Arbitrary.hs index de7eb3a952..b693ef0b0c 100644 --- a/libs/wire-api/src/Wire/API/Arbitrary.hs +++ b/libs/wire-api/src/Wire/API/Arbitrary.hs @@ -25,7 +25,6 @@ module Wire.API.Arbitrary ( Arbitrary (..), GenericUniform (..), listOf', - list1Of', setOf', mapOf', generateExample, @@ -90,9 +89,6 @@ customSizedOpts = (Generic.Gen1 listOf' :+ Generic.Gen1 nonEmptyListOf' :+ ()) Generic.sizedOpts -list1Of' :: Gen a -> Gen (List1 a) -list1Of' g = list1 <$> g <*> Generic.listOf' g - nonEmptyListOf' :: Gen a -> Gen (NonEmpty a) nonEmptyListOf' g = (:|) <$> g <*> listOf' g From 8bb5a9f81deed3644c9d3f82600ed5c0697d65fb Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Mon, 10 Jan 2022 14:53:54 +0100 Subject: [PATCH 62/63] wire-api/Arbitrary: Delete redundant import --- libs/wire-api/src/Wire/API/Arbitrary.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/wire-api/src/Wire/API/Arbitrary.hs b/libs/wire-api/src/Wire/API/Arbitrary.hs index b693ef0b0c..70ca21c751 100644 --- a/libs/wire-api/src/Wire/API/Arbitrary.hs +++ b/libs/wire-api/src/Wire/API/Arbitrary.hs @@ -39,7 +39,6 @@ import qualified Data.HashMap.Strict as HashMap import Data.ISO3166_CountryCodes (CountryCode) import Data.LanguageCodes (ISO639_1 (..)) import Data.List.NonEmpty (NonEmpty (..)) -import Data.List1 (List1, list1) import qualified Data.Map.Strict as Map import qualified Data.Set as Set import GHC.Generics (Rep) From a60c7cd4cd178ed88adad9a884e6912c25a89034 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Mon, 17 Jan 2022 09:37:22 +0100 Subject: [PATCH 63/63] Downgrade nixpkgs for HLS 1.4 Wingman is broken on HLS 1.5 --- nix/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index e16c0e7df5..987e681846 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -17,10 +17,10 @@ "homepage": "https://github.com/NixOS/nixpkgs", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d9896c1f8e419417ea8fc4b7e0e98ca4fc50ba8d", - "sha256": "1ysdab38jpjjvw5vc6qg1bns2f0hkwasww871hfhy9d9kxd6kaly", + "rev": "cc61d6cca06aaa46ccde79a92cd94dbb27c634a7", + "sha256": "0qi05m6vk9zqqs9573w2rhwm5k7jga70sjzq370npcipayrifw99", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/d9896c1f8e419417ea8fc4b7e0e98ca4fc50ba8d.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/cc61d6cca06aaa46ccde79a92cd94dbb27c634a7.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }