From 7cc888d333c0ebe5702687e12c2aeee1ea6b2d85095df52d380b075eaa65a87f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Feb 2024 22:00:52 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-9.6.x package:ghc-tasty revision:14, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tasty?expand=0&rev=23 --- ghc-tasty.changes | 6 ++ ghc-tasty.spec | 4 +- riscv64-unbounded-delays.patch | 10 +- tasty.cabal | 186 ++++++++++++++++----------------- 4 files changed, 105 insertions(+), 101 deletions(-) diff --git a/ghc-tasty.changes b/ghc-tasty.changes index d064113..76496d1 100644 --- a/ghc-tasty.changes +++ b/ghc-tasty.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 7 12:35:30 UTC 2024 - Peter Simons + +- Update tasty to version 1.5 revision 2. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Wed Sep 27 20:38:15 UTC 2023 - Peter Simons diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 45cb795..6f93690 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-tasty # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ 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/1.cabal#/%{pkg_name}.cabal +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 diff --git a/riscv64-unbounded-delays.patch b/riscv64-unbounded-delays.patch index dc3d9ff..9e656b8 100644 --- a/riscv64-unbounded-delays.patch +++ b/riscv64-unbounded-delays.patch @@ -1,9 +1,7 @@ -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 +--- 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 -- No reason to depend on unbounded-delays on 64-bit architecture - if(!arch(x86_64) && !arch(aarch64)) diff --git a/tasty.cabal b/tasty.cabal index 592adee..63a30d6 100644 --- a/tasty.cabal +++ b/tasty.cabal @@ -1,93 +1,93 @@ -cabal-version: >=1.10 -name: tasty -version: 1.5 -x-revision: 1 -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.8, - transformers >= 0.5 && < 0.7, - tagged >= 0.5 && < 0.9, - optparse-applicative >= 0.14 && < 0.19, - ansi-terminal >= 0.9 && < 1.1 - - -- 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 +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