From c47576bad9150798f67f5545a680d28c646f1ca7881b56c7650e989e409853a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Nov 2023 14:07:19 +0000 Subject: [PATCH 1/5] osc copypac from project:devel:languages:haskell:ghc-9.6.x package:ghc-invariant revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-invariant?expand=0&rev=46 --- invariant.cabal | 170 ++++++++++++++++++++++++------------------------ 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/invariant.cabal b/invariant.cabal index 441c294..f1a22f5 100644 --- a/invariant.cabal +++ b/invariant.cabal @@ -1,85 +1,85 @@ -name: invariant -version: 0.6.2 -x-revision: 1 -synopsis: Haskell98 invariant functors -description: Haskell98 invariant functors (also known as exponential functors). - . - For more information, see Edward Kmett's article \"Rotten Bananas\": - . - -category: Control, Data -license: BSD2 -license-file: LICENSE -homepage: https://github.com/nfrisby/invariant-functors -bug-reports: https://github.com/nfrisby/invariant-functors/issues -author: Nicolas Frisby -maintainer: Nicolas Frisby , - Ryan Scott -build-type: Simple -cabal-version: >= 1.10 -tested-with: GHC == 7.0.4 - , GHC == 7.2.2 - , GHC == 7.4.2 - , GHC == 7.6.3 - , GHC == 7.8.4 - , GHC == 7.10.3 - , GHC == 8.0.2 - , GHC == 8.2.2 - , GHC == 8.4.4 - , GHC == 8.6.5 - , GHC == 8.8.4 - , GHC == 8.10.7 - , GHC == 9.0.2 - , GHC == 9.2.7 - , GHC == 9.4.5 - , GHC == 9.6.2 -extra-source-files: CHANGELOG.md, README.md - -source-repository head - type: git - location: https://github.com/nfrisby/invariant-functors - -library - exposed-modules: Data.Functor.Invariant - , Data.Functor.Invariant.TH - other-modules: Data.Functor.Invariant.TH.Internal - , Paths_invariant - hs-source-dirs: src - default-language: Haskell2010 - build-depends: array >= 0.3 && < 0.6 - , base >= 4 && < 5 - , bifunctors >= 5.2 && < 6 - , comonad >= 5 && < 6 - , containers >= 0.1 && < 0.8 - , contravariant >= 0.5 && < 2 - , ghc-prim - , profunctors >= 5.2.1 && < 6 - , StateVar >= 1.1 && < 2 - , stm >= 2.2 && < 3 - , tagged >= 0.7.3 && < 1 - , template-haskell >= 2.4 && < 2.22 - , th-abstraction >= 0.4 && < 0.7 - , transformers >= 0.2 && < 0.7 - , transformers-compat >= 0.3 && < 1 - , unordered-containers >= 0.2.4 && < 0.3 - ghc-options: -Wall - - if !impl(ghc >= 8.0) - build-depends: semigroups >= 0.16.2 && < 1 - -test-suite spec - type: exitcode-stdio-1.0 - hs-source-dirs: test - default-language: Haskell2010 - main-is: Spec.hs - other-modules: InvariantSpec - THSpec - build-depends: base >= 4 && < 5 - , hspec >= 1.8 - , invariant - , QuickCheck >= 2.11 && < 3 - , template-haskell - build-tool-depends: hspec-discover:hspec-discover - ghc-options: -Wall - if impl(ghc >= 8.6) - ghc-options: -Wno-star-is-type +name: invariant +version: 0.6.2 +x-revision: 1 +synopsis: Haskell98 invariant functors +description: Haskell98 invariant functors (also known as exponential functors). + . + For more information, see Edward Kmett's article \"Rotten Bananas\": + . + +category: Control, Data +license: BSD2 +license-file: LICENSE +homepage: https://github.com/nfrisby/invariant-functors +bug-reports: https://github.com/nfrisby/invariant-functors/issues +author: Nicolas Frisby +maintainer: Nicolas Frisby , + Ryan Scott +build-type: Simple +cabal-version: >= 1.10 +tested-with: GHC == 7.0.4 + , GHC == 7.2.2 + , GHC == 7.4.2 + , GHC == 7.6.3 + , GHC == 7.8.4 + , GHC == 7.10.3 + , GHC == 8.0.2 + , GHC == 8.2.2 + , GHC == 8.4.4 + , GHC == 8.6.5 + , GHC == 8.8.4 + , GHC == 8.10.7 + , GHC == 9.0.2 + , GHC == 9.2.7 + , GHC == 9.4.5 + , GHC == 9.6.2 +extra-source-files: CHANGELOG.md, README.md + +source-repository head + type: git + location: https://github.com/nfrisby/invariant-functors + +library + exposed-modules: Data.Functor.Invariant + , Data.Functor.Invariant.TH + other-modules: Data.Functor.Invariant.TH.Internal + , Paths_invariant + hs-source-dirs: src + default-language: Haskell2010 + build-depends: array >= 0.3 && < 0.6 + , base >= 4 && < 5 + , bifunctors >= 5.2 && < 6 + , comonad >= 5 && < 6 + , containers >= 0.1 && < 0.8 + , contravariant >= 0.5 && < 2 + , ghc-prim + , profunctors >= 5.2.1 && < 6 + , StateVar >= 1.1 && < 2 + , stm >= 2.2 && < 3 + , tagged >= 0.7.3 && < 1 + , template-haskell >= 2.4 && < 2.22 + , th-abstraction >= 0.4 && < 0.7 + , transformers >= 0.2 && < 0.7 + , transformers-compat >= 0.3 && < 1 + , unordered-containers >= 0.2.4 && < 0.3 + ghc-options: -Wall + + if !impl(ghc >= 8.0) + build-depends: semigroups >= 0.16.2 && < 1 + +test-suite spec + type: exitcode-stdio-1.0 + hs-source-dirs: test + default-language: Haskell2010 + main-is: Spec.hs + other-modules: InvariantSpec + THSpec + build-depends: base >= 4 && < 5 + , hspec >= 1.8 + , invariant + , QuickCheck >= 2.11 && < 3 + , template-haskell + build-tool-depends: hspec-discover:hspec-discover + ghc-options: -Wall + if impl(ghc >= 8.6) + ghc-options: -Wno-star-is-type From d8a499dea4aedc84286e9e5c445f98b40317778debfd784ce1c1578808dc109d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Nov 2023 16:59:35 +0000 Subject: [PATCH 2/5] osc copypac from project:devel:languages:haskell:ghc-9.6.x package:ghc-invariant revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-invariant?expand=0&rev=47 --- ghc-invariant.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-invariant.changes b/ghc-invariant.changes index bcdb0fb..b6cbcea 100644 --- a/ghc-invariant.changes +++ b/ghc-invariant.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 16 13:26:27 UTC 2023 - Peter Simons + +- Strip CRLF line endings from the bundled Cabal file. + ------------------------------------------------------------------- Sat Sep 30 12:59:34 UTC 2023 - Peter Simons From ca1ee15e31bc83e8a96a6f6706b5294a8163c55f517a1909257ff6514c8fc5da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Nov 2023 09:17:20 +0000 Subject: [PATCH 3/5] osc copypac from project:devel:languages:haskell:ghc-9.6.x package:ghc-invariant revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-invariant?expand=0&rev=48 --- ghc-invariant.changes | 5 -- invariant.cabal | 170 +++++++++++++++++++++--------------------- 2 files changed, 85 insertions(+), 90 deletions(-) diff --git a/ghc-invariant.changes b/ghc-invariant.changes index b6cbcea..bcdb0fb 100644 --- a/ghc-invariant.changes +++ b/ghc-invariant.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Nov 16 13:26:27 UTC 2023 - Peter Simons - -- Strip CRLF line endings from the bundled Cabal file. - ------------------------------------------------------------------- Sat Sep 30 12:59:34 UTC 2023 - Peter Simons diff --git a/invariant.cabal b/invariant.cabal index f1a22f5..441c294 100644 --- a/invariant.cabal +++ b/invariant.cabal @@ -1,85 +1,85 @@ -name: invariant -version: 0.6.2 -x-revision: 1 -synopsis: Haskell98 invariant functors -description: Haskell98 invariant functors (also known as exponential functors). - . - For more information, see Edward Kmett's article \"Rotten Bananas\": - . - -category: Control, Data -license: BSD2 -license-file: LICENSE -homepage: https://github.com/nfrisby/invariant-functors -bug-reports: https://github.com/nfrisby/invariant-functors/issues -author: Nicolas Frisby -maintainer: Nicolas Frisby , - Ryan Scott -build-type: Simple -cabal-version: >= 1.10 -tested-with: GHC == 7.0.4 - , GHC == 7.2.2 - , GHC == 7.4.2 - , GHC == 7.6.3 - , GHC == 7.8.4 - , GHC == 7.10.3 - , GHC == 8.0.2 - , GHC == 8.2.2 - , GHC == 8.4.4 - , GHC == 8.6.5 - , GHC == 8.8.4 - , GHC == 8.10.7 - , GHC == 9.0.2 - , GHC == 9.2.7 - , GHC == 9.4.5 - , GHC == 9.6.2 -extra-source-files: CHANGELOG.md, README.md - -source-repository head - type: git - location: https://github.com/nfrisby/invariant-functors - -library - exposed-modules: Data.Functor.Invariant - , Data.Functor.Invariant.TH - other-modules: Data.Functor.Invariant.TH.Internal - , Paths_invariant - hs-source-dirs: src - default-language: Haskell2010 - build-depends: array >= 0.3 && < 0.6 - , base >= 4 && < 5 - , bifunctors >= 5.2 && < 6 - , comonad >= 5 && < 6 - , containers >= 0.1 && < 0.8 - , contravariant >= 0.5 && < 2 - , ghc-prim - , profunctors >= 5.2.1 && < 6 - , StateVar >= 1.1 && < 2 - , stm >= 2.2 && < 3 - , tagged >= 0.7.3 && < 1 - , template-haskell >= 2.4 && < 2.22 - , th-abstraction >= 0.4 && < 0.7 - , transformers >= 0.2 && < 0.7 - , transformers-compat >= 0.3 && < 1 - , unordered-containers >= 0.2.4 && < 0.3 - ghc-options: -Wall - - if !impl(ghc >= 8.0) - build-depends: semigroups >= 0.16.2 && < 1 - -test-suite spec - type: exitcode-stdio-1.0 - hs-source-dirs: test - default-language: Haskell2010 - main-is: Spec.hs - other-modules: InvariantSpec - THSpec - build-depends: base >= 4 && < 5 - , hspec >= 1.8 - , invariant - , QuickCheck >= 2.11 && < 3 - , template-haskell - build-tool-depends: hspec-discover:hspec-discover - ghc-options: -Wall - if impl(ghc >= 8.6) - ghc-options: -Wno-star-is-type +name: invariant +version: 0.6.2 +x-revision: 1 +synopsis: Haskell98 invariant functors +description: Haskell98 invariant functors (also known as exponential functors). + . + For more information, see Edward Kmett's article \"Rotten Bananas\": + . + +category: Control, Data +license: BSD2 +license-file: LICENSE +homepage: https://github.com/nfrisby/invariant-functors +bug-reports: https://github.com/nfrisby/invariant-functors/issues +author: Nicolas Frisby +maintainer: Nicolas Frisby , + Ryan Scott +build-type: Simple +cabal-version: >= 1.10 +tested-with: GHC == 7.0.4 + , GHC == 7.2.2 + , GHC == 7.4.2 + , GHC == 7.6.3 + , GHC == 7.8.4 + , GHC == 7.10.3 + , GHC == 8.0.2 + , GHC == 8.2.2 + , GHC == 8.4.4 + , GHC == 8.6.5 + , GHC == 8.8.4 + , GHC == 8.10.7 + , GHC == 9.0.2 + , GHC == 9.2.7 + , GHC == 9.4.5 + , GHC == 9.6.2 +extra-source-files: CHANGELOG.md, README.md + +source-repository head + type: git + location: https://github.com/nfrisby/invariant-functors + +library + exposed-modules: Data.Functor.Invariant + , Data.Functor.Invariant.TH + other-modules: Data.Functor.Invariant.TH.Internal + , Paths_invariant + hs-source-dirs: src + default-language: Haskell2010 + build-depends: array >= 0.3 && < 0.6 + , base >= 4 && < 5 + , bifunctors >= 5.2 && < 6 + , comonad >= 5 && < 6 + , containers >= 0.1 && < 0.8 + , contravariant >= 0.5 && < 2 + , ghc-prim + , profunctors >= 5.2.1 && < 6 + , StateVar >= 1.1 && < 2 + , stm >= 2.2 && < 3 + , tagged >= 0.7.3 && < 1 + , template-haskell >= 2.4 && < 2.22 + , th-abstraction >= 0.4 && < 0.7 + , transformers >= 0.2 && < 0.7 + , transformers-compat >= 0.3 && < 1 + , unordered-containers >= 0.2.4 && < 0.3 + ghc-options: -Wall + + if !impl(ghc >= 8.0) + build-depends: semigroups >= 0.16.2 && < 1 + +test-suite spec + type: exitcode-stdio-1.0 + hs-source-dirs: test + default-language: Haskell2010 + main-is: Spec.hs + other-modules: InvariantSpec + THSpec + build-depends: base >= 4 && < 5 + , hspec >= 1.8 + , invariant + , QuickCheck >= 2.11 && < 3 + , template-haskell + build-tool-depends: hspec-discover:hspec-discover + ghc-options: -Wall + if impl(ghc >= 8.6) + ghc-options: -Wno-star-is-type From c899253276cbf1b75b61d9749380ae73ffdb47a2ad52db243225a1ccf02aa549 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 19 Mar 2024 14:43:32 +0000 Subject: [PATCH 4/5] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:ghc-invariant revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-invariant?expand=0&rev=49 --- ghc-invariant.changes | 6 ++++++ ghc-invariant.spec | 4 ++-- invariant.cabal | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ghc-invariant.changes b/ghc-invariant.changes index bcdb0fb..5335f03 100644 --- a/ghc-invariant.changes +++ b/ghc-invariant.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Mar 17 15:55:47 UTC 2024 - Peter Simons + +- Update invariant to version 0.6.2 revision 2. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Sat Sep 30 12:59:34 UTC 2023 - Peter Simons diff --git a/ghc-invariant.spec b/ghc-invariant.spec index 9a5593e..84be806 100644 --- a/ghc-invariant.spec +++ b/ghc-invariant.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-invariant # -# 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 @@ -26,7 +26,7 @@ Summary: Haskell98 invariant functors License: BSD-2-Clause 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 BuildRequires: ghc-Cabal-devel BuildRequires: ghc-StateVar-devel BuildRequires: ghc-StateVar-prof diff --git a/invariant.cabal b/invariant.cabal index 441c294..78bb0f3 100644 --- a/invariant.cabal +++ b/invariant.cabal @@ -1,6 +1,6 @@ name: invariant version: 0.6.2 -x-revision: 1 +x-revision: 2 synopsis: Haskell98 invariant functors description: Haskell98 invariant functors (also known as exponential functors). . @@ -58,7 +58,7 @@ library , stm >= 2.2 && < 3 , tagged >= 0.7.3 && < 1 , template-haskell >= 2.4 && < 2.22 - , th-abstraction >= 0.4 && < 0.7 + , th-abstraction >= 0.4 && < 0.8 , transformers >= 0.2 && < 0.7 , transformers-compat >= 0.3 && < 1 , unordered-containers >= 0.2.4 && < 0.3 From ae3e77c6a5e8465e2ab4e312866fc89f4c96f458e96eeeba2f9641f35d85b53d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Mar 2024 22:01:01 +0000 Subject: [PATCH 5/5] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:ghc-invariant revision:4, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-invariant?expand=0&rev=50 --- ghc-invariant.changes | 7 ++++ ghc-invariant.spec | 4 +- invariant-0.6.2.tar.gz | 3 -- invariant-0.6.3.tar.gz | 3 ++ invariant.cabal | 85 ------------------------------------------ 5 files changed, 11 insertions(+), 91 deletions(-) delete mode 100644 invariant-0.6.2.tar.gz create mode 100644 invariant-0.6.3.tar.gz delete mode 100644 invariant.cabal diff --git a/ghc-invariant.changes b/ghc-invariant.changes index 5335f03..af438c0 100644 --- a/ghc-invariant.changes +++ b/ghc-invariant.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 19 11:01:41 UTC 2024 - Peter Simons + +- Update invariant to version 0.6.3. + # 0.6.3 [2024.03.19] + * Support building with `template-haskell-2.22.*` (GHC 9.10). + ------------------------------------------------------------------- Sun Mar 17 15:55:47 UTC 2024 - Peter Simons diff --git a/ghc-invariant.spec b/ghc-invariant.spec index 84be806..93e10b4 100644 --- a/ghc-invariant.spec +++ b/ghc-invariant.spec @@ -20,13 +20,12 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6.2 +Version: 0.6.3 Release: 0 Summary: Haskell98 invariant functors License: BSD-2-Clause 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 BuildRequires: ghc-Cabal-devel BuildRequires: ghc-StateVar-devel BuildRequires: ghc-StateVar-prof @@ -102,7 +101,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/invariant-0.6.2.tar.gz b/invariant-0.6.2.tar.gz deleted file mode 100644 index 0a1036a..0000000 --- a/invariant-0.6.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c36485e8088a57e9df1a93881211a1c09e8920ce1b14bfa141cac9f75b7ee108 -size 28199 diff --git a/invariant-0.6.3.tar.gz b/invariant-0.6.3.tar.gz new file mode 100644 index 0000000..8ea0d0a --- /dev/null +++ b/invariant-0.6.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d2019e4a1060b88f2594df5256b086b07c09fff0f0dc5adf6163facee552fbf +size 28239 diff --git a/invariant.cabal b/invariant.cabal deleted file mode 100644 index 78bb0f3..0000000 --- a/invariant.cabal +++ /dev/null @@ -1,85 +0,0 @@ -name: invariant -version: 0.6.2 -x-revision: 2 -synopsis: Haskell98 invariant functors -description: Haskell98 invariant functors (also known as exponential functors). - . - For more information, see Edward Kmett's article \"Rotten Bananas\": - . - -category: Control, Data -license: BSD2 -license-file: LICENSE -homepage: https://github.com/nfrisby/invariant-functors -bug-reports: https://github.com/nfrisby/invariant-functors/issues -author: Nicolas Frisby -maintainer: Nicolas Frisby , - Ryan Scott -build-type: Simple -cabal-version: >= 1.10 -tested-with: GHC == 7.0.4 - , GHC == 7.2.2 - , GHC == 7.4.2 - , GHC == 7.6.3 - , GHC == 7.8.4 - , GHC == 7.10.3 - , GHC == 8.0.2 - , GHC == 8.2.2 - , GHC == 8.4.4 - , GHC == 8.6.5 - , GHC == 8.8.4 - , GHC == 8.10.7 - , GHC == 9.0.2 - , GHC == 9.2.7 - , GHC == 9.4.5 - , GHC == 9.6.2 -extra-source-files: CHANGELOG.md, README.md - -source-repository head - type: git - location: https://github.com/nfrisby/invariant-functors - -library - exposed-modules: Data.Functor.Invariant - , Data.Functor.Invariant.TH - other-modules: Data.Functor.Invariant.TH.Internal - , Paths_invariant - hs-source-dirs: src - default-language: Haskell2010 - build-depends: array >= 0.3 && < 0.6 - , base >= 4 && < 5 - , bifunctors >= 5.2 && < 6 - , comonad >= 5 && < 6 - , containers >= 0.1 && < 0.8 - , contravariant >= 0.5 && < 2 - , ghc-prim - , profunctors >= 5.2.1 && < 6 - , StateVar >= 1.1 && < 2 - , stm >= 2.2 && < 3 - , tagged >= 0.7.3 && < 1 - , template-haskell >= 2.4 && < 2.22 - , th-abstraction >= 0.4 && < 0.8 - , transformers >= 0.2 && < 0.7 - , transformers-compat >= 0.3 && < 1 - , unordered-containers >= 0.2.4 && < 0.3 - ghc-options: -Wall - - if !impl(ghc >= 8.0) - build-depends: semigroups >= 0.16.2 && < 1 - -test-suite spec - type: exitcode-stdio-1.0 - hs-source-dirs: test - default-language: Haskell2010 - main-is: Spec.hs - other-modules: InvariantSpec - THSpec - build-depends: base >= 4 && < 5 - , hspec >= 1.8 - , invariant - , QuickCheck >= 2.11 && < 3 - , template-haskell - build-tool-depends: hspec-discover:hspec-discover - ghc-options: -Wall - if impl(ghc >= 8.6) - ghc-options: -Wno-star-is-type