From dec5209090ad78070a219edaf5f4a6c959f054dd0adf6e1b7dc5d19983be1727 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Feb 2022 13:44:53 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-katip revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-katip?expand=0&rev=8 --- ghc-katip.changes | 6 ++ ghc-katip.spec | 4 +- katip.cabal | 153 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 katip.cabal diff --git a/ghc-katip.changes b/ghc-katip.changes index 604cc51..a669d98 100644 --- a/ghc-katip.changes +++ b/ghc-katip.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 4 12:15:25 UTC 2022 - psimons@suse.com + +- Update katip to version 0.8.7.0 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Sat Nov 6 20:34:01 UTC 2021 - psimons@suse.com diff --git a/ghc-katip.spec b/ghc-katip.spec index faf7593..0290c15 100644 --- a/ghc-katip.spec +++ b/ghc-katip.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-katip # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ Summary: A structured logging framework License: BSD-3-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 BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-async-devel @@ -81,6 +82,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/katip.cabal b/katip.cabal new file mode 100644 index 0000000..e7afb8f --- /dev/null +++ b/katip.cabal @@ -0,0 +1,153 @@ +name: katip +version: 0.8.7.0 +x-revision: 1 +synopsis: A structured logging framework. +description: + Katip is a structured logging framework. See README.md for more details. + +license: BSD3 +license-file: LICENSE +author: Ozgun Ataman, Michael Xavier +maintainer: michael.xavier@soostone.com +copyright: Soostone Inc, 2015-2017 +category: Data, Text, Logging +homepage: https://github.com/Soostone/katip +bug-reports: https://github.com/Soostone/katip/issues +build-type: Simple +cabal-version: >=1.10 +extra-source-files: + README.md + changelog.md + examples/example.hs + examples/example_lens.hs + bench/Main.hs + test/Main.hs + test/Katip/Tests.hs + test/Katip/Tests/Scribes/Handle.hs + test/Katip/Tests/Scribes/Handle-text.golden + test/Katip/Tests/Format/Time.hs +tested-with: GHC == 8.0.1, GHC == 8.2.2, GHC == 8.4.3 + +source-repository head + type: git + location: https://github.com/Soostone/katip.git + +flag lib-Werror + default: False + manual: True + +library + exposed-modules: + Katip + Katip.Core + Katip.Format.Time + Katip.Monadic + Katip.Scribes.Handle + + default-extensions: + DeriveGeneric + FlexibleContexts + GeneralizedNewtypeDeriving + MultiParamTypeClasses + RankNTypes + RecordWildCards + TemplateHaskell + OverloadedStrings + + build-depends: base >=4.9.0.0 && <5 + , aeson >=0.6 + , async >=2.1.0 && < 3.0.0.0 + , auto-update >= 0.1 + , bytestring >= 0.9 + , containers >=0.4 + , either >= 4 + , safe-exceptions >= 0.1.0.0 + , hostname >=1.0 + , old-locale >= 1.0 + , string-conv >= 0.1 + , template-haskell >= 2.8 + , text >= 1.2.4.0 && <1.3 + , time >= 1 + , transformers >= 0.3 + , transformers-compat + , unordered-containers >= 0.2 + , monad-control >= 1.0 + , mtl >= 2.0 + , transformers-base >= 0.3 + , resourcet >= 1.2.0 + , scientific >= 0.3.3.0 + , microlens >= 0.2.0.0 + , microlens-th >= 0.1.0.0 + , semigroups + , unliftio-core >= 0.1 + , stm >= 2.4.4.1 + + hs-source-dirs: src + default-language: Haskell2010 + ghc-options: -Wall + if flag(lib-Werror) + ghc-options: -Werror + if os(windows) + build-depends: Win32 >=2.3 && <2.9 + exposed-modules: Katip.Compat + else + build-depends: unix >= 2.5 && <2.8 + + +test-suite test + type: exitcode-stdio-1.0 + main-is: Main.hs + hs-source-dirs: test + other-modules: + Katip.Tests.Format.Time + Katip.Tests.Scribes.Handle + Katip.Tests + default-language: Haskell2010 + build-depends: base + , katip + , aeson + , bytestring + , tasty >= 0.10.1.2 + , tasty-golden + , tasty-hunit + , tasty-quickcheck + , quickcheck-instances + , template-haskell + , text + , time + , time-locale-compat >= 0.1.0.1 + , directory + , regex-tdfa + , unordered-containers + , microlens + , containers + , stm + , safe-exceptions + ghc-options: -Wall + if flag(lib-Werror) + ghc-options: -Werror + + +benchmark bench + type: exitcode-stdio-1.0 + main-is: Main.hs + hs-source-dirs: bench + default-language: Haskell2010 + ghc-options: -O2 -Wall -threaded -rtsopts -with-rtsopts=-N + if flag(lib-Werror) + ghc-options: -Werror + build-depends: + base + , aeson + , blaze-builder + , katip + , criterion >= 1.1.0.0 + , unix + , text + , time + , transformers + , deepseq + , async + , filepath + , safe-exceptions + , directory From c3cd0f5c7f2117e7e5ffb54480f525a7fb9b00d8dbe2634f8c47bb4f2df0eb9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Feb 2022 02:02:19 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-katip revision:11, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-katip?expand=0&rev=9 --- ghc-katip.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-katip.changes b/ghc-katip.changes index a669d98..8891a82 100644 --- a/ghc-katip.changes +++ b/ghc-katip.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Feb 4 12:15:25 UTC 2022 - psimons@suse.com +Wed Jan 19 07:31:48 UTC 2022 - Peter Simons - Update katip to version 0.8.7.0 revision 1. Upstream has revised the Cabal build instructions on Hackage.