From 5f04ccb7c7249b0f0eca8b3146352e7d4d362ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Choutri?= Date: Sat, 17 Feb 2024 23:48:43 +0100 Subject: [PATCH] Update dependencies --- cabal.project | 2 +- cabal.project.freeze | 122 ++++++++++++++++------------- src/jobs-worker/FloraJobs/Types.hs | 2 +- 3 files changed, 68 insertions(+), 58 deletions(-) diff --git a/cabal.project b/cabal.project index ad54daa4..3c4a46a2 100644 --- a/cabal.project +++ b/cabal.project @@ -76,7 +76,7 @@ source-repository-package source-repository-package type: git location: https://github.com/saurabhnanda/odd-jobs - tag: 51c7443 + tag: 411d5d0 source-repository-package type: git diff --git a/cabal.project.freeze b/cabal.project.freeze index 2378a46a..06b08fa5 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -2,6 +2,8 @@ active-repositories: hackage.haskell.org:merge constraints: any.Cabal ==3.8.1.0, any.Cabal-syntax ==3.8.1.0, any.HUnit ==1.6.2.0, + any.JuicyPixels ==3.3.8, + JuicyPixels -mmap, any.OneTuple ==0.4.1.1, any.Only ==0.1, any.PyF ==0.11.2.1, @@ -15,11 +17,11 @@ constraints: any.Cabal ==3.8.1.0, any.abstract-deque ==0.3, abstract-deque -usecas, any.adjunctions ==4.4.2, - any.aeson ==2.1.2.1, - aeson -cffi +ordered-keymap, + any.aeson ==2.2.1.0, + aeson +ordered-keymap, any.aeson-pretty ==0.8.10, aeson-pretty -lib-only, - any.ansi-terminal ==1.0, + any.ansi-terminal ==1.0.2, ansi-terminal -example, any.ansi-terminal-types ==0.11.5, any.appar ==0.1.8, @@ -35,22 +37,22 @@ constraints: any.Cabal ==3.8.1.0, atomic-primops -debug, any.attoparsec ==0.14.4, attoparsec -developer, - any.attoparsec-aeson ==2.1.0.0, - any.attoparsec-iso8601 ==1.1.0.1, + any.attoparsec-aeson ==2.2.0.1, any.authenticate-oauth ==1.7, any.auto-update ==0.1.6, - any.barbies ==2.0.5.0, + any.barbies ==2.1.1.0, any.base ==4.17.2.0, - any.base-compat ==0.12.3, - any.base-compat-batteries ==0.12.3, + any.base-compat ==0.13.1, + any.base-compat-batteries ==0.13.1, any.base-orphans ==0.9.1, any.base16 ==1.0, any.base16-bytestring ==1.0.2.0, + any.base32 ==0.4, any.base64 ==0.4.2.4, any.base64-bytestring ==1.2.1.0, any.basement ==0.0.16, - any.bifunctors ==5.5.15, - bifunctors +semigroups +tagged, + any.bifunctors ==5.6.1, + bifunctors +tagged, any.binary ==0.8.9.1, any.bitvec ==1.1.5.0, bitvec +simd, @@ -60,21 +62,23 @@ constraints: any.Cabal ==3.8.1.0, any.boring ==0.2.1, boring +tagged, any.bsb-http-chunked ==0.0.0.4, - any.bytebuild ==0.3.14.0, + any.bytebuild ==0.3.16.2, bytebuild -checked, any.byteorder ==1.0.4, - any.byteslice ==0.2.11.1, + any.byteslice ==0.2.13.2, byteslice +avoid-rawmemchr, - any.bytesmith ==0.3.10.0, + any.bytesmith ==0.3.11.0, any.bytestring ==0.11.5.2, any.bytestring-builder ==0.10.8.2.0, bytestring-builder +bytestring_has_builder, any.cabal-doctest ==1.0.9, any.call-stack ==0.4.0, any.case-insensitive ==1.2.1.0, + any.cborg ==0.2.10.0, + cborg +optimize-gmp, any.cereal ==0.5.8.3, cereal -bytestring-builder, - any.chronos ==1.1.5.1, + any.chronos ==1.1.6.0, any.clock ==0.8.4, clock -llvm, any.cmark-gfm ==0.2.6, @@ -83,16 +87,16 @@ constraints: any.Cabal ==3.8.1.0, cmdargs +quotation -testprog, any.colour ==2.3.6, any.colourista ==0.1.0.2, - any.commonmark ==0.2.4, - any.commonmark-extensions ==0.2.4, + any.commonmark ==0.2.5, + any.commonmark-extensions ==0.2.5.1, any.comonad ==5.0.8, comonad +containers +distributive +indexed-traversable, any.concurrent-output ==1.10.20, any.conduit ==1.3.5, any.conduit-extra ==1.3.6, - any.constraints ==0.13.4, + any.constraints ==0.14, any.containers ==0.6.7, - any.contiguous ==0.6.4.0, + any.contiguous ==0.6.4.2, any.contravariant ==1.5.5, contravariant +semigroups +statevar +tagged, any.cookie ==0.4.6, @@ -105,7 +109,7 @@ constraints: any.Cabal ==3.8.1.0, cryptohash-sha256 -exe +use-cbits, any.crypton ==0.34, crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes, - any.crypton-connection ==0.3.1, + any.crypton-connection ==0.3.2, any.crypton-x509 ==1.7.6, any.crypton-x509-store ==1.6.9, any.crypton-x509-system ==1.6.7, @@ -143,7 +147,7 @@ constraints: any.Cabal ==3.8.1.0, any.extensible-exceptions ==0.1.1.4, any.extra ==1.7.14, any.fast-logger ==3.2.2, - any.file-embed ==0.0.15.0, + any.file-embed ==0.0.16.0, any.filepath ==1.4.2.2, any.filtrable ==0.1.6.0, filtrable +containers, @@ -151,13 +155,13 @@ constraints: any.Cabal ==3.8.1.0, any.foldable1-classes-compat ==0.1, foldable1-classes-compat +tagged, any.foreign-store ==0.2, - any.free ==5.1.10, + any.free ==5.2, any.friendly-time ==0.4.1, any.fusion-plugin-types ==0.1.0, any.generic-deriving ==1.14.5, generic-deriving +base-4-9, any.generically ==0.1.1, - any.generics-sop ==0.5.1.3, + any.generics-sop ==0.5.1.4, any.ghc ==9.4.7, any.ghc-bignum ==1.3, any.ghc-boot ==9.4.7, @@ -166,6 +170,7 @@ constraints: any.Cabal ==3.8.1.0, any.ghc-prim ==0.9.1, any.ghci ==9.4.7, any.haddock-library ==1.11.0, + any.half ==0.3.1, any.happy ==1.20.1.1, any.hashable ==1.4.3.0, hashable +integer-gmp -random-initial-seed, @@ -186,17 +191,17 @@ constraints: any.Cabal ==3.8.1.0, any.hspec-expectations ==0.8.4, any.hsyslog ==5.0.2, hsyslog -install-examples, - any.http-api-data ==0.5, + any.http-api-data ==0.6, http-api-data -use-text-show, - any.http-client ==0.7.15, + any.http-client ==0.7.16, http-client +network-uri, any.http-client-tls ==0.3.6.3, any.http-conduit ==2.3.8.3, http-conduit +aeson, any.http-date ==0.0.11, any.http-media ==0.8.1.1, - any.http-types ==0.12.3, - any.http2 ==4.2.2, + any.http-types ==0.12.4, + any.http2 ==5.0.1, http2 -devel -h2spec, any.indexed-profunctors ==0.1.1.1, any.indexed-traversable ==0.1.3, @@ -246,15 +251,16 @@ constraints: any.Cabal ==3.8.1.0, any.mtl-compat ==0.2.2, mtl-compat -two-point-one -two-point-two, any.mwc-random ==0.15.0.2, - any.natural-arithmetic ==0.1.4.0, + any.natural-arithmetic ==0.2.1.0, any.network ==3.1.4.0, network -devel, any.network-byte-order ==0.1.7, + any.network-control ==0.0.2, any.network-info ==0.2.1, any.network-uri ==2.6.4.2, any.odd-jobs ==0.2.3, any.old-locale ==1.0.0.7, - any.old-time ==1.1.0.3, + any.old-time ==1.1.0.4, any.one-time-password ==3.0.0.0, any.openapi3 ==3.2.4, any.optics-core ==0.4.1.1, @@ -263,13 +269,11 @@ constraints: any.Cabal ==3.8.1.0, any.optics-th ==0.4.1, any.optparse-applicative ==0.18.1.0, optparse-applicative +process, + any.os-string ==2.0.2, any.parallel ==3.2.2.0, any.parsec ==3.1.16.1, any.parser-combinators ==1.3.0, parser-combinators -dev, - any.password ==3.0.2.1, - password +argon2 +bcrypt +pbkdf2 +scrypt, - any.password-types ==1.0.0.0, any.pcre2 ==2.2.1, any.pem ==0.2.4, any.pg-entity ==0.0.4.4, @@ -286,7 +290,7 @@ constraints: any.Cabal ==3.8.1.0, any.prettyprinter ==1.7.1, prettyprinter -buildreadme +text, any.prettyprinter-ansi-terminal ==1.1.3, - any.primitive ==0.8.0.0, + any.primitive ==0.9.0.0, any.primitive-addr ==0.1.0.2, any.primitive-offset ==0.2.0.0, any.primitive-unlifted ==2.1.0.0, @@ -296,15 +300,17 @@ constraints: any.Cabal ==3.8.1.0, any.prometheus-metrics-ghc ==1.0.1.2, any.prometheus-proc ==0.1.5.0, any.psqueues ==0.2.8.0, + any.qrcode-core ==0.9.9, + any.qrcode-juicypixels ==0.8.5, any.quickcheck-io ==0.2.0, - any.random ==1.2.1.1, + any.random ==1.2.1.2, any.raven-haskell ==0.1.4.1, raven-haskell -tests, any.recv ==0.1.0, any.reflection ==2.1.7, reflection -slow +template-haskell, any.regex-applicative ==0.3.4, - any.req ==3.13.1, + any.req ==3.13.2, req -dev, any.resource-pool ==0.4.0.0, any.resourcet ==1.3.0, @@ -312,17 +318,19 @@ constraints: any.Cabal ==3.8.1.0, retry -lib-werror, any.rts ==1.0.2, any.run-st ==0.1.3.2, - any.safe ==0.3.19, + any.safe ==0.3.21, any.safe-exceptions ==0.1.7.4, any.scientific ==0.3.7.0, scientific -bytestring-builder -integer-simple, any.sel ==0.0.1.0, any.semialign ==1.3, semialign +semigroupoids, - any.semigroupoids ==5.3.7, + any.semigroupoids ==6.0.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, any.semigroups ==0.20, semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers, + any.serialise ==0.2.6.1, + serialise +newtime15, any.servant ==0.20.1, any.servant-blaze ==0.9.1, any.servant-client ==0.20, @@ -335,24 +343,24 @@ constraints: any.Cabal ==3.8.1.0, servant-static-th -buildexample, any.simple-sendfile ==0.2.32, simple-sendfile +allow-bsd -fallback, - any.singleton-bool ==0.1.6, + any.singleton-bool ==0.1.7, any.slugify ==0.1.0.1, any.socks ==0.6.1, any.some ==1.0.6, some +newtype-unsafe, any.sop-core ==0.5.0.2, any.souffle-haskell ==3.5.1, - any.split ==0.2.4, + any.split ==0.2.5, any.splitmix ==0.1.0.5, splitmix -optimised-mixer, any.stm ==2.5.1.0, any.stm-chans ==3.0.0.9, any.streaming-commons ==0.2.2.6, streaming-commons -use-bytestring-builder, - any.streamly ==0.9.0, + any.streamly ==0.10.1, streamly -debug -dev -fusion-plugin -has-llvm -inspection -limit-build-mem +opt -use-unliftio, - any.streamly-core ==0.1.0, - streamly-core -debug -dev -has-llvm -limit-build-mem -no-fusion +opt -use-c-malloc -use-folds -use-unfolds -use-unliftio, + any.streamly-core ==0.2.2, + streamly-core -debug -dev -has-llvm -limit-build-mem +opt -use-folds -use-unfolds -use-unliftio, any.strict ==0.5, any.string-conv ==0.2.0, string-conv -lib-werror, @@ -360,8 +368,7 @@ constraints: any.Cabal ==3.8.1.0, any.syb ==0.7.2.4, any.tagged ==0.8.8, tagged +deepseq +transformers, - any.tar ==0.5.1.1, - tar -old-bytestring -old-time, + any.tar ==0.6.1.0, any.tasty ==1.5, tasty +unix, any.tasty-hunit ==0.10.1, @@ -373,11 +380,12 @@ constraints: any.Cabal ==3.8.1.0, any.text-conversions ==0.3.1.1, any.text-display ==0.0.5.1, text-display -book, + any.text-iso8601 ==0.1, any.text-manipulate ==0.3.1.0, any.text-short ==0.1.5, text-short -asserts, any.tf-random ==0.5, - any.th-abstraction ==0.5.0.0, + any.th-abstraction ==0.6.0.0, any.th-compat ==0.1.4, any.th-expand-syns ==0.4.11.0, any.th-lift ==0.8.4, @@ -389,9 +397,9 @@ constraints: any.Cabal ==3.8.1.0, time-compat -old-locale, any.time-manager ==0.0.1, any.timing-convenience ==0.1, - any.tls ==1.9.0, - tls +compat -hans +network, - any.torsor ==0.1, + any.tls ==2.0.0, + tls -devel, + any.torsor ==0.1.0.1, any.transformers ==0.5.6.2, any.transformers-base ==0.4.6, transformers-base +orphaninstances, @@ -405,13 +413,14 @@ constraints: any.Cabal ==3.8.1.0, any.unicode-transforms ==0.4.0.1, unicode-transforms -bench-show -dev -has-icu -has-llvm -use-gauge, any.unix ==2.7.3, - any.unix-compat ==0.7, + any.unix-compat ==0.7.1, unix-compat -old-time, any.unix-memory ==0.1.2, - any.unix-time ==0.4.11, + any.unix-time ==0.4.12, + any.unlifted ==0.2.2.0, any.unliftio ==0.2.25.0, any.unliftio-core ==0.2.1.0, - any.unordered-containers ==0.2.19.1, + any.unordered-containers ==0.2.20, unordered-containers -debug, any.utf8-string ==1.0.2, any.uuid ==1.3.15, @@ -422,27 +431,28 @@ constraints: any.Cabal ==3.8.1.0, vector +boundschecks -internalchecks -unsafechecks -wall, any.vector-algorithms ==0.9.0.1, vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, - any.vector-stream ==0.1.0.0, + any.vector-stream ==0.1.0.1, any.void ==0.7.3, void -safe, - any.wai ==3.2.3, + any.wai ==3.2.4, any.wai-app-static ==3.1.8, wai-app-static +crypton -print, - any.wai-extra ==3.1.13.0, + any.wai-extra ==3.1.14, wai-extra -build-example, any.wai-log ==0.4.0.1, any.wai-logger ==2.4.0, any.wai-middleware-heartbeat ==0.0.1.0, any.wai-middleware-prometheus ==1.0.0.1, - any.warp ==3.3.30, + any.warp ==3.3.31, warp +allow-sendfilefd -network-bytestring -warp-debug -x509, any.wide-word ==0.1.6.0, any.witherable ==0.4.2, any.wl-pprint-annotated ==0.1.0.1, any.word8 ==0.1.3, any.xml-conduit ==1.9.1.3, - any.xml-conduit-writer ==0.1.1.4, + any.xml-conduit-writer ==0.1.1.5, any.xml-types ==0.3.8, - any.zigzag ==0.0.1.0, + any.zigzag ==0.1.0.0, any.zlib ==0.6.3.0, zlib -bundled-c-zlib -non-blocking-ffi -pkg-config +index-state: hackage.haskell.org 2024-02-13T10:07:10Z diff --git a/src/jobs-worker/FloraJobs/Types.hs b/src/jobs-worker/FloraJobs/Types.hs index 92af877c..60ed1590 100644 --- a/src/jobs-worker/FloraJobs/Types.hs +++ b/src/jobs-worker/FloraJobs/Types.hs @@ -97,7 +97,7 @@ makeConfig runnerEnv floraEnv logger pool runnerContinuation = pool (MaxConcurrentJobs 100) (runJobRunner pool runnerEnv floraEnv logger . runnerContinuation) - (\x -> x{cfgDeleteSuccessfulJobs = False, cfgDefaultMaxAttempts = 3}) + (\x -> x{cfgDefaultMaxAttempts = 3}) makeUIConfig :: FloraConfig -> Logger -> Pool PG.Connection -> UIConfig makeUIConfig cfg logger pool =