Accepting request 1157278 from devel:languages:haskell
Update Haskell ecosystem to GHC version 9.8.2. OBS-URL: https://build.opensuse.org/request/show/1157278 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hledger?expand=0&rev=26
This commit is contained in:
commit
850260ac38
39
fix-build-with-ghc-9.8.x.patch
Normal file
39
fix-build-with-ghc-9.8.x.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
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 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Feb 28 15:29:58 UTC 2024 - Peter Simons <psimons@suse.com>
|
||||||
|
|
||||||
|
- Add "fix-build-with-ghc-9.8.x.patch" to fix the build with
|
||||||
|
ghc-9.8.x. The change is based on upstream commit
|
||||||
|
https://github.com/simonmichael/hledger/commit/034d37c3bef9ba99a1db7344127e814a9219047a.patch.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Jan 28 12:19:54 UTC 2024 - Peter Simons <psimons@suse.com>
|
Sun Jan 28 12:19:54 UTC 2024 - Peter Simons <psimons@suse.com>
|
||||||
|
|
||||||
|
@ -26,6 +26,7 @@ Summary: Command-line interface for the hledger accounting system
|
|||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
URL: https://hackage.haskell.org/package/%{name}
|
URL: https://hackage.haskell.org/package/%{name}
|
||||||
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
|
Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
|
||||||
|
Patch1: fix-build-with-ghc-9.8.x.patch
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
BuildRequires: ghc-Cabal-devel
|
BuildRequires: ghc-Cabal-devel
|
||||||
BuildRequires: ghc-Decimal-devel
|
BuildRequires: ghc-Decimal-devel
|
||||||
@ -153,7 +154,8 @@ Supplements: (ghc-%{pkg_name}-devel and ghc-prof)
|
|||||||
This package provides the Haskell %{pkg_name} profiling library.
|
This package provides the Haskell %{pkg_name} profiling library.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup
|
%autosetup -p1
|
||||||
|
cabal-tweak-dep-ver base "<4.19" "< 5"
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ghc_lib_build
|
%ghc_lib_build
|
||||||
|
Loading…
Reference in New Issue
Block a user