From 3e95571aaf0264dc7c8d6f506739b3364a09271759577a21c8f428655a9eb1c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jul 2024 12:40:33 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:ghc-tasty revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tasty?expand=0&rev=31 --- ghc-tasty.changes | 16 ++++++-- ghc-tasty.spec | 4 +- tasty-1.5.tar.gz | 3 ++ tasty.cabal | 93 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 tasty-1.5.tar.gz create mode 100644 tasty.cabal diff --git a/ghc-tasty.changes b/ghc-tasty.changes index 8c546f6..19af08a 100644 --- a/ghc-tasty.changes +++ b/ghc-tasty.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jul 18 10:57:07 UTC 2024 - Peter Simons + +- Update tasty to version 1.5 revision 2. + Upstream has revised the Cabal build instructions on Hackage. + +- Downgrade to version 1.5. + The 1.5.1 release has been deprecated by upstream. See + https://github.com/UnkindPartition/tasty/issues/421 for further + details. + ------------------------------------------------------------------- Sat Jun 22 10:14:39 UTC 2024 - Peter Simons @@ -98,9 +109,9 @@ Sat May 7 21:32:12 UTC 2022 - Peter Simons ------------------------------------------------------------------- Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup - + - disable %{ix86} build - + ------------------------------------------------------------------- Tue Aug 18 10:46:10 UTC 2020 - Peter Simons @@ -110,4 +121,3 @@ Tue Aug 18 10:46:10 UTC 2020 - Peter Simons Tue Jun 9 09:26:21 UTC 2020 - psimons@suse.com - Add tasty at version 1.3.1. - diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 4945f6a..6f93690 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -19,12 +19,13 @@ %global pkg_name tasty %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 1.5.1 +Version: 1.5 Release: 0 Summary: Modern and extensible testing framework 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 @@ -80,6 +81,7 @@ 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 %build diff --git a/tasty-1.5.tar.gz b/tasty-1.5.tar.gz new file mode 100644 index 0000000..cff9fb2 --- /dev/null +++ b/tasty-1.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca5cf7852a210e691d4dce67ee34de7ccb8ae390a3a68ecffde307e326d029ac +size 65023 diff --git a/tasty.cabal b/tasty.cabal new file mode 100644 index 0000000..63a30d6 --- /dev/null +++ b/tasty.cabal @@ -0,0 +1,93 @@ +cabal-version: >=1.10 +name: tasty +version: 1.5 +x-revision: 2 +synopsis: Modern and extensible testing framework +description: Tasty is a modern testing framework for Haskell. + It lets you combine your unit tests, golden + tests, QuickCheck/SmallCheck properties, and any + other types of tests into a single test suite. +license: MIT +license-file: LICENSE +author: Roman Cheplyaka +maintainer: Roman Cheplyaka +homepage: https://github.com/UnkindPartition/tasty +bug-reports: https://github.com/UnkindPartition/tasty/issues +-- copyright: +category: Testing +build-type: Simple +extra-source-files: CHANGELOG.md, README.md + +Source-repository head + type: git + location: https://github.com/UnkindPartition/tasty.git + subdir: core + +flag unix + description: + Depend on the unix package to install signal handlers + default: True + +library + exposed-modules: + Test.Tasty, + Test.Tasty.Options, + Test.Tasty.Providers, + Test.Tasty.Providers.ConsoleFormat, + Test.Tasty.Runners + Test.Tasty.Ingredients, + Test.Tasty.Ingredients.Basic + Test.Tasty.Ingredients.ConsoleReporter + + -- for testing only + Test.Tasty.Patterns.Types + Test.Tasty.Patterns.Parser + Test.Tasty.Patterns.Printer + Test.Tasty.Patterns.Eval + other-modules: + Control.Concurrent.Async + Test.Tasty.Parallel, + Test.Tasty.Core, + Test.Tasty.Options.Core, + Test.Tasty.Options.Env, + Test.Tasty.Patterns, + Test.Tasty.Patterns.Expr, + Test.Tasty.Run, + Test.Tasty.Runners.Reducers, + Test.Tasty.Runners.Utils, + Test.Tasty.CmdLine, + Test.Tasty.Ingredients.ListTests + Test.Tasty.Ingredients.IncludingOptions + + build-depends: + base >= 4.9 && < 5, + stm >= 2.3 && < 2.6, + containers >= 0.5.8 && < 0.8, + transformers >= 0.5 && < 0.7, + tagged >= 0.5 && < 0.9, + optparse-applicative >= 0.14 && < 0.19, + ansi-terminal >= 0.9 && < 1.2 + + -- No reason to depend on unbounded-delays on 64-bit architecture + if(!arch(x86_64) && !arch(aarch64)) + build-depends: + unbounded-delays >= 0.1 && < 0.2 + + if(!impl(ghc >= 8.0)) + build-depends: semigroups < 0.21 + + if(!impl(ghc >= 8.4)) + build-depends: time >= 1.4 && < 1.13 + + if !os(windows) && !impl(ghcjs) + cpp-options: -DUSE_WCWIDTH + if flag(unix) + build-depends: unix < 2.9 + + -- hs-source-dirs: + default-language: Haskell2010 + default-extensions: CPP, ScopedTypeVariables, DeriveDataTypeable + ghc-options: + -Wall + -Wno-incomplete-uni-patterns + -Wcompat From 10ae9e2282ff32f4429c60d9fb2db9ca4a3e3393eb72c02b96d75a490de60720 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jul 2024 14:34:12 +0000 Subject: [PATCH 2/2] drop obsolete tarball OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tasty?expand=0&rev=32 --- tasty-1.5.1.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 tasty-1.5.1.tar.gz diff --git a/tasty-1.5.1.tar.gz b/tasty-1.5.1.tar.gz deleted file mode 100644 index 47c3cf9..0000000 --- a/tasty-1.5.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89deadd119cd86d660cc2d4265ad9da3789a4c857edee1f95bf6202f6e2661dd -size 66060