diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 6f93690..8b9c456 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -26,8 +26,6 @@ License: MIT URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal -# https://github.com/UnkindPartition/tasty/pull/371 -Patch0: riscv64-unbounded-delays.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-ansi-terminal-prof @@ -80,9 +78,8 @@ Supplements: (ghc-%{pkg_name}-devel and ghc-prof) This package provides the Haskell %{pkg_name} profiling library. %prep -%setup -q -n %{pkg_name}-%{version} -tr -d '\r' <%{SOURCE1} >%{pkg_name}.cabal -%autopatch -p0 +%autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/riscv64-unbounded-delays.patch b/riscv64-unbounded-delays.patch index 9e656b8..dc3d9ff 100644 --- a/riscv64-unbounded-delays.patch +++ b/riscv64-unbounded-delays.patch @@ -1,7 +1,9 @@ ---- tasty.cabal.orig 2024-02-09 21:02:29.437780992 +0000 -+++ tasty.cabal 2024-02-09 21:03:32.232599568 +0000 -@@ -69,7 +69,7 @@ - ansi-terminal >= 0.9 && < 1.2 +Index: tasty.cabal +=================================================================== +--- tasty.cabal.orig 2023-11-07 17:48:13.765306814 +0000 ++++ tasty.cabal 2023-11-07 17:48:44.757109342 +0000 +@@ -69,7 +69,7 @@ library + ansi-terminal >= 0.9 && < 1.1 -- No reason to depend on unbounded-delays on 64-bit architecture - if(!arch(x86_64) && !arch(aarch64))