Accepting request 1172772 from devel:languages:haskell

version update

OBS-URL: https://build.opensuse.org/request/show/1172772
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hledger-ui?expand=0&rev=25

fix-build-with-ghc-9.8.x.patch

@@ -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 af5dd99bb9b..28361cce54e 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 d55d22d8252..92c2d7caefa 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

hledger-ui-1.32.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97608bd5e83de63965f84268e24a98f9d28d07cdc013db763134dc9e06600125
-size 80928

hledger-ui-1.33.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d1985e26e63325a2b6b2b723958b8e88bdc8d4f7aad50d9f652f2b656a9305f4
+size 81588

hledger-ui.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Thu May  2 11:03:20 UTC 2024 - Peter Simons <psimons@suse.com>
+
+- Update hledger-ui to version 1.33.1.
+  Upstream's change log file format is strange (too much unmodified
+  text at at the top). The automatic updater cannot extract the
+  relevant additions. You can find the file at:
+  http://hackage.haskell.org/package/hledger-ui-1.33.1/src/CHANGES.md
+
+-------------------------------------------------------------------
+Thu Apr 18 23:38:07 UTC 2024 - Peter Simons <psimons@suse.com>
+
+- Update hledger-ui to version 1.33.
+  Upstream's change log file format is strange (too much unmodified
+  text at at the top). The automatic updater cannot extract the
+  relevant additions. You can find the file at:
+  http://hackage.haskell.org/package/hledger-ui-1.33/src/CHANGES.md
+
+- Drop obsolete "fix-build-with-ghc-9.8.x.patch".
+
 -------------------------------------------------------------------
 Wed Feb 28 16:04:39 UTC 2024 - Peter Simons <psimons@suse.com>
 

hledger-ui.spec

@@ -19,13 +19,12 @@
 %global pkg_name hledger-ui
 %global pkgver %{pkg_name}-%{version}
 Name:           %{pkg_name}
-Version:        1.32.3
+Version:        1.33.1
 Release:        0
 Summary:        Terminal interface for the hledger accounting system
 License:        GPL-3.0-or-later
 URL:            https://hackage.haskell.org/package/%{name}
 Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-Patch1:         https://github.com/simonmichael/hledger/commit/de3209a2fbe50093236b95ec525eaea654e9dcb3.patch#/fix-build-with-ghc-9.8.x.patch
 BuildRequires:  chrpath
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-ansi-terminal-devel
@@ -133,8 +132,7 @@ Supplements:    (ghc-%{pkg_name}-devel and ghc-prof)
 This package provides the Haskell %{pkg_name} profiling library.
 
 %prep
-%autosetup -p2
-cabal-tweak-dep-ver base "<4.19" "< 5"
+%autosetup
 
 %build
 %ghc_lib_build