diff options
author | Dhruvin Gandhi <contact@dhruvin.dev> | 2024-04-19 14:59:35 +0700 |
---|---|---|
committer | Dhruvin Gandhi <contact@dhruvin.dev> | 2024-04-19 15:00:15 +0700 |
commit | 31853cf52d8154526b10eec8c1feec04b77d7113 (patch) | |
tree | ad16495efbb936633696dd1302b2edf0011e4af1 | |
parent | 7ffe0d54e25ac6f4a53bdf0e7d7814802ee0548c (diff) |
6 files changed, 10 insertions, 265 deletions
diff --git a/community/hledger/0001-cabal-update-cabal-files.patch b/community/hledger/0001-cabal-update-cabal-files.patch deleted file mode 100644 index b0312665129..00000000000 --- a/community/hledger/0001-cabal-update-cabal-files.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- a/hledger-lib/hledger-lib.cabal -+++ b/hledger-lib/hledger-lib.cabal -@@ -113,7 +113,7 @@ - , aeson-pretty - , ansi-terminal >=0.9 - , array -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , base-compat - , blaze-markup >=0.5.1 - , bytestring -@@ -171,7 +171,7 @@ - , aeson-pretty - , ansi-terminal >=0.9 - , array -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , base-compat - , blaze-markup >=0.5.1 - , bytestring -@@ -232,7 +232,7 @@ - , aeson-pretty - , ansi-terminal >=0.9 - , array -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , base-compat - , blaze-markup >=0.5.1 - , bytestring ---- a/hledger-ui/hledger-ui.cabal -+++ b/hledger-ui/hledger-ui.cabal -@@ -72,7 +72,7 @@ - build-depends: - ansi-terminal >=0.9 - , async -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , brick >=2.1.1 && <2.4 - , cmdargs >=0.8 - , containers >=0.5.9 -@@ -115,7 +115,7 @@ - ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind - cpp-options: -DVERSION="1.32.3" - build-depends: -- base >=4.14 && <4.19 -+ base >=4.14 && <4.20 - , hledger-ui - default-language: Haskell2010 - if flag(threaded) ---- a/hledger-web/hledger-web.cabal -+++ b/hledger-web/hledger-web.cabal -@@ -155,7 +155,7 @@ - build-depends: - Decimal >=0.5.1 - , aeson >=1 && <2.3 -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , base64 - , blaze-html - , blaze-markup -@@ -215,7 +215,7 @@ - ghc-options: -Wall -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns - cpp-options: -DVERSION="1.32.3" - build-depends: -- base >=4.14 && <4.19 -+ base >=4.14 && <4.20 - , hledger-web - default-language: Haskell2010 - if (flag(dev)) || (flag(library-only)) -@@ -235,7 +235,7 @@ - ghc-options: -Wall -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns - cpp-options: -DVERSION="1.32.3" - build-depends: -- base >=4.14 && <4.19 -+ base >=4.14 && <4.20 - , hledger-web - default-language: Haskell2010 - if (flag(dev)) || (flag(library-only)) ---- a/hledger/hledger.cabal -+++ b/hledger/hledger.cabal -@@ -142,7 +142,7 @@ - , Diff >=0.2 - , aeson >=1 && <2.3 - , ansi-terminal >=0.9 -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , bytestring - , cmdargs >=0.10 - , containers >=0.5.9 -@@ -193,7 +193,7 @@ - Decimal >=0.5.1 - , aeson >=1 && <2.3 - , ansi-terminal >=0.9 -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , bytestring - , cmdargs >=0.10 - , containers >=0.5.9 -@@ -244,7 +244,7 @@ - Decimal >=0.5.1 - , aeson >=1 && <2.3 - , ansi-terminal >=0.9 -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , bytestring - , cmdargs >=0.10 - , containers >=0.5.9 -@@ -292,7 +292,7 @@ - Decimal >=0.5.1 - , aeson >=1 && <2.3 - , ansi-terminal >=0.9 -- , base >=4.14 && <4.19 -+ , base >=4.14 && <4.20 - , bytestring - , cmdargs >=0.10 - , containers >=0.5.9 diff --git a/community/hledger/0002-fix-imp-stack-build-with-ghc-9.8-latest-stackage-nig.patch b/community/hledger/0002-fix-imp-stack-build-with-ghc-9.8-latest-stackage-nig.patch deleted file mode 100644 index c06d0bf00b4..00000000000 --- a/community/hledger/0002-fix-imp-stack-build-with-ghc-9.8-latest-stackage-nig.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0effd653e83dcd691fa69580a511168a126efd59 Mon Sep 17 00:00:00 2001 -From: Simon Michael <simon@joyful.com> -Date: Thu, 4 Jan 2024 07:58:25 -1000 -Subject: [PATCH] fix:imp:stack: build with ghc 9.8, latest stackage nightly - (part 2) - -Fix the build with GHC < 9.8. - -This reapplies commit 87600e5dd, this time with the correct description. ---- - hledger/Hledger/Cli/Script.hs | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/hledger/Hledger/Cli/Script.hs b/hledger/Hledger/Cli/Script.hs -index e708a1fbd..a4e17145c 100644 ---- a/hledger/Hledger/Cli/Script.hs -+++ b/hledger/Hledger/Cli/Script.hs -@@ -3,6 +3,7 @@ A convenient module to import in hledger scripts, - aiming to provide the most useful imports and reduce boilerplate. - |-} - -+{-# LANGUAGE CPP #-} - {-# LANGUAGE PackageImports #-} - - module Hledger.Cli.Script -@@ -15,7 +16,12 @@ import Control.Concurrent as M - import Control.Monad as M - import Data.Char as M - import Data.Either as M -+ - import Data.Functor as M -+#if MIN_VERSION_base(4,19,0) -+ hiding (unzip) -+#endif -+ - import Data.List as M - import Data.Maybe as M - import Data.Ord as M diff --git a/community/hledger/0003-Workaround-incompatibility-with-base64-and-GHC-9.8.patch b/community/hledger/0003-Workaround-incompatibility-with-base64-and-GHC-9.8.patch deleted file mode 100644 index 0d7f030cc1b..00000000000 --- a/community/hledger/0003-Workaround-incompatibility-with-base64-and-GHC-9.8.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6ad88112a2a8218ab3dc28d3022be3f68dbb8353 Mon Sep 17 00:00:00 2001 -From: Simon Michael <simon@joyful.com> -Date: Sun, 18 Feb 2024 15:17:39 -1000 -Subject: [PATCH] Workaround incompatibility with base64 and GHC 9.8 - -See https://github.com/simonmichael/hledger/issues/2166 ---- - hledger-web/cabal.project | 2 ++ - hledger-web/hledger-web.cabal | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - create mode 100644 hledger-web/cabal.project - -diff --git a/hledger-web/cabal.project b/hledger-web/cabal.project -new file mode 100644 -index 000000000..f16921ad5 ---- /dev/null -+++ b/hledger-web/cabal.project -@@ -0,0 +1,2 @@ -+packages: *.cabal -+allow-newer: base64:base -diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal -index 0a7db4add..4810a51f2 100644 ---- a/hledger-web/hledger-web.cabal -+++ b/hledger-web/hledger-web.cabal -@@ -156,7 +156,7 @@ library - Decimal >=0.5.1 - , aeson >=1 && <2.3 - , base >=4.14 && <4.20 -- , base64 -+ , base64 <1 - , blaze-html - , blaze-markup - , bytestring diff --git a/community/hledger/0004-fix-Hide-ambiguous-instance-for.patch b/community/hledger/0004-fix-Hide-ambiguous-instance-for.patch deleted file mode 100644 index a539c9634af..00000000000 --- a/community/hledger/0004-fix-Hide-ambiguous-instance-for.patch +++ /dev/null @@ -1,50 +0,0 @@ -From de3209a2fbe50093236b95ec525eaea654e9dcb3 Mon Sep 17 00:00:00 2001 -From: Vekhir <134215107+Vekhir@users.noreply.github.com> -Date: Sun, 18 Feb 2024 23:53:29 +0100 -Subject: [PATCH] fix: Hide ambiguous instance for (!?) - -base 4.19.0.0 introduces Data.List.!? which clashes with Data.Vector.!?, the latter of which is needed for vector operations. ---- - hledger-ui/Hledger/UI/AccountsScreen.hs | 5 +++++ - hledger-ui/Hledger/UI/RegisterScreen.hs | 4 ++++ - 2 files changed, 9 insertions(+) - -diff --git a/hledger-ui/Hledger/UI/AccountsScreen.hs b/hledger-ui/Hledger/UI/AccountsScreen.hs -index af5dd99bb..28361cce5 100644 ---- a/hledger-ui/Hledger/UI/AccountsScreen.hs -+++ b/hledger-ui/Hledger/UI/AccountsScreen.hs -@@ -1,5 +1,6 @@ - -- The accounts screen, showing accounts and balances like the CLI balance command. - -+{-# LANGUAGE CPP #-} - {-# LANGUAGE OverloadedStrings #-} - {-# LANGUAGE RecordWildCards #-} - {-# LANGUAGE TupleSections #-} -@@ -23,7 +24,11 @@ import Brick.Widgets.List - import Brick.Widgets.Edit - import Control.Monad - import Control.Monad.IO.Class (liftIO) -+#if MIN_VERSION_base(4,19,0) -+import Data.List hiding (reverse, (!?)) -+#else - import Data.List hiding (reverse) -+#endif - import Data.Maybe - import qualified Data.Text as T - import Data.Time.Calendar (Day) -diff --git a/hledger-ui/Hledger/UI/RegisterScreen.hs b/hledger-ui/Hledger/UI/RegisterScreen.hs -index d55d22d82..92c2d7cae 100644 ---- a/hledger-ui/Hledger/UI/RegisterScreen.hs -+++ b/hledger-ui/Hledger/UI/RegisterScreen.hs -@@ -19,7 +19,11 @@ where - import Control.Monad - import Control.Monad.IO.Class (liftIO) - import Data.Bifunctor (bimap, Bifunctor (second)) -+#if MIN_VERSION_base(4,19,0) -+import Data.List hiding ((!?)) -+#else - import Data.List -+#endif - import Data.Maybe - import qualified Data.Text as T - import qualified Data.Vector as V diff --git a/community/hledger/APKBUILD b/community/hledger/APKBUILD index 24d589507d5..2be6ca23816 100644 --- a/community/hledger/APKBUILD +++ b/community/hledger/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dhruvin Gandhi <contact@dhruvin.dev> # Maintainer: Dhruvin Gandhi <contact@dhruvin.dev> pkgname=hledger -pkgver=1.32.3 +pkgver=1.33 pkgrel=0 pkgdesc="Command-line interface for the hledger accounting system" _uipkgdesc="Curses-style terminal interface for the hledger accounting system" @@ -29,11 +29,6 @@ subpackages=" $pkgname-web-openrc:webopenrc " source="https://github.com/simonmichael/hledger/archive/refs/tags/$pkgver/hledger-$pkgver.tar.gz - 0001-cabal-update-cabal-files.patch - 0002-fix-imp-stack-build-with-ghc-9.8-latest-stackage-nig.patch - 0003-Workaround-incompatibility-with-base64-and-GHC-9.8.patch - 0004-fix-Hide-ambiguous-instance-for.patch - cabal.project.freeze hledger-web.initd hledger-web.pre-install" @@ -128,12 +123,8 @@ webopenrc() { } sha512sums=" -c586df4cdc95cf5048809cf7eee3deae7fa5f5ea8be4a8738b2fa8d3cbcf7c46236a39b091d5a7cf13c13194098fee07a0babb8af45dac2bad9fc7b3e97599e4 hledger-1.32.3.tar.gz -b91b61ea724de07eb831fcf1a7a953cdc794b5c1830ce37177bc27497376483b3461e06445743646605322aea0083dbfd3519c13c1ffb1899f5e62abd13ea5ee 0001-cabal-update-cabal-files.patch -2e97255b98dab0fbb24fba69cee0c273710a3b1a23f65d8b28b60529da6aa64ca7375ec1c5225be31993cc0fff1e62cab6e7c3bf62948ee245e03a8bb6d7e95e 0002-fix-imp-stack-build-with-ghc-9.8-latest-stackage-nig.patch -4a9df71f109322d362db1a26f4efb952b9823a134eb941ad6443ff533b210cbe4dd76e96c384f02305fa6f0ebeb70f102bd9f7423d600913556fbca6281a44fe 0003-Workaround-incompatibility-with-base64-and-GHC-9.8.patch -f06fd362dac184d48e4fe678bed00ed5240ba5da47cebba683f5c040bd34d51f558cb5d094142acfa162a66b456b4a526507eae954f070b359647629b128aea3 0004-fix-Hide-ambiguous-instance-for.patch -e73608921c31ef4b812caaf51f745775209ee03955e124369a2d4527108b88dc6ae970c0745a90ef6886e8c9dac27dafbd7a84bf22409647d62eff4e38f404f3 cabal.project.freeze +bb8968a64a90ab725249e800feab96ffc30b019c8ee8471f475b8492645c5ce9afc0f5f0eae851517450b6043ce341fb204151967a504120d2331ac1c1e279b7 hledger-1.33.tar.gz +d7c41b3c84708ce93ed66f21d41e19f81b7c9909986b56f701bafb1f61a7c5dec0b4e07d6aaf1a9ed62c63287e55ff6a1cbfdb70b84b9e999d3cf19303435f92 cabal.project.freeze 4fd0898b29736c1d7f5b41b1ccca8734f38999e5ba88656e092724a7ce4ed346b4f86d627c99be77934eaa7cd86e33ce20a33a60650f1ad8a527c57387179365 hledger-web.initd 9049869dc413c840928b6868547b0de87c624401eeebbd56a7626744634e6e65f6375ca3cf42e8d307fcc8653fbeaf231dde2b597c482176bbb0ba4034cb2c27 hledger-web.pre-install " diff --git a/community/hledger/cabal.project.freeze b/community/hledger/cabal.project.freeze index a4f54f2b834..58d367dba86 100644 --- a/community/hledger/cabal.project.freeze +++ b/community/hledger/cabal.project.freeze @@ -1,5 +1,5 @@ active-repositories: hackage.haskell.org:merge -constraints: any.Cabal ==3.10.2.0, +constraints: any.Cabal ==3.10.3.0, any.Cabal-syntax ==3.10.2.0, any.Decimal ==0.5.2, any.Diff ==0.5, @@ -72,7 +72,6 @@ constraints: any.Cabal ==3.10.2.0, clock -llvm, any.cmdargs ==0.10.22, cmdargs +quotation -testprog, - any.code-page ==0.2.1, any.colour ==2.3.6, any.comonad ==5.0.8, comonad +containers +distributive +indexed-traversable, @@ -113,7 +112,6 @@ constraints: any.Cabal ==3.10.2.0, any.dlist ==1.0, dlist -werror, any.doclayout ==0.4.0.1, - any.doctest ==0.22.2, any.easy-file ==0.2.5, any.email-validate ==2.3.2.20, any.emojis ==0.1.3, @@ -126,14 +124,9 @@ constraints: any.Cabal ==3.10.2.0, any.filepath ==1.4.200.1, any.fsnotify ==0.4.1.0, any.generically ==0.1.1, - any.ghc ==9.8.2, any.ghc-bignum ==1.3, - any.ghc-boot ==9.8.2, any.ghc-boot-th ==9.8.2, - any.ghc-heap ==9.8.2, - any.ghc-paths ==0.1.0.12, any.ghc-prim ==0.11.0, - any.ghci ==9.8.2, any.githash ==0.1.7.0, any.half ==0.3.1, any.happy ==1.20.1.1, @@ -142,6 +135,7 @@ constraints: any.Cabal ==3.10.2.0, any.hashtables ==1.3.1, hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks, any.haskeline ==0.8.2.1, + haskeline +examples +terminfo, any.haskell-lexer ==1.1.1, any.hinotify ==0.4.1, any.hjsmin ==0.2.1, @@ -149,7 +143,6 @@ constraints: any.Cabal ==3.10.2.0, hledger-ui +threaded, hledger-web -dev -library-only +threaded, any.hourglass ==0.2.12, - any.hpc ==0.7.0.0, any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, any.hspec ==2.11.7, @@ -190,10 +183,10 @@ constraints: any.Cabal ==3.10.2.0, any.memory ==0.18.0, memory +support_bytestring +support_deepseq, any.microlens ==0.4.13.1, - any.microlens-ghc ==0.4.14.2, + any.microlens-ghc ==0.4.14.3, any.microlens-mtl ==0.2.0.3, any.microlens-platform ==0.4.3.5, - any.microlens-th ==0.4.3.14, + any.microlens-th ==0.4.3.15, any.mime-types ==0.1.2.0, any.mmorph ==1.2.0, any.monad-control ==1.0.3.1, @@ -228,7 +221,7 @@ constraints: any.Cabal ==3.10.2.0, prettyprinter -buildreadme +text, any.prettyprinter-ansi-terminal ==1.1.3, any.primitive ==0.9.0.0, - any.process ==1.6.18.0, + any.process ==1.6.19.0, any.psqueues ==0.2.8.0, any.quickcheck-io ==0.2.0, any.quote-quot ==0.2.1.0, @@ -244,7 +237,6 @@ constraints: any.Cabal ==3.10.2.0, any.safe-exceptions ==0.1.7.4, any.scientific ==0.3.7.0, scientific -bytestring-builder -integer-simple, - any.semaphore-compat ==1.0.0, any.semialign ==1.3, semialign +semigroupoids, any.semigroupoids ==6.0.0.1, @@ -268,7 +260,6 @@ constraints: any.Cabal ==3.10.2.0, any.streaming-commons ==0.2.2.6, streaming-commons -use-bytestring-builder, any.strict ==0.5, - any.syb ==0.7.2.4, any.tabular ==0.2.2.8, any.tagged ==0.8.8, tagged +deepseq +transformers, @@ -298,7 +289,7 @@ constraints: any.Cabal ==3.10.2.0, time-compat -old-locale, any.time-manager ==0.0.1, any.timeit ==2.0, - any.tls ==2.0.2, + any.tls ==2.0.3, tls -devel, any.transformers ==0.6.1.0, any.transformers-base ==0.4.6, @@ -357,4 +348,4 @@ constraints: any.Cabal ==3.10.2.0, any.yesod-test ==1.6.16, any.zlib ==0.7.0.0, zlib -bundled-c-zlib +non-blocking-ffi +pkg-config -index-state: hackage.haskell.org 2024-04-16T08:37:42Z +index-state: hackage.haskell.org 2024-04-19T07:51:41Z |