From 351e9d8d2dfbe39316a48e5b11d7684ad27f4b57 Mon Sep 17 00:00:00 2001 From: Dhruvin Gandhi Date: Thu, 21 Jul 2022 19:17:20 +0530 Subject: [PATCH 1/3] testing/hledger: upgrade to 1.26.1 --- testing/hledger/APKBUILD | 6 +++--- testing/hledger/cabal.project.freeze | 17 +++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/testing/hledger/APKBUILD b/testing/hledger/APKBUILD index e4c187a656f..a1c61578fe3 100644 --- a/testing/hledger/APKBUILD +++ b/testing/hledger/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dhruvin Gandhi # Maintainer: Dhruvin Gandhi pkgname=hledger -pkgver=1.26 +pkgver=1.26.1 pkgrel=0 pkgdesc="Command-line interface for the hledger accounting system" url="https://hledger.org/hledger.html" @@ -39,6 +39,6 @@ package() { } sha512sums=" -8cadae1989eaebb17375d7a6b9a82c91e3558e09285129468d86a25af083ff255bf3b487672aade3f0ca3955d6746d7f2409999199d2b658d6a5fcd9ef05e14f hledger-1.26.tar.gz -94870095532566c5d1a48973e83d27f7fbcc867c1b0ca766a6f98ff2461002fc489dfae8e44b492e71328217fb3d85f270166c21c2c520e648dca96747f6ea05 cabal.project.freeze +498076acb775e006d6f24f04138500ccbe4db98dfab6d60331def20bccaa3204c3320a873a304035fbe37f9d0236027e3bcfd0791cea84a2d8258d19fb49b729 hledger-1.26.1.tar.gz +39cd11aba66b765e90f20092d39bea1536dc659c6a325ad961954cc879ed81590e1b1b975140eb6a89b76271dab2ddc5c0fb471bac7d6068648c58588ed7972e cabal.project.freeze " diff --git a/testing/hledger/cabal.project.freeze b/testing/hledger/cabal.project.freeze index d9ef64ea314..6ea419264cf 100644 --- a/testing/hledger/cabal.project.freeze +++ b/testing/hledger/cabal.project.freeze @@ -8,7 +8,7 @@ constraints: any.Cabal ==3.4.0.0, any.QuickCheck ==2.14.2, QuickCheck -old-random +templatehaskell, any.StateVar ==1.2.2, - any.aeson ==2.0.3.0, + any.aeson ==2.1.0.0, aeson -cffi +ordered-keymap, any.aeson-pretty ==0.8.9, aeson-pretty -lib-only, @@ -34,7 +34,7 @@ constraints: any.Cabal ==3.4.0.0, any.cabal-doctest ==1.0.9, any.call-stack ==0.4.0, any.case-insensitive ==1.2.1.0, - any.cassava ==0.5.2.0, + any.cassava ==0.5.3.0, cassava -bytestring--lt-0_10_4, any.cassava-megaparsec ==2.0.4, cassava-megaparsec -dev, @@ -68,6 +68,7 @@ constraints: any.Cabal ==3.4.0.0, any.extra ==1.7.10, any.file-embed ==0.0.15.0, any.filepath ==1.4.2.1, + any.generically ==0.1, any.ghc-bignum ==1.0, any.ghc-bignum-orphans ==0.1.1, any.ghc-boot-th ==9.0.1, @@ -79,7 +80,7 @@ constraints: any.Cabal ==3.4.0.0, hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks, any.haskeline ==0.8.1.0, hledger +terminfo +threaded, - any.hledger-lib ==1.26, + any.hledger-lib ==1.26.1, any.html ==1.0.1.2, any.indexed-traversable ==0.1.2, any.indexed-traversable-instances ==0.1.1, @@ -101,7 +102,7 @@ constraints: any.Cabal ==3.4.0.0, any.parser-combinators ==1.3.0, parser-combinators -dev, any.pretty ==1.1.3.6, - any.pretty-simple ==4.1.0.0, + any.pretty-simple ==4.1.1.0, pretty-simple -buildexample +buildexe, any.prettyprinter ==1.7.1, prettyprinter -buildreadme +text, @@ -110,7 +111,7 @@ constraints: any.Cabal ==3.4.0.0, any.process ==1.6.11.0, any.random ==1.2.1.1, any.regex-base ==0.94.0.2, - any.regex-tdfa ==1.3.1.2, + any.regex-tdfa ==1.3.2, regex-tdfa -force-o2, any.rts ==1.0, any.safe ==0.3.19, @@ -120,7 +121,7 @@ constraints: any.Cabal ==3.4.0.0, semialign +semigroupoids, any.semigroupoids ==5.3.7, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, - any.shakespeare ==2.0.29, + any.shakespeare ==2.0.30, shakespeare -test_coffee -test_export -test_roy, any.split ==0.2.3.4, any.splitmix ==0.1.0.4, @@ -150,7 +151,7 @@ constraints: any.Cabal ==3.4.0.0, time-compat -old-locale, any.timeit ==2.0, any.transformers ==0.5.6.2, - any.transformers-compat ==0.7.1, + any.transformers-compat ==0.7.2, transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, any.uglymemo ==0.1.0.1, any.unbounded-delays ==0.1.1.1, @@ -166,4 +167,4 @@ constraints: any.Cabal ==3.4.0.0, wcwidth -cli +split-base, any.witherable ==0.4.2, any.wizards ==1.0.3 -index-state: hackage.haskell.org 2022-06-06T02:45:15Z +index-state: hackage.haskell.org 2022-07-21T12:50:44Z -- GitLab From b515fb7f7b15fbfa3fb9ab061f30fa16ace80f3f Mon Sep 17 00:00:00 2001 From: Dhruvin Gandhi Date: Thu, 21 Jul 2022 19:23:20 +0530 Subject: [PATCH 2/3] testing/hledger-ui: upgrade to 1.26.1 --- testing/hledger-ui/APKBUILD | 6 ++--- testing/hledger-ui/cabal.project.freeze | 33 +++++++++++++------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/testing/hledger-ui/APKBUILD b/testing/hledger-ui/APKBUILD index 3caac38c3e5..145e14bf3e0 100644 --- a/testing/hledger-ui/APKBUILD +++ b/testing/hledger-ui/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dhruvin Gandhi # Maintainer: Dhruvin Gandhi pkgname=hledger-ui -pkgver=1.26 +pkgver=1.26.1 pkgrel=0 pkgdesc="Curses-style terminal interface for the hledger accounting system" url="https://hledger.org/hledger-ui.html" @@ -37,6 +37,6 @@ package() { } sha512sums=" -63c299af40f29bfe99e1af3508f43051e8e5f8ead4d90b4af51607fe333899d10b21732ba12614ef6a41e389fcf2d7662f0986acff78e6b9451d5fe67f695837 hledger-ui-1.26.tar.gz -486e49d491fc0113c9c8ef06b9d7321c82038c348f8dae3037451c27d8966d64c9dc1c01f356071a2bf00dd461b654033e896006b88107ba5318033aea477d84 cabal.project.freeze +688aa88299693d06f1ce95fd653bc5450accb511bc90415ec02f40242b11324b0ff38ba9f51c9538ff6f3903c5ab77551b9077e38053412f9ce05e6d1ab3a145 hledger-ui-1.26.1.tar.gz +67f13aa5cc0f42395a80cd777e676cb7c7cc6094f06df19cd1ddf7e1b20ab9308f40275b6ec16b2ddf781b4301443e7e68ee2439fdd8251542afe2ee4cb48d80 cabal.project.freeze " diff --git a/testing/hledger-ui/cabal.project.freeze b/testing/hledger-ui/cabal.project.freeze index 712d327f7c7..4bd95b09924 100644 --- a/testing/hledger-ui/cabal.project.freeze +++ b/testing/hledger-ui/cabal.project.freeze @@ -8,7 +8,7 @@ constraints: any.Cabal ==3.4.0.0, any.QuickCheck ==2.14.2, QuickCheck -old-random +templatehaskell, any.StateVar ==1.2.2, - any.aeson ==2.0.3.0, + any.aeson ==2.1.0.0, aeson -cffi +ordered-keymap, any.aeson-pretty ==0.8.9, aeson-pretty -lib-only, @@ -32,13 +32,13 @@ constraints: any.Cabal ==3.4.0.0, any.blaze-builder ==0.4.2.2, any.blaze-html ==0.9.1.2, any.blaze-markup ==0.8.2.8, - any.brick ==0.69, + any.brick ==0.73, brick -demos, any.bytestring ==0.10.12.1, any.cabal-doctest ==1.0.9, any.call-stack ==0.4.0, any.case-insensitive ==1.2.1.0, - any.cassava ==0.5.2.0, + any.cassava ==0.5.3.0, cassava -bytestring--lt-0_10_4, any.cassava-megaparsec ==2.0.4, cassava-megaparsec -dev, @@ -70,7 +70,7 @@ constraints: any.Cabal ==3.4.0.0, distributive +semigroups +tagged, any.dlist ==1.0, dlist -werror, - any.doclayout ==0.3.1.1, + any.doclayout ==0.4, any.emojis ==0.1.2, any.enclosed-exceptions ==1.0.3, any.exceptions ==0.10.4, @@ -78,6 +78,7 @@ constraints: any.Cabal ==3.4.0.0, any.file-embed ==0.0.15.0, any.filepath ==1.4.2.1, any.fsnotify ==0.3.0.1, + any.generically ==0.1, any.ghc-bignum ==1.0, any.ghc-bignum-orphans ==0.1.1, any.ghc-boot-th ==9.0.1, @@ -89,9 +90,9 @@ constraints: any.Cabal ==3.4.0.0, hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks, any.haskeline ==0.8.1.0, any.hinotify ==0.4.1, - any.hledger ==1.26, + any.hledger ==1.26.1, hledger +terminfo +threaded, - any.hledger-lib ==1.26, + any.hledger-lib ==1.26.1, hledger-ui +threaded, any.html ==1.0.1.2, any.indexed-traversable ==0.1.2, @@ -105,10 +106,10 @@ constraints: any.Cabal ==3.4.0.0, math-functions +system-erf +system-expm1, any.megaparsec ==9.2.1, megaparsec -dev, - any.microlens ==0.4.12.0, - any.microlens-ghc ==0.4.13.2, + any.microlens ==0.4.13.0, + any.microlens-ghc ==0.4.14.0, any.microlens-mtl ==0.2.0.2, - any.microlens-platform ==0.4.2.1, + any.microlens-platform ==0.4.3.2, any.microlens-th ==0.4.3.10, any.mmorph ==1.2.0, any.monad-control ==1.0.3.1, @@ -121,7 +122,7 @@ constraints: any.Cabal ==3.4.0.0, any.parser-combinators ==1.3.0, parser-combinators -dev, any.pretty ==1.1.3.6, - any.pretty-simple ==4.1.0.0, + any.pretty-simple ==4.1.1.0, pretty-simple -buildexample +buildexe, any.prettyprinter ==1.7.1, prettyprinter -buildreadme +text, @@ -130,7 +131,7 @@ constraints: any.Cabal ==3.4.0.0, any.process ==1.6.11.0, any.random ==1.2.1.1, any.regex-base ==0.94.0.2, - any.regex-tdfa ==1.3.1.2, + any.regex-tdfa ==1.3.2, regex-tdfa -force-o2, any.rts ==1.0, any.safe ==0.3.19, @@ -140,7 +141,7 @@ constraints: any.Cabal ==3.4.0.0, semialign +semigroupoids, any.semigroupoids ==5.3.7, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, - any.shakespeare ==2.0.29, + any.shakespeare ==2.0.30, shakespeare -test_coffee -test_export -test_roy, any.shelly ==1.10.0, shelly -build-examples -lifted, @@ -162,7 +163,7 @@ constraints: any.Cabal ==3.4.0.0, any.text ==1.2.4.1, any.text-short ==0.1.5, text-short -asserts, - any.text-zipper ==0.11, + any.text-zipper ==0.12, any.th-abstraction ==0.4.3.0, any.th-compat ==0.1.3, any.th-lift ==0.8.2, @@ -175,7 +176,7 @@ constraints: any.Cabal ==3.4.0.0, any.transformers ==0.5.6.2, any.transformers-base ==0.4.6, transformers-base +orphaninstances, - any.transformers-compat ==0.7.1, + any.transformers-compat ==0.7.2, transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, any.type-equality ==1, any.uglymemo ==0.1.0.1, @@ -190,10 +191,10 @@ constraints: any.Cabal ==3.4.0.0, any.uuid-types ==1.0.5, any.vector ==0.12.3.1, vector +boundschecks -internalchecks -unsafechecks -wall, - any.vty ==5.35.1, + any.vty ==5.36, any.wcwidth ==0.0.2, wcwidth -cli +split-base, any.witherable ==0.4.2, any.wizards ==1.0.3, any.word-wrap ==0.5 -index-state: hackage.haskell.org 2022-06-06T02:45:15Z +index-state: hackage.haskell.org 2022-07-21T12:50:44Z -- GitLab From 63d9644ba1e7bc44f0771992150cdff4a15ccb51 Mon Sep 17 00:00:00 2001 From: Dhruvin Gandhi Date: Thu, 21 Jul 2022 19:41:11 +0530 Subject: [PATCH 3/3] testing/hledger-web: upgrade to 1.26.1 --- testing/hledger-web/APKBUILD | 6 ++--- testing/hledger-web/cabal.project.freeze | 29 ++++++++++++------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/testing/hledger-web/APKBUILD b/testing/hledger-web/APKBUILD index c9add41021b..aad90fb0f0d 100644 --- a/testing/hledger-web/APKBUILD +++ b/testing/hledger-web/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dhruvin Gandhi # Maintainer: Dhruvin Gandhi pkgname=hledger-web -pkgver=1.26 +pkgver=1.26.1 pkgrel=0 pkgdesc="Web interface for the hledger accounting system" url="https://hledger.org/hledger-web.html" @@ -40,7 +40,7 @@ package() { } sha512sums=" -7d497c6ea3dc34a527a8855e0f7e5ea404fa86b3012767fc6a96705acd84aa9c3a09ab76793ad56762dfbe8e0db890d3121ab48113f96f32263ca6fdf7a6c108 hledger-web-1.26.tar.gz -b69dfc542133d3a79a33353ee52c37b0318b3ce5853993098ab0962b2b8ce52a0722b2a003983edb8f958f618531a8853990d77382cc5b489a05682c0b72c90b cabal.project.freeze +d0b41e4b5ba4db047a4bc8ef23b59a737e5beee34e3c523e755dc5dcbe9183586cc1539ea101d51de82dbaea1f99967cf84fcf2037d72eddf6f2d2e25c9e96d8 hledger-web-1.26.1.tar.gz +89f29780a43f2258f5bc59b86b7f393ae0c75f635d71ffc668b9f5e6e189ce20f6fd56a48d5814f2cf040e12d3051400f3c9c23256f21f46671f86e0fcc3369b cabal.project.freeze 4fd0898b29736c1d7f5b41b1ccca8734f38999e5ba88656e092724a7ce4ed346b4f86d627c99be77934eaa7cd86e33ce20a33a60650f1ad8a527c57387179365 hledger-web.initd " diff --git a/testing/hledger-web/cabal.project.freeze b/testing/hledger-web/cabal.project.freeze index ace2ca12083..79b16e9959b 100644 --- a/testing/hledger-web/cabal.project.freeze +++ b/testing/hledger-web/cabal.project.freeze @@ -28,8 +28,7 @@ constraints: any.Cabal ==3.4.0.0, async -bench, any.attoparsec ==0.14.4, attoparsec -developer, - any.attoparsec-iso8601 ==1.0.2.1, - attoparsec-iso8601 -developer -fast, + any.attoparsec-iso8601 ==1.1.0.0, any.auto-update ==0.1.6, any.base ==4.15.0.0, any.base-compat ==0.12.1, @@ -53,7 +52,7 @@ constraints: any.Cabal ==3.4.0.0, any.cabal-doctest ==1.0.9, any.call-stack ==0.4.0, any.case-insensitive ==1.2.1.0, - any.cassava ==0.5.2.0, + any.cassava ==0.5.3.0, cassava -bytestring--lt-0_10_4, any.cassava-megaparsec ==2.0.4, cassava-megaparsec -dev, @@ -128,9 +127,9 @@ constraints: any.Cabal ==3.4.0.0, any.haskeline ==0.8.1.0, any.haskell-lexer ==1.1, any.hjsmin ==0.2.0.4, - any.hledger ==1.26, + any.hledger ==1.26.1, hledger +terminfo +threaded, - any.hledger-lib ==1.26, + any.hledger-lib ==1.26.1, hledger-web -dev -library-only +threaded, any.hourglass ==0.2.12, any.hpc ==0.6.1.0, @@ -142,7 +141,7 @@ constraints: any.Cabal ==3.4.0.0, any.hspec-expectations ==0.8.2, any.html ==1.0.1.2, any.html-conduit ==1.3.2.2, - any.http-api-data ==0.4.3, + any.http-api-data ==0.5, http-api-data -use-text-show, any.http-client ==0.7.11, http-client +network-uri, @@ -195,11 +194,11 @@ constraints: any.Cabal ==3.4.0.0, parser-combinators -dev, any.path-pieces ==0.2.1, any.pem ==0.2.4, - any.persistent ==2.14.0.1, + any.persistent ==2.14.0.3, any.persistent-template ==2.12.0.0, any.pretty ==1.1.3.6, any.pretty-show ==1.10, - any.pretty-simple ==4.1.0.0, + any.pretty-simple ==4.1.1.0, pretty-simple -buildexample +buildexe, any.prettyprinter ==1.7.1, prettyprinter -buildreadme +text, @@ -210,10 +209,10 @@ constraints: any.Cabal ==3.4.0.0, any.quickcheck-io ==0.2.0, any.random ==1.2.1.1, any.regex-base ==0.94.0.2, - any.regex-tdfa ==1.3.1.2, + any.regex-tdfa ==1.3.2, regex-tdfa -force-o2, - any.resource-pool ==0.3.0.0, - any.resourcet ==1.2.5, + any.resource-pool ==0.3.1.0, + any.resourcet ==1.2.6, any.rts ==1.0, any.safe ==0.3.19, any.scientific ==0.3.7.0, @@ -224,7 +223,7 @@ constraints: any.Cabal ==3.4.0.0, any.semigroupoids ==5.3.7, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, any.setenv ==0.1.1.3, - any.shakespeare ==2.0.29, + any.shakespeare ==2.0.30, shakespeare -test_coffee -test_export -test_roy, any.silently ==1.2.5.2, any.simple-sendfile ==0.2.30, @@ -271,7 +270,7 @@ constraints: any.Cabal ==3.4.0.0, any.transformers ==0.5.6.2, any.transformers-base ==0.4.6, transformers-base +orphaninstances, - any.transformers-compat ==0.7.1, + any.transformers-compat ==0.7.2, transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, any.typed-process ==0.2.10.1, any.uglymemo ==0.1.0.1, @@ -318,7 +317,7 @@ constraints: any.Cabal ==3.4.0.0, any.yaml ==0.11.8.0, yaml +no-examples +no-exe, any.yesod ==1.6.2, - any.yesod-core ==1.6.23.1, + any.yesod-core ==1.6.24.0, any.yesod-form ==1.7.0, yesod-form +network-uri, any.yesod-persistent ==1.6.0.8, @@ -326,4 +325,4 @@ constraints: any.Cabal ==3.4.0.0, any.yesod-test ==1.6.14, any.zlib ==0.6.3.0, zlib -bundled-c-zlib -non-blocking-ffi -pkg-config -index-state: hackage.haskell.org 2022-06-06T02:45:15Z +index-state: hackage.haskell.org 2022-07-21T12:50:44Z -- GitLab