Accepting request 1172773 from devel:languages:haskell
version update OBS-URL: https://build.opensuse.org/request/show/1172773 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hledger?expand=0&rev=27
This commit is contained in:
commit
c515e58a9a
@ -1,39 +0,0 @@
|
||||
From 034d37c3bef9ba99a1db7344127e814a9219047a Mon Sep 17 00:00:00 2001
|
||||
From: Simon Michael <simon@joyful.com>
|
||||
Date: Thu, 4 Jan 2024 16:53:24 -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 | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: hledger-1.32.3/Hledger/Cli/Script.hs
|
||||
===================================================================
|
||||
--- hledger-1.32.3.orig/Hledger/Cli/Script.hs 2024-01-28 10:05:20.000000000 +0000
|
||||
+++ hledger-1.32.3/Hledger/Cli/Script.hs 2024-02-28 15:28:33.604355754 +0000
|
||||
@@ -3,6 +3,7 @@ A convenient module to import in hledger
|
||||
aiming to provide the most useful imports and reduce boilerplate.
|
||||
|-}
|
||||
|
||||
+{-# LANGUAGE CPP #-}
|
||||
{-# LANGUAGE PackageImports #-}
|
||||
|
||||
module Hledger.Cli.Script
|
||||
@@ -15,7 +16,13 @@ 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.Functor as M (Functor, fmap, (<$), ($>), (<$>), (<&>)) -- or without CPP ? redundant import warning
|
||||
+
|
||||
import Data.List as M
|
||||
import Data.Maybe as M
|
||||
import Data.Ord as M
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2963e16159ccf5da73beb6f9ecdbaafbd29819954a5aff00e1037f50a4ba7fd6
|
||||
size 1102346
|
3
hledger-1.33.1.tar.gz
Normal file
3
hledger-1.33.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2e0829d349b71facd4f01efc3e662b413b64698a2de374039293481a18397d93
|
||||
size 1133973
|
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 2 11:03:18 UTC 2024 - Peter Simons <psimons@suse.com>
|
||||
|
||||
- Update hledger 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-1.33.1/src/CHANGES.md
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 18 23:38:06 UTC 2024 - Peter Simons <psimons@suse.com>
|
||||
|
||||
- Update hledger 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-1.33/src/CHANGES.md
|
||||
|
||||
- Drop obsolete "fix-build-with-ghc-9.8.x.patch".
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 28 15:29:58 UTC 2024 - Peter Simons <psimons@suse.com>
|
||||
|
||||
|
@ -20,13 +20,12 @@
|
||||
%global pkgver %{pkg_name}-%{version}
|
||||
%bcond_with tests
|
||||
Name: %{pkg_name}
|
||||
Version: 1.32.3
|
||||
Version: 1.33.1
|
||||
Release: 0
|
||||
Summary: Command-line 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: fix-build-with-ghc-9.8.x.patch
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: ghc-Cabal-devel
|
||||
BuildRequires: ghc-Decimal-devel
|
||||
@ -154,8 +153,7 @@ Supplements: (ghc-%{pkg_name}-devel and ghc-prof)
|
||||
This package provides the Haskell %{pkg_name} profiling library.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
cabal-tweak-dep-ver base "<4.19" "< 5"
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
%ghc_lib_build
|
||||
|
Loading…
Reference in New Issue
Block a user