From bc5c683f035767d82b4643454cb4e703e173856e31c24dcf60e34042157fab45 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 10 Feb 2022 14:36:53 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-mustache revision:14, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-mustache?expand=0&rev=50 --- ghc-mustache.changes | 12 ++++ ghc-mustache.spec | 7 +-- mustache-2.3.1.tar.gz | 3 - mustache-2.4.0.tar.gz | 3 + mustache.cabal | 138 ------------------------------------------ 5 files changed, 17 insertions(+), 146 deletions(-) delete mode 100644 mustache-2.3.1.tar.gz create mode 100644 mustache-2.4.0.tar.gz delete mode 100644 mustache.cabal diff --git a/ghc-mustache.changes b/ghc-mustache.changes index 94917a5..16bddb0 100644 --- a/ghc-mustache.changes +++ b/ghc-mustache.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Feb 4 12:15:18 UTC 2022 - psimons@suse.com + +- Update mustache to version 2.4.0. + ## v2.4.0 + + - Support for aeson 2 + + ## v2.3.2 + + - Added support for GHC 9.0.1 + ------------------------------------------------------------------- Tue Oct 12 10:51:15 UTC 2021 - psimons@suse.com diff --git a/ghc-mustache.spec b/ghc-mustache.spec index bb05458..b02a909 100644 --- a/ghc-mustache.spec +++ b/ghc-mustache.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-mustache # -# 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 @@ -19,13 +19,12 @@ %global pkg_name mustache %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.3.1 +Version: 2.4.0 Release: 0 Summary: A mustache template parser library 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: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel @@ -33,7 +32,6 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-cmdargs-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel -BuildRequires: ghc-either-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-parsec-devel @@ -77,7 +75,6 @@ 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/mustache-2.3.1.tar.gz b/mustache-2.3.1.tar.gz deleted file mode 100644 index 0a362d3..0000000 --- a/mustache-2.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac8bf93d36fc766f54a54b72ddf71d1ab90864ca86bdce3415d2e69823fdb348 -size 20207 diff --git a/mustache-2.4.0.tar.gz b/mustache-2.4.0.tar.gz new file mode 100644 index 0000000..896c635 --- /dev/null +++ b/mustache-2.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9634b6e405ade382d8f5664f5115b799cce68f818b8b40c5a4a9741f98e3eb3c +size 20434 diff --git a/mustache.cabal b/mustache.cabal deleted file mode 100644 index 0728aa5..0000000 --- a/mustache.cabal +++ /dev/null @@ -1,138 +0,0 @@ -cabal-version: 1.12 - --- This file has been generated from package.yaml by hpack version 0.31.2. --- --- see: https://github.com/sol/hpack --- --- hash: 8ffde004ee64f5b057ed66f76bbc72cbb71cdc81dcebe9e822563fdb11a8b338 - -name: mustache -version: 2.3.1 -x-revision: 1 -synopsis: A mustache template parser library. -description: Allows parsing and rendering template files with mustache markup. See the - mustache . - . - Implements the mustache spec version 1.1.3. - . - /Note/: Versions including and beyond 0.4 are compatible with ghc 7.8 again. -category: Development -homepage: https://github.com/JustusAdam/mustache -bug-reports: https://github.com/JustusAdam/mustache/issues -author: Justus Adam -maintainer: dev@justus.science -copyright: (c) 2015 - 2019 Justus Adam -license: BSD3 -license-file: LICENSE -tested-with: GHC>=7.8 && <=7.10.2 -build-type: Simple -extra-source-files: - README.md - CHANGELOG.md - test/unit/examples/test-template-partials.txt.mustache - test/unit/examples/test-template.txt.mustache - test/unit/examples/partials/test-partial.txt.mustache - -source-repository head - type: git - location: git://github.com/JustusAdam/mustache.git - -library - build-depends: aeson <1.6 - - hs-source-dirs: - src - default-extensions: LambdaCase TupleSections - other-extensions: NamedFieldPuns OverloadedStrings LambdaCase TupleSections TemplateHaskell QuasiQuotes - ghc-options: -Wall - build-depends: - aeson - , base >=4.7 && <5 - , bytestring - , containers - , directory - , either - , filepath - , mtl >=2.2.1 - , parsec - , scientific - , template-haskell - , text - , th-lift - , unordered-containers - , vector - exposed-modules: - Text.Mustache - Text.Mustache.Types - Text.Mustache.Parser - Text.Mustache.Compile - Text.Mustache.Render - other-modules: - Text.Mustache.Internal - Text.Mustache.Internal.Types - Paths_mustache - default-language: Haskell2010 - -executable haskell-mustache - main-is: Main.hs - other-modules: - Paths_mustache - hs-source-dirs: - app - ghc-options: -threaded -Wall - build-depends: - aeson - , base >=4.7 && <5 - , bytestring - , cmdargs - , filepath - , mustache - , text - , yaml - default-language: Haskell2010 - -test-suite language-specifications - type: exitcode-stdio-1.0 - main-is: Language.hs - other-modules: - Paths_mustache - hs-source-dirs: - test/integration - build-depends: - aeson - , base >=4.7 && <5 - , base-unicode-symbols - , bytestring - , filepath - , hspec - , lens - , mustache - , tar - , text - , unordered-containers - , wreq - , yaml - , zlib - default-language: Haskell2010 - -test-suite unit-tests - type: exitcode-stdio-1.0 - main-is: Spec.hs - other-modules: - Paths_mustache - hs-source-dirs: - test/unit - build-depends: - aeson - , base >=4.7 && <5 - , bytestring - , directory - , filepath - , hspec - , mustache - , process - , temporary - , text - , unordered-containers - , yaml - default-language: Haskell2010 From 2b55a01933c06e6f4bf53c8905200819c5a62f375119c757825e361f7bf58bb9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Feb 2022 02:02:25 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-mustache revision:15, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-mustache?expand=0&rev=51 --- ghc-mustache.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-mustache.changes b/ghc-mustache.changes index 16bddb0..df6883c 100644 --- a/ghc-mustache.changes +++ b/ghc-mustache.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Feb 4 12:15:18 UTC 2022 - psimons@suse.com +Sun Jan 30 19:32:49 UTC 2022 - Peter Simons - Update mustache to version 2.4.0. ## v2.4.0