August 2022 - openSUSE Commits - openSUSE Mailing Lists

commit pandoc for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pandoc for openSUSE:Factory checked in at 2022-08-01 21:31:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pandoc (Old) and /work/SRC/openSUSE:Factory/.pandoc.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pandoc" Mon Aug 1 21:31:05 2022 rev:67 rq:987127 version:2.18 Changes: -------- --- /work/SRC/openSUSE:Factory/pandoc/pandoc.changes 2022-04-30 00:46:25.658997699 +0200 +++ /work/SRC/openSUSE:Factory/.pandoc.new.1533/pandoc.changes 2022-08-01 21:31:47.885897308 +0200 @@ -2 +2 @@ -Sun Mar 20 17:18:29 UTC 2022 - K��vin Le Gouguec <kevin.legouguec(a)gmail.com> +Mon Apr 4 18:03:11 UTC 2022 - Peter Simons <psimons(a)suse.com> @@ -4 +4,355 @@ -- Include manpage in distribution. +- Update pandoc to version 2.18. + ## pandoc 2.18 (2022-04-22) + + * New input formats: `endnotexml` (EndNote XML bibliography), + `ris` (RIS bibliography). + + * A RIS bibliography file may now be used with `--citeproc`. + + * Citeproc: Allow a formatted bibliography to be placed in metadata fields + via a Div with class `refs` (#7969, #526). Thus, one can include a + metadata field, say `refs`, whose content is an + empty div with id `refs`, and the formatted bibliography will be put into + this metadata field. It may then be interpolated into a template using the + variable `refs`. + + * Ensure that you don't get PDF output to terminal. `-t pdf` now behaves + like `-t docx` and gives an error unless the output is redirected. + + * `--version` now prints hslua version (#7929) and + Lua version (#7997, Albert Krewinkel). + + * Change `--metadata-file` parsing so that, when the input format is not + markdown or a markdown variant, pandoc's markdown is used (#6832, #7926). + When the input format is a markdown variant, the same format is used. + Reason for the change: it doesn't make sense to run the markdown parser + with a set of extensions designed for a non-markdown format, and + this dramatically limits what people can do in metadata files. + + * Trim whitespace from math in `--webtex` (#7892). + This fixes problems with --webtex and markdown output, + when display math starts or ends with a newline. + + * New exported module Text.Pandoc.Readers.EndNote, exporting + `readEndNoteXML`, `readEndNoteXMLCitation`, + and `readEndNoteXMLReferences`. [API change] + + * `--self-contained`: issue warning rather than failing with an error + if a resource can't be found (#7904). + + * New exported module, Text.Pandoc.Readers.RIS, exporting `readRIS` (#7894). + + * LaTeX reader: + + + Handle subequations as inline math environment (#7883). + + Rudimentary support for `vbox` (#7939). + + Support `\today` (#7905). + + Handle `\label` and `\ref` for footnotes (#7930). + + Allow inline groups starting with `\bgroup` (#7953). + + Use custom TokStream that keeps track of whether macros are expanded. + This allows us to improve performance a bit by avoiding unnecessary + runs of the macro expansion code (e.g. from 24 ms to 20 ms on + our standard benchmark). + + Further optimizations for inline parsing. + + Better handling of `\usepackage`. If the package is local but + causes parse errors, parse everything up to the error and skip the + rest. Issue a `CouldNotParseIncludeFile` warning indicating that + parsing failed at that point. + + Text.Pandoc.Readers.LaTeX.Parsing: Monoid and Semigroup instances for + TokStream. + + * HTML reader: + + + Give warnings and emit empty note when parsing + `<a epub:type="noteref">` and the identifier + doesn't correspond to anything in the note table (#7884). + Previously we just silently skipped these cases. + + Fix parsing of epub footnotes (#7884). + + * DocBook reader: + + + Handle complete set of entities as specified at + <https://www.w3.org/2003/entities/2007doc/byalpha.html> (#7938). + + Handle abstract in info section (#7747). + + Improve info parsing. + + Simplify metadata parsing code (#7747). + Handle abstract as block-level content. + Report skipped info elements with `--verbose`. + + Handle address and coyright in metadata (#7747). + + * DokuWiki reader: + + + Add DokuWiki table alignment (#5202, damon-sava-stanley). + + * RST reader: + + + Fix treatment of headerless simple tables (#7902). + + Wrap math in Span to preserve attributes (#7998, Albert Krewinkel). + Math elements with a name, classes, or other fields are wrapped in a + `Span` with these attributes. + + * JATS reader: + + + Improve handling of fn-group elements (#6348, Albert Krewinkel). + Footnotes in `<fn-group>` elements are collected and re-inserted into + the document as proper footnotes in the place where they are referenced. + + Handle `pub-date` (#8000). + + Support PMID, DOI, issue in citations (#7995). + + Improve refs parsing. Handle `issn` and `isbn`; use simpler form + for issued date. + + Strip 'ref-' from ref id in constructing CSL id. This allows better + round-tripping, because the JATS writer adds the `ref-` prefix to + the citation id to get the ref element's id. + + * Org reader: + + + Allow ":" in property drawer keys (Lucas V. R). + Any non-space character is allowed as property drawer key, including ":" + itself (so it is not really a delimiter). The real delimiter is a space + character, so in a drawer like + ``` + :PROPERTIES: + ::k:ey:: value + :END: + ``` + ":k:ey:" is a key with value "value". + + + Allow comments above property drawer. + + More flexible LaTeX environments (Lucas V. R). + + Handle `#+bibliography:` as metadata so that it can work with + `--citeproc`. + + Parse `#+print_bibliography:` as Div with id `refs`. + + Allow multiple `#+bibliography:`. + + * Markdown reader: + + + Allow one-column pipe tables with pipe on right (#7919). + + Remove restriction on identifiers, so they no longer need to + begin with a letter (#7920). + + * Docx reader: + + + Enable `citations` extension for docx reader (#7840). + When enabled, Zotero, Mendeley, and EndNote citations embedded in + a docx are parsed as native pandoc citations. + (When disabled, the generated citation + text and bibliography are passed through as regular text.) + The bibliography generated by the plugin is suppressed. + Instead, bibliographic data embedded in citation items is added + to the `references` metadata field so that it can be used + with `--citeproc`. + + * Docbook writer: + + + Interpret links without contents as cross-references (#7360, Jan Tojnar). + Links without text contents are converted to `<xref>` elements. DocBook + processors will generate appropriate cross-reference text when presented + with an xref element. + + * Docx writer: + + + Single numbering ID for examples (#7895, mjfs). + This change ensures that example list items all belong to a single + number sequence, so that if items are added or deleted in a word + processor, the other items will renumber automatically. + + Add bookmark with table id to table (#7989, Nikolai + Korobeinikov, #7285). This allows tables with ids to be linked to. + + * Ipynb writer: + + + Handle metadata better (#7928). Previously we used the markdown + writer to render metadata. This had some undesirable consequences + (e.g. en dash expanded to `--` when `smart` enabled), so now we use + the plain writer. + + * LaTeX writer: + + + Avoid extra space before `\CSLRightInline` (#7932). + + Add `scrreport` to `chaptersClasses` (#6168, ivardb). + + Support `page`,`trim`,`clip` attributes on images (#7181). + + Add `()` after booktabs rules (#8001). These commands take optional + arguments with () and [], which can lead to problems if the content + of the table cell begins with these characters. + + * RST writer: + + + Support all standard metadata ("bibliographic") fields. + + * HTML writer: performance improvements. + + * Org writer: + + + Stop indenting property drawers, quote blocks + (#3245, Albert Krewinkel). This follows the current default org-mode + behavior. + + * Markdown writer: + + + Move table-related code into submodule (Albert Krewinkel). + + Don't produce redundant header identifier when the + `gfm_auto_identifiers` extension is set (#7941). + + Update escaping rules for `\`. We now escape `\` only if `raw_tex` + is enabled or it is followed by a non-alphanumeric. + ++++ 162 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/pandoc/pandoc.changes ++++ and /work/SRC/openSUSE:Factory/.pandoc.new.1533/pandoc.changes Old: ---- pandoc-2.17.1.1.tar.gz New: ---- pandoc-2.18.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pandoc.spec ++++++ --- /var/tmp/diff_new_pack.hHvMsz/_old 2022-08-01 21:31:48.593899339 +0200 +++ /var/tmp/diff_new_pack.hHvMsz/_new 2022-08-01 21:31:48.605899373 +0200 @@ -1,5 +1,5 @@ # -# spec file +# spec file for package pandoc # # Copyright (c) 2022 SUSE LLC # @@ -19,7 +19,7 @@ %global pkg_name pandoc %bcond_with tests Name: %{pkg_name} -Version: 2.17.1.1 +Version: 2.18 Release: 0 Summary: Conversion between markup formats License: GPL-2.0-or-later @@ -57,9 +57,8 @@ BuildRequires: ghc-file-embed-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-haddock-library-devel -BuildRequires: ghc-hslua-aeson-devel BuildRequires: ghc-hslua-devel -BuildRequires: ghc-hslua-marshalling-devel +BuildRequires: ghc-hslua-module-doclayout-devel BuildRequires: ghc-hslua-module-path-devel BuildRequires: ghc-hslua-module-system-devel BuildRequires: ghc-hslua-module-text-devel @@ -98,6 +97,7 @@ BuildRequires: ghc-unix-devel BuildRequires: ghc-xml-conduit-devel BuildRequires: ghc-xml-devel +BuildRequires: ghc-xml-types-devel BuildRequires: ghc-yaml-devel BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel @@ -144,7 +144,7 @@ Requires: ghc-%{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} -Requires(postun):ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} %description -n ghc-%{name}-devel This package provides the Haskell %{name} library development files. @@ -160,7 +160,6 @@ %ghc_fix_rpath %{pkg_name}-%{version} # Link duplicate template files %fdupes %{buildroot}%{_datadir}/%{pkg_name}-%{version}/data/templates/ -install -D -m 644 man/%{name}.1 %buildroot/%_mandir/man1/%name.1 %check %cabal_test @@ -174,7 +173,6 @@ %files %license COPYING.md %doc AUTHORS.md README.md changelog.md -%_mandir/man1/%name.1%{?ext_man} %{_bindir}/%{name} %dir %{_datadir}/%{name}-%{version} %dir %{_datadir}/%{name}-%{version}/citeproc @@ -217,6 +215,7 @@ %{_datadir}/%{name}-%{version}/data/bash_completion.tpl %{_datadir}/%{name}-%{version}/data/creole.lua %{_datadir}/%{name}-%{version}/data/default.csl +%{_datadir}/%{name}-%{version}/data/docbook-entities.txt %{_datadir}/%{name}-%{version}/data/docx/?Content_Types?.xml %{_datadir}/%{name}-%{version}/data/docx/_rels/.rels %{_datadir}/%{name}-%{version}/data/docx/docProps/app.xml ++++++ pandoc-2.17.1.1.tar.gz -> pandoc-2.18.tar.gz ++++++ /work/SRC/openSUSE:Factory/pandoc/pandoc-2.17.1.1.tar.gz /work/SRC/openSUSE:Factory/.pandoc.new.1533/pandoc-2.18.tar.gz differ: char 15, line 1

1 0

commit hspec-discover for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hspec-discover for openSUSE:Factory checked in at 2022-08-01 21:31:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hspec-discover (Old) and /work/SRC/openSUSE:Factory/.hspec-discover.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hspec-discover" Mon Aug 1 21:31:04 2022 rev:23 rq:987126 version:2.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/hspec-discover/hspec-discover.changes 2022-02-11 23:10:08.239072272 +0100 +++ /work/SRC/openSUSE:Factory/.hspec-discover.new.1533/hspec-discover.changes 2022-08-01 21:31:44.581887829 +0200 @@ -1,0 +2,12 @@ +Thu May 12 12:41:39 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update hspec-discover to version 2.10.0. + Upstream does not provide a change log file. + +------------------------------------------------------------------- +Fri Apr 1 14:02:36 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update hspec-discover to version 2.9.5. + Upstream does not provide a change log file. + +------------------------------------------------------------------- Old: ---- hspec-discover-2.9.4.tar.gz New: ---- hspec-discover-2.10.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hspec-discover.spec ++++++ --- /var/tmp/diff_new_pack.JI510b/_old 2022-08-01 21:31:46.753894060 +0200 +++ /var/tmp/diff_new_pack.JI510b/_new 2022-08-01 21:31:46.757894071 +0200 @@ -1,7 +1,7 @@ # # spec file for package hspec-discover # -# 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,7 +19,7 @@ %global pkg_name hspec-discover %bcond_with tests Name: %{pkg_name} -Version: 2.9.4 +Version: 2.10.0 Release: 0 Summary: Automatically discover and run Hspec tests License: MIT ++++++ hspec-discover-2.9.4.tar.gz -> hspec-discover-2.10.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hspec-discover-2.9.4/LICENSE new/hspec-discover-2.10.0/LICENSE --- old/hspec-discover-2.9.4/LICENSE 2001-09-09 03:46:40.000000000 +0200 +++ new/hspec-discover-2.10.0/LICENSE 2001-09-09 03:46:40.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright (c) 2012-2021 Simon Hengel <sol(a)typeful.net> +Copyright (c) 2012-2022 Simon Hengel <sol(a)typeful.net> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hspec-discover-2.9.4/hspec-discover.cabal new/hspec-discover-2.10.0/hspec-discover.cabal --- old/hspec-discover-2.9.4/hspec-discover.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/hspec-discover-2.10.0/hspec-discover.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,14 +1,14 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.6. +-- This file has been generated from package.yaml by hpack version 0.35.0. -- -- see: https://github.com/sol/hpack name: hspec-discover -version: 2.9.4 +version: 2.10.0 license: MIT license-file: LICENSE -copyright: (c) 2012-2021 Simon Hengel +copyright: (c) 2012-2022 Simon Hengel author: Simon Hengel <sol(a)typeful.net> maintainer: Simon Hengel <sol(a)typeful.net> build-type: Simple diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hspec-discover-2.9.4/version.yaml new/hspec-discover-2.10.0/version.yaml --- old/hspec-discover-2.9.4/version.yaml 2001-09-09 03:46:40.000000000 +0200 +++ new/hspec-discover-2.10.0/version.yaml 2001-09-09 03:46:40.000000000 +0200 @@ -1 +1 @@ -&version 2.9.4 +&version 2.10.0

1 0

commit hpack for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hpack for openSUSE:Factory checked in at 2022-08-01 21:31:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hpack (Old) and /work/SRC/openSUSE:Factory/.hpack.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hpack" Mon Aug 1 21:31:03 2022 rev:25 rq:987125 version:0.35.0 Changes: -------- --- /work/SRC/openSUSE:Factory/hpack/hpack.changes 2022-02-11 23:10:07.459070016 +0100 +++ /work/SRC/openSUSE:Factory/.hpack.new.1533/hpack.changes 2022-08-01 21:31:41.873880059 +0200 @@ -1,0 +2,19 @@ +Sun Apr 24 00:26:04 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update hpack to version 0.35.0. + ## Changes in 0.35.0 + - Add support for `language` (thanks @mpilgrem) + - Accept Cabal names for fields where Hpack and Cabal use different + terminology, but still warn (e.g. accept `hs-source-dirs` as an alias for + `source-dirs`) + +------------------------------------------------------------------- +Mon Mar 28 15:12:50 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update hpack to version 0.34.7. + ## Changes in 0.34.7 + - Support `Cabal-3.6.*` + - Make sure that verbatim `import` fields are rendered at the beginning of + a section (see #486) + +------------------------------------------------------------------- Old: ---- hpack-0.34.6.tar.gz New: ---- hpack-0.35.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hpack.spec ++++++ --- /var/tmp/diff_new_pack.jT3hWA/_old 2022-08-01 21:31:43.893885855 +0200 +++ /var/tmp/diff_new_pack.jT3hWA/_new 2022-08-01 21:31:43.897885866 +0200 @@ -1,7 +1,7 @@ # # spec file for package hpack # -# 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,7 +19,7 @@ %global pkg_name hpack %bcond_with tests Name: %{pkg_name} -Version: 0.34.6 +Version: 0.35.0 Release: 0 Summary: A modern format for Haskell packages License: MIT ++++++ hpack-0.34.6.tar.gz -> hpack-0.35.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hpack-0.34.6/CHANGELOG.md new/hpack-0.35.0/CHANGELOG.md --- old/hpack-0.34.6/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/hpack-0.35.0/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,14 @@ +## Changes in 0.35.0 + - Add support for `language` (thanks @mpilgrem) + - Accept Cabal names for fields where Hpack and Cabal use different + terminology, but still warn (e.g. accept `hs-source-dirs` as an alias for + `source-dirs`) + +## Changes in 0.34.7 + - Support `Cabal-3.6.*` + - Make sure that verbatim `import` fields are rendered at the beginning of + a section (see #486) + ## Changes in 0.34.6 - Add `Paths_` module to `autogen-modules` when `cabal-version >= 2` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hpack-0.34.6/hpack.cabal new/hpack-0.35.0/hpack.cabal --- old/hpack-0.34.6/hpack.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/hpack-0.35.0/hpack.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,11 +1,11 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.5. +-- This file has been generated from package.yaml by hpack version 0.34.7. -- -- see: https://github.com/sol/hpack name: hpack -version: 0.34.6 +version: 0.35.0 synopsis: A modern format for Haskell packages description: See README at <https://github.com/sol/hpack#readme> category: Development @@ -25,9 +25,9 @@ library hs-source-dirs: src - ghc-options: -Wall + ghc-options: -Wall -fno-warn-incomplete-uni-patterns build-depends: - Cabal >=3.0.0.0 && <3.6 + Cabal >=3.0.0.0 && <3.7 , Glob >=0.9.0 , aeson >=1.4.3.0 , base >=4.9 && <5 @@ -86,9 +86,9 @@ main-is: Main.hs hs-source-dirs: driver - ghc-options: -Wall + ghc-options: -Wall -fno-warn-incomplete-uni-patterns build-depends: - Cabal >=3.0.0.0 && <3.6 + Cabal >=3.0.0.0 && <3.7 , Glob >=0.9.0 , aeson >=1.4.3.0 , base >=4.9 && <5 @@ -121,10 +121,10 @@ hs-source-dirs: test src - ghc-options: -Wall + ghc-options: -Wall -fno-warn-incomplete-uni-patterns cpp-options: -DTEST build-depends: - Cabal >=3.0.0.0 && <3.6 + Cabal >=3.0.0.0 && <3.7 , Glob >=0.9.0 , HUnit >=1.6.0.0 , QuickCheck diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hpack-0.34.6/src/Data/Aeson/Config/FromValue.hs new/hpack-0.35.0/src/Data/Aeson/Config/FromValue.hs --- old/hpack-0.34.6/src/Data/Aeson/Config/FromValue.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/hpack-0.35.0/src/Data/Aeson/Config/FromValue.hs 2001-09-09 03:46:40.000000000 +0200 @@ -6,8 +6,11 @@ {-# LANGUAGE TypeOperators #-} {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE RecordWildCards #-} - {-# LANGUAGE ConstraintKinds #-} +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE TypeApplications #-} +{-# LANGUAGE DeriveFunctor #-} module Data.Aeson.Config.FromValue ( FromValue(..) , Parser @@ -38,17 +41,24 @@ , Value(..) , Object , Array + +, Alias(..) +, unAlias ) where import Imports +import Data.Monoid (Last(..)) import GHC.Generics +import GHC.TypeLits +import Data.Proxy import Data.Map.Lazy (Map) import qualified Data.Map.Lazy as Map import qualified Data.Vector as V import Data.Aeson.Config.Key (Key) import qualified Data.Aeson.Config.Key as Key +import Data.Aeson.Config.KeyMap (member) import qualified Data.Aeson.Config.KeyMap as KeyMap import Data.Aeson.Types (FromJSON(..)) @@ -56,7 +66,7 @@ import Data.Aeson.Config.Util import Data.Aeson.Config.Parser -type Result a = Either String (a, [String]) +type Result a = Either String (a, [String], [(String, String)]) decodeValue :: FromValue a => Value -> Result a decodeValue = runParser fromValue @@ -137,13 +147,49 @@ instance (GenericDecode a, GenericDecode b) => GenericDecode (a :*: b) where genericDecode opts o = (:*:) <$> genericDecode opts o <*> genericDecode opts o -instance (Selector sel, FromValue a) => GenericDecode (S1 sel (Rec0 a)) where +type RecordField sel a = S1 sel (Rec0 a) + +instance (Selector sel, FromValue a) => GenericDecode (RecordField sel a) where genericDecode = accessFieldWith (.:) -instance {-# OVERLAPPING #-} (Selector sel, FromValue a) => GenericDecode (S1 sel (Rec0 (Maybe a))) where +instance {-# OVERLAPPING #-} (Selector sel, FromValue a) => GenericDecode (RecordField sel (Maybe a)) where genericDecode = accessFieldWith (.:?) -accessFieldWith :: forall sel a p. Selector sel => (Object -> Key -> Parser a) -> Options -> Value -> Parser (S1 sel (Rec0 a) p) +instance {-# OVERLAPPING #-} (Selector sel, FromValue a) => GenericDecode (RecordField sel (Last a)) where + genericDecode = accessFieldWith (\ value key -> Last <$> (value .:? key)) + +instance {-# OVERLAPPING #-} (Selector sel, FromValue a, KnownBool deprecated, KnownSymbol alias) => GenericDecode (RecordField sel (Alias deprecated alias (Maybe a))) where + genericDecode = accessFieldWith (\ value key -> aliasAccess (.:?) value (Alias key)) + +instance {-# OVERLAPPING #-} (Selector sel, FromValue a, KnownBool deprecated, KnownSymbol alias) => GenericDecode (RecordField sel (Alias deprecated alias (Last a))) where + genericDecode = accessFieldWith (\ value key -> fmap Last <$> aliasAccess (.:?) value (Alias key)) + +aliasAccess :: forall deprecated alias a. (KnownBool deprecated, KnownSymbol alias) => (Object -> Key -> Parser a) -> Object -> (Alias deprecated alias Key) -> Parser (Alias deprecated alias a) +aliasAccess op value (Alias key) + | alias `member` value && not (key `member` value) = Alias <$> value `op` alias <* deprecated + | otherwise = Alias <$> value `op` key + where + deprecated = case boolVal (Proxy @deprecated) of + False -> return () + True -> markDeprecated alias key + alias = Key.fromString (symbolVal $ Proxy @alias) + +accessFieldWith :: forall sel a p. Selector sel => (Object -> Key -> Parser a) -> Options -> Value -> Parser (RecordField sel a p) accessFieldWith op Options{..} v = M1 . K1 <$> withObject (`op` Key.fromString label) v where - label = optionsRecordSelectorModifier $ selName (undefined :: S1 sel (Rec0 a) p) + label = optionsRecordSelectorModifier $ selName (undefined :: RecordField sel a p) + +newtype Alias (deprecated :: Bool) (alias :: Symbol) a = Alias a + deriving (Show, Eq, Semigroup, Monoid, Functor) + +unAlias :: Alias deprecated alias a -> a +unAlias (Alias a) = a + +class KnownBool (a :: Bool) where + boolVal :: Proxy a -> Bool + +instance KnownBool 'True where + boolVal _ = True + +instance KnownBool 'False where + boolVal _ = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hpack-0.34.6/src/Data/Aeson/Config/Parser.hs new/hpack-0.35.0/src/Data/Aeson/Config/Parser.hs --- old/hpack-0.34.6/src/Data/Aeson/Config/Parser.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/hpack-0.35.0/src/Data/Aeson/Config/Parser.hs 2001-09-09 03:46:40.000000000 +0200 @@ -28,6 +28,8 @@ , fromAesonPath , formatPath + +, markDeprecated ) where import Imports @@ -56,6 +58,9 @@ type JSONPath = [JSONPathElement] +data Path = Consumed JSONPath | Deprecated JSONPath JSONPath + deriving (Eq, Ord, Show) + fromAesonPath :: Aeson.JSONPath -> JSONPath fromAesonPath = reverse . map fromAesonPathElement @@ -64,16 +69,16 @@ Aeson.Key k -> Key (Key.toText k) Aeson.Index n -> Index n -newtype Parser a = Parser {unParser :: WriterT (Set JSONPath) Aeson.Parser a} +newtype Parser a = Parser {unParser :: WriterT (Set Path) Aeson.Parser a} deriving (Functor, Applicative, Alternative, Monad, Fail.MonadFail) liftParser :: Aeson.Parser a -> Parser a liftParser = Parser . lift -runParser :: (Value -> Parser a) -> Value -> Either String (a, [String]) +runParser :: (Value -> Parser a) -> Value -> Either String (a, [String], [(String, String)]) runParser p v = case iparse (runWriterT . unParser <$> p) v of IError path err -> Left ("Error while parsing " ++ formatPath (fromAesonPath path) ++ " - " ++ err) - ISuccess (a, consumed) -> Right (a, map formatPath (determineUnconsumed consumed v)) + ISuccess (a, paths) -> Right (a, map formatPath (determineUnconsumed paths v), [(formatPath name, formatPath substitute) | Deprecated name substitute <- Set.toList paths]) formatPath :: JSONPath -> String formatPath = go "$" . reverse @@ -84,12 +89,12 @@ Index n : xs -> go (acc ++ "[" ++ show n ++ "]") xs Key key : xs -> go (acc ++ "." ++ T.unpack key) xs -determineUnconsumed :: Set JSONPath -> Value -> [JSONPath] -determineUnconsumed ((<> Set.singleton []) -> consumed) = Set.toList . execWriter . go [] +determineUnconsumed :: Set Path -> Value -> [JSONPath] +determineUnconsumed ((<> Set.singleton (Consumed [])) -> consumed) = Set.toList . execWriter . go [] where go :: JSONPath -> Value -> Writer (Set JSONPath) () go path value - | path `notMember` consumed = tell (Set.singleton path) + | Consumed path `notMember` consumed = tell (Set.singleton path) | otherwise = case value of Number _ -> return () String _ -> return () @@ -110,7 +115,12 @@ markConsumed :: JSONPathElement -> Parser () markConsumed e = do path <- getPath - Parser $ tell (Set.singleton $ e : path) + Parser $ tell (Set.singleton . Consumed $ e : path) + +markDeprecated :: Key -> Key -> Parser () +markDeprecated (Key.toText -> name) (Key.toText -> substitute) = do + path <- getPath + Parser $ tell (Set.singleton $ Deprecated (Key name : path) (Key substitute : path)) getPath :: Parser JSONPath getPath = liftParser $ Aeson.parserCatchError empty $ \ path _ -> return (fromAesonPath path) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hpack-0.34.6/src/Hpack/Config.hs new/hpack-0.35.0/src/Hpack/Config.hs --- old/hpack-0.34.6/src/Hpack/Config.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/hpack-0.35.0/src/Hpack/Config.hs 2001-09-09 03:46:40.000000000 +0200 @@ -13,6 +13,7 @@ {-# LANGUAGE ViewPatterns #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE DataKinds #-} module Hpack.Config ( -- | /__NOTE:__/ This module is exposed to allow integration of Hpack into -- other tools. It is not meant for general use by end users. The following @@ -59,6 +60,7 @@ , Cond(..) , Flag(..) , SourceRepository(..) +, Language(..) , BuildType(..) , GhcProfOption , GhcjsOption @@ -88,6 +90,7 @@ import qualified Data.Map.Lazy as Map import qualified Data.Aeson.Config.KeyMap as KeyMap import Data.Maybe +import Data.Monoid (Last(..)) import Data.Ord import qualified Data.Text as T import Data.Text.Encoding (decodeUtf8) @@ -185,7 +188,7 @@ deps xs = [(name, info) | (name, info) <- (Map.toList . unDependencies . sectionDependencies) xs] section :: a -> Section a -section a = Section a [] mempty [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] Nothing [] mempty mempty [] +section a = Section a [] mempty [] [] [] Nothing [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] [] Nothing [] mempty mempty [] packageConfig :: FilePath packageConfig = "package.yaml" @@ -222,18 +225,18 @@ } data ExecutableSection = ExecutableSection { - executableSectionMain :: Maybe FilePath + executableSectionMain :: Alias 'True "main-is" (Last FilePath) , executableSectionOtherModules :: Maybe (List Module) , executableSectionGeneratedOtherModules :: Maybe (List Module) } deriving (Eq, Show, Generic, FromValue) instance Monoid ExecutableSection where - mempty = ExecutableSection Nothing Nothing Nothing + mempty = ExecutableSection mempty Nothing Nothing mappend = (<>) instance Semigroup ExecutableSection where a <> b = ExecutableSection { - executableSectionMain = executableSectionMain b <|> executableSectionMain a + executableSectionMain = executableSectionMain a <> executableSectionMain b , executableSectionOtherModules = executableSectionOtherModules a <> executableSectionOtherModules b , executableSectionGeneratedOtherModules = executableSectionGeneratedOtherModules a <> executableSectionGeneratedOtherModules b } @@ -266,11 +269,12 @@ _ -> typeMismatch (formatOrList ["String", "Object"]) v data CommonOptions cSources cxxSources jsSources a = CommonOptions { - commonOptionsSourceDirs :: Maybe (List FilePath) -, commonOptionsDependencies :: Maybe Dependencies -, commonOptionsPkgConfigDependencies :: Maybe (List String) + commonOptionsSourceDirs :: Alias 'True "hs-source-dirs" (Maybe (List FilePath)) +, commonOptionsDependencies :: Alias 'True "build-depends" (Maybe Dependencies) +, commonOptionsPkgConfigDependencies :: Alias 'False "pkgconfig-depends" (Maybe (List String)) , commonOptionsDefaultExtensions :: Maybe (List String) , commonOptionsOtherExtensions :: Maybe (List String) +, commonOptionsLanguage :: Alias 'True "default-language" (Last (Maybe Language)) , commonOptionsGhcOptions :: Maybe (List GhcOption) , commonOptionsGhcProfOptions :: Maybe (List GhcProfOption) , commonOptionsGhcjsOptions :: Maybe (List GhcjsOption) @@ -287,9 +291,9 @@ , commonOptionsIncludeDirs :: Maybe (List FilePath) , commonOptionsInstallIncludes :: Maybe (List FilePath) , commonOptionsLdOptions :: Maybe (List LdOption) -, commonOptionsBuildable :: Maybe Bool +, commonOptionsBuildable :: Last Bool , commonOptionsWhen :: Maybe (List (ConditionalSection cSources cxxSources jsSources a)) -, commonOptionsBuildTools :: Maybe BuildTools +, commonOptionsBuildTools :: Alias 'True "build-tool-depends" (Maybe BuildTools) , commonOptionsSystemBuildTools :: Maybe SystemBuildTools , commonOptionsVerbatim :: Maybe (List Verbatim) } deriving (Functor, Generic) @@ -299,11 +303,12 @@ instance (Semigroup cSources, Semigroup cxxSources, Semigroup jsSources, Monoid cSources, Monoid cxxSources, Monoid jsSources) => Monoid (CommonOptions cSources cxxSources jsSources a) where mempty = CommonOptions { - commonOptionsSourceDirs = Nothing - , commonOptionsDependencies = Nothing - , commonOptionsPkgConfigDependencies = Nothing + commonOptionsSourceDirs = Alias Nothing + , commonOptionsDependencies = Alias Nothing + , commonOptionsPkgConfigDependencies = Alias Nothing , commonOptionsDefaultExtensions = Nothing , commonOptionsOtherExtensions = Nothing + , commonOptionsLanguage = mempty , commonOptionsGhcOptions = Nothing , commonOptionsGhcProfOptions = Nothing , commonOptionsGhcjsOptions = Nothing @@ -320,9 +325,9 @@ , commonOptionsIncludeDirs = Nothing , commonOptionsInstallIncludes = Nothing , commonOptionsLdOptions = Nothing - , commonOptionsBuildable = Nothing + , commonOptionsBuildable = mempty , commonOptionsWhen = Nothing - , commonOptionsBuildTools = Nothing + , commonOptionsBuildTools = Alias Nothing , commonOptionsSystemBuildTools = Nothing , commonOptionsVerbatim = Nothing } @@ -335,6 +340,7 @@ , commonOptionsPkgConfigDependencies = commonOptionsPkgConfigDependencies a <> commonOptionsPkgConfigDependencies b , commonOptionsDefaultExtensions = commonOptionsDefaultExtensions a <> commonOptionsDefaultExtensions b , commonOptionsOtherExtensions = commonOptionsOtherExtensions a <> commonOptionsOtherExtensions b + , commonOptionsLanguage = commonOptionsLanguage a <> commonOptionsLanguage b , commonOptionsGhcOptions = commonOptionsGhcOptions a <> commonOptionsGhcOptions b , commonOptionsGhcProfOptions = commonOptionsGhcProfOptions a <> commonOptionsGhcProfOptions b , commonOptionsGhcjsOptions = commonOptionsGhcjsOptions a <> commonOptionsGhcjsOptions b @@ -351,7 +357,7 @@ , commonOptionsIncludeDirs = commonOptionsIncludeDirs a <> commonOptionsIncludeDirs b , commonOptionsInstallIncludes = commonOptionsInstallIncludes a <> commonOptionsInstallIncludes b , commonOptionsLdOptions = commonOptionsLdOptions a <> commonOptionsLdOptions b - , commonOptionsBuildable = commonOptionsBuildable b <|> commonOptionsBuildable a + , commonOptionsBuildable = commonOptionsBuildable a <> commonOptionsBuildable b , commonOptionsWhen = commonOptionsWhen a <> commonOptionsWhen b , commonOptionsBuildTools = commonOptionsBuildTools a <> commonOptionsBuildTools b , commonOptionsSystemBuildTools = commonOptionsSystemBuildTools b <> commonOptionsSystemBuildTools a @@ -501,12 +507,21 @@ instance FromValue Empty where fromValue _ = return Empty +newtype Language = Language String + deriving (Eq, Show) + +instance IsString Language where + fromString = Language + +instance FromValue Language where + fromValue = fmap Language . fromValue + data BuildType = Simple | Configure | Make | Custom - deriving (Eq, Show, Generic, Enum, Bounded) + deriving (Eq, Show, Enum, Bounded) instance FromValue BuildType where fromValue = withText $ \ (T.unpack -> t) -> do @@ -524,11 +539,11 @@ y : x : [] -> x ++ " or " ++ y x : ys@(_:_:_) -> intercalate ", " . reverse $ ("or " ++ x) : ys -type SectionConfigWithDefaluts cSources cxxSources jsSources a = Product DefaultsConfig (WithCommonOptions cSources cxxSources jsSources a) +type SectionConfigWithDefaults cSources cxxSources jsSources a = Product DefaultsConfig (WithCommonOptions cSources cxxSources jsSources a) type PackageConfigWithDefaults cSources cxxSources jsSources = PackageConfig_ - (SectionConfigWithDefaluts cSources cxxSources jsSources LibrarySection) - (SectionConfigWithDefaluts cSources cxxSources jsSources ExecutableSection) + (SectionConfigWithDefaults cSources cxxSources jsSources LibrarySection) + (SectionConfigWithDefaults cSources cxxSources jsSources ExecutableSection) type PackageConfig cSources cxxSources jsSources = PackageConfig_ (WithCommonOptions cSources cxxSources jsSources LibrarySection) @@ -877,16 +892,18 @@ decodeValue :: FromValue a => ProgramName -> FilePath -> Value -> Warnings (Errors IO) a decodeValue (ProgramName programName) file value = do - (r, unknown) <- lift . ExceptT . return $ first (prefix ++) (Config.decodeValue value) + (r, unknown, deprecated) <- lift . ExceptT . return $ first (prefix ++) (Config.decodeValue value) case r of UnsupportedSpecVersion v -> do lift $ throwE ("The file " ++ file ++ " requires version " ++ showVersion v ++ " of the Hpack package specification, however this version of " ++ programName ++ " only supports versions up to " ++ showVersion Hpack.version ++ ". Upgrading to the latest version of " ++ programName ++ " may resolve this issue.") SupportedSpecVersion a -> do tell (map formatUnknownField unknown) + tell (map formatDeprecatedField deprecated) return a where prefix = file ++ ": " formatUnknownField name = prefix ++ "Ignoring unrecognized field " ++ name + formatDeprecatedField (name, substitute) = prefix <> name <> " is deprecated, use " <> substitute <> " instead" data CheckSpecVersion a = SupportedSpecVersion a | UnsupportedSpecVersion Version @@ -968,6 +985,7 @@ , sectionPkgConfigDependencies :: [String] , sectionDefaultExtensions :: [String] , sectionOtherExtensions :: [String] +, sectionLanguage :: Maybe Language , sectionGhcOptions :: [GhcOption] , sectionGhcProfOptions :: [GhcProfOption] , sectionGhcjsOptions :: [GhcjsOption] @@ -1034,8 +1052,13 @@ toPackage :: ProgramName -> FilePath -> FilePath -> ConfigWithDefaults -> Warnings (Errors IO) (Package, String) toPackage programName userDataDir dir = expandDefaultsInConfig programName userDataDir dir - >=> traverseConfig (expandForeignSources dir) + >=> setDefaultLanguage "Haskell2010" + >>> traverseConfig (expandForeignSources dir) >=> toPackage_ dir + where + setDefaultLanguage language config = first setLanguage config + where + setLanguage = (mempty { commonOptionsLanguage = Alias . Last $ Just (Just language) } <>) expandDefaultsInConfig :: ProgramName @@ -1396,7 +1419,7 @@ } getMentionedExecutableModules :: ExecutableSection -> [Module] -getMentionedExecutableModules (ExecutableSection main otherModules generatedModules)= +getMentionedExecutableModules (ExecutableSection (Alias (Last main)) otherModules generatedModules)= maybe id (:) (toModule . Path.fromFilePath <$> main) $ fromMaybeList (otherModules <> generatedModules) toExecutable :: FilePath -> String -> Section ExecutableSection -> IO (Section Executable) @@ -1406,7 +1429,7 @@ where fromExecutableSection :: [Module] -> [Module] -> ExecutableSection -> Executable fromExecutableSection pathsModule inferableModules ExecutableSection{..} = - (Executable executableSectionMain (otherModules ++ generatedModules) generatedModules) + (Executable (getLast $ unAlias executableSectionMain) (otherModules ++ generatedModules) generatedModules) where otherModules = maybe (inferableModules ++ pathsModule) fromList executableSectionOtherModules generatedModules = maybe [] fromList executableSectionGeneratedOtherModules @@ -1419,9 +1442,9 @@ where go exec@ExecutableSection{..} = let - (mainSrcFile, ghcOptions) = maybe (Nothing, []) (first Just . parseMain) executableSectionMain + (mainSrcFile, ghcOptions) = maybe (Nothing, []) (first Just . parseMain) (getLast $ unAlias executableSectionMain) in - (ghcOptions, exec{executableSectionMain = mainSrcFile}) + (ghcOptions, exec{executableSectionMain = Alias $ Last mainSrcFile}) flatten :: Section ([GhcOption], ExecutableSection) -> Section ExecutableSection flatten sect@Section{sectionData = (ghcOptions, exec), ..} = sect{ @@ -1434,14 +1457,15 @@ toSection packageName_ executableNames = go where go (Product CommonOptions{..} a) = do - (systemBuildTools, buildTools) <- maybe (return mempty) toBuildTools commonOptionsBuildTools + (systemBuildTools, buildTools) <- maybe (return mempty) toBuildTools (unAlias commonOptionsBuildTools) conditionals <- mapM toConditional (fromMaybeList commonOptionsWhen) return Section { sectionData = a - , sectionSourceDirs = nub $ fromMaybeList commonOptionsSourceDirs + , sectionSourceDirs = nub $ fromMaybeList (unAlias commonOptionsSourceDirs) , sectionDefaultExtensions = fromMaybeList commonOptionsDefaultExtensions , sectionOtherExtensions = fromMaybeList commonOptionsOtherExtensions + , sectionLanguage = join . getLast $ unAlias commonOptionsLanguage , sectionGhcOptions = fromMaybeList commonOptionsGhcOptions , sectionGhcProfOptions = fromMaybeList commonOptionsGhcProfOptions , sectionGhcjsOptions = fromMaybeList commonOptionsGhcjsOptions @@ -1458,9 +1482,9 @@ , sectionIncludeDirs = fromMaybeList commonOptionsIncludeDirs , sectionInstallIncludes = fromMaybeList commonOptionsInstallIncludes , sectionLdOptions = fromMaybeList commonOptionsLdOptions - , sectionBuildable = commonOptionsBuildable - , sectionDependencies = fromMaybe mempty commonOptionsDependencies - , sectionPkgConfigDependencies = fromMaybeList commonOptionsPkgConfigDependencies + , sectionBuildable = getLast commonOptionsBuildable + , sectionDependencies = fromMaybe mempty (unAlias commonOptionsDependencies) + , sectionPkgConfigDependencies = fromMaybeList (unAlias commonOptionsPkgConfigDependencies) , sectionConditionals = conditionals , sectionBuildTools = buildTools , sectionSystemBuildTools = systemBuildTools <> fromMaybe mempty commonOptionsSystemBuildTools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hpack-0.34.6/src/Hpack/Render.hs new/hpack-0.35.0/src/Hpack/Render.hs --- old/hpack-0.34.6/src/Hpack/Render.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/hpack-0.35.0/src/Hpack/Render.hs 2001-09-09 03:46:40.000000000 +0200 @@ -44,7 +44,8 @@ import Hpack.Util import Hpack.Config import Hpack.Render.Hints -import Hpack.Render.Dsl +import Hpack.Render.Dsl hiding (sortFieldsBy) +import qualified Hpack.Render.Dsl as Dsl renderPackage :: [String] -> Package -> String renderPackage oldCabalFile = renderPackageWith settings alignment formattingHintsFieldOrder formattingHintsSectionsFieldOrder @@ -185,7 +186,7 @@ (renderExecutableSection [Field "type" "exitcode-stdio-1.0"] sect) renderExecutableSection :: [Element] -> Section Executable -> [Element] -renderExecutableSection extraFields = renderSection renderExecutableFields extraFields [defaultLanguage] +renderExecutableSection extraFields = renderSection renderExecutableFields extraFields renderExecutableFields :: Executable -> [Element] renderExecutableFields Executable{..} = mainIs ++ [otherModules, generatedModules] @@ -202,7 +203,7 @@ renderLibrary sect = Stanza "library" $ renderLibrarySection sect renderLibrarySection :: Section Library -> [Element] -renderLibrarySection = renderSection renderLibraryFields [] [defaultLanguage] +renderLibrarySection = renderSection renderLibraryFields [] renderLibraryFields :: Library -> [Element] renderLibraryFields Library{..} = @@ -221,8 +222,8 @@ renderVisibility :: String -> Element renderVisibility = Field "visibility" . Literal -renderSection :: (a -> [Element]) -> [Element] -> [Element] -> Section a -> [Element] -renderSection renderSectionData extraFieldsStart extraFieldsEnd Section{..} = addVerbatim sectionVerbatim $ +renderSection :: (a -> [Element]) -> [Element] -> Section a -> [Element] +renderSection renderSectionData extraFieldsStart Section{..} = addVerbatim sectionVerbatim $ extraFieldsStart ++ renderSectionData sectionData ++ [ renderDirectories "hs-source-dirs" sectionSourceDirs @@ -249,8 +250,8 @@ ++ renderBuildTools sectionBuildTools sectionSystemBuildTools ++ renderDependencies "build-depends" sectionDependencies ++ maybe [] (return . renderBuildable) sectionBuildable + ++ maybe [] (return . renderLanguage) sectionLanguage ++ map (renderConditional renderSectionData) sectionConditionals - ++ extraFieldsEnd addVerbatim :: [Verbatim] -> [Element] -> [Element] addVerbatim verbatim fields = filterVerbatim verbatim fields ++ renderVerbatim verbatim @@ -284,9 +285,9 @@ renderConditional :: (a -> [Element]) -> Conditional (Section a) -> Element renderConditional renderSectionData (Conditional condition sect mElse) = case mElse of Nothing -> if_ - Just else_ -> Group if_ (Stanza "else" $ renderSection renderSectionData [] [] else_) + Just else_ -> Group if_ (Stanza "else" $ renderSection renderSectionData [] else_) where - if_ = Stanza ("if " ++ renderCond condition) (renderSection renderSectionData [] [] sect) + if_ = Stanza ("if " ++ renderCond condition) (renderSection renderSectionData [] sect) renderCond :: Cond -> String renderCond = \ case @@ -294,9 +295,6 @@ CondBool True -> "true" CondBool False -> "false" -defaultLanguage :: Element -defaultLanguage = Field "default-language" "Haskell2010" - renderDirectories :: String -> [String] -> Element renderDirectories name = Field name . LineSeparatedList . replaceDots where @@ -375,6 +373,9 @@ renderSystemBuildTool :: (String, VersionConstraint) -> String renderSystemBuildTool (name, constraint) = name ++ renderVersionConstraint constraint +renderLanguage :: Language -> Element +renderLanguage (Language lang) = Field "default-language" (Literal lang) + renderGhcOptions :: [GhcOption] -> Element renderGhcOptions = Field "ghc-options" . WordList @@ -415,3 +416,6 @@ needsQuoting :: FilePath -> Bool needsQuoting = any (\x -> isSpace x || x == ',') + +sortFieldsBy :: [String] -> [Element] -> [Element] +sortFieldsBy existingFieldOrder = Dsl.sortFieldsBy ("import" : existingFieldOrder) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hpack-0.34.6/test/Data/Aeson/Config/FromValueSpec.hs new/hpack-0.35.0/test/Data/Aeson/Config/FromValueSpec.hs --- old/hpack-0.34.6/test/Data/Aeson/Config/FromValueSpec.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/hpack-0.35.0/test/Data/Aeson/Config/FromValueSpec.hs 2001-09-09 03:46:40.000000000 +0200 @@ -3,12 +3,14 @@ {-# LANGUAGE DeriveAnyClass #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE ConstraintKinds #-} +{-# LANGUAGE DataKinds #-} module Data.Aeson.Config.FromValueSpec where import Helper import GHC.Generics import qualified Data.Map.Lazy as Map +import Data.Monoid (Last(..)) import Data.Aeson.Config.FromValue @@ -16,7 +18,7 @@ shouldDecodeTo value expected = decodeValue value `shouldBe` expected shouldDecodeTo_ :: (HasCallStack, Eq a, Show a, FromValue a) => Value -> a -> Expectation -shouldDecodeTo_ value expected = decodeValue value `shouldBe` Right (expected, []) +shouldDecodeTo_ value expected = decodeValue value `shouldBe` Right (expected, [], []) data Person = Person { personName :: String @@ -34,6 +36,30 @@ , jobSalary :: Int } deriving (Eq, Show, Generic, FromValue) +data FlatMaybe = FlatMaybe { + flatMaybeValue :: Maybe String +} deriving (Eq, Show, Generic, FromValue) + +data AliasMaybe = AliasMaybe { + aliasMaybeValue :: Alias 'False "some-alias" (Maybe String) +} deriving (Eq, Show, Generic, FromValue) + +data NestedMaybe = NestedMaybe { + nestedMaybeValue :: Maybe (Maybe String) +} deriving (Eq, Show, Generic, FromValue) + +data AliasNestedMaybe = AliasNestedMaybe { + aliasNestedMaybeValue :: Alias 'False "some-alias" (Maybe (Maybe String)) +} deriving (Eq, Show, Generic, FromValue) + +data FlatLast = FlatLast { + flatLastValue :: Last String +} deriving (Eq, Show, Generic, FromValue) + +data AliasLast = AliasLast { + aliasLastValue :: Alias 'False "some-alias" (Last String) +} deriving (Eq, Show, Generic, FromValue) + spec :: Spec spec = do describe "fromValue" $ do @@ -52,7 +78,7 @@ name: "Joe" age: 23 foo: bar - |] `shouldDecodeTo` Right (Person "Joe" 23 Nothing, ["$.foo"]) + |] `shouldDecodeTo` Right (Person "Joe" 23 Nothing, ["$.foo"], []) it "captures nested unrecognized fields" $ do [yaml| @@ -63,7 +89,7 @@ zip: "123456" foo: bar: 23 - |] `shouldDecodeTo` Right (Person "Joe" 23 (Just (Address "somewhere" "123456")), ["$.address.foo"]) + |] `shouldDecodeTo` Right (Person "Joe" 23 (Just (Address "somewhere" "123456")), ["$.address.foo"], []) it "ignores fields that start with an underscore" $ do [yaml| @@ -87,6 +113,135 @@ age: "23" |] `shouldDecodeTo` left "Error while parsing $.age - parsing Int failed, expected Number, but encountered String" + context "when parsing a field of type (Maybe a)" $ do + it "accepts a value" $ do + [yaml| + value: some value + |] `shouldDecodeTo_` FlatMaybe (Just "some value") + + it "allows the field to be omitted" $ do + [yaml| + {} + |] `shouldDecodeTo_` FlatMaybe Nothing + + it "rejects null" $ do + [yaml| + value: null + |] `shouldDecodeTo` (Left "Error while parsing $.value - expected String, but encountered Null" :: Result FlatMaybe) + + context "when parsing a field of type (Maybe (Maybe a))" $ do + it "accepts a value" $ do + [yaml| + value: some value + |] `shouldDecodeTo_` NestedMaybe (Just $ Just "some value") + + it "allows the field to be omitted" $ do + [yaml| + {} + |] `shouldDecodeTo_` NestedMaybe Nothing + + it "accepts null" $ do + [yaml| + value: null + |] `shouldDecodeTo_` NestedMaybe (Just Nothing) + + context "when parsing a field of type (Alias (Maybe a))" $ do + it "accepts a value" $ do + [yaml| + value: some value + |] `shouldDecodeTo_` AliasMaybe (Alias $ Just "some value") + + it "allows the field to be accessed by its alias" $ do + [yaml| + some-alias: some alias value + |] `shouldDecodeTo_` AliasMaybe (Alias $ Just "some alias value") + + it "gives the primary name precedence" $ do + [yaml| + value: some value + some-alias: some alias value + |] `shouldDecodeTo` Right (AliasMaybe (Alias $ Just "some value"), ["$.some-alias"], []) + + it "allows the field to be omitted" $ do + [yaml| + {} + |] `shouldDecodeTo_` AliasMaybe (Alias Nothing) + + it "rejects null" $ do + [yaml| + value: null + |] `shouldDecodeTo` (Left "Error while parsing $.value - expected String, but encountered Null" :: Result AliasMaybe) + + context "when parsing a field of type (Alias (Maybe (Maybe a)))" $ do + it "accepts a value" $ do + [yaml| + value: some value + |] `shouldDecodeTo_` AliasNestedMaybe (Alias . Just $ Just "some value") + + it "allows the field to be accessed by its alias" $ do + [yaml| + some-alias: some value + |] `shouldDecodeTo_` AliasNestedMaybe (Alias . Just $ Just "some value") + + it "gives the primary name precedence" $ do + [yaml| + value: some value + some-alias: some alias value + |] `shouldDecodeTo` Right (AliasNestedMaybe (Alias . Just $ Just "some value"), ["$.some-alias"], []) + + it "allows the field to be omitted" $ do + [yaml| + {} + |] `shouldDecodeTo_` AliasNestedMaybe (Alias Nothing) + + it "accepts null" $ do + [yaml| + value: null + |] `shouldDecodeTo_` AliasNestedMaybe (Alias $ Just Nothing) + + context "when parsing a field of type (Last a)" $ do + it "accepts a value" $ do + [yaml| + value: some value + |] `shouldDecodeTo_` FlatLast (Last $ Just "some value") + + it "allows the field to be omitted" $ do + [yaml| + {} + |] `shouldDecodeTo_` FlatLast (Last Nothing) + + it "rejects null" $ do + [yaml| + value: null + |] `shouldDecodeTo` (Left "Error while parsing $.value - expected String, but encountered Null" :: Result FlatLast) + + context "when parsing a field of type (Alias (Last a))" $ do + it "accepts a value" $ do + [yaml| + value: some value + |] `shouldDecodeTo_` AliasLast (Alias . Last $ Just "some value") + + it "allows the field to be accessed by its alias" $ do + [yaml| + some-alias: some value + |] `shouldDecodeTo_` AliasLast (Alias . Last $ Just "some value") + + it "gives the primary name precedence" $ do + [yaml| + value: some value + some-alias: some alias value + |] `shouldDecodeTo` Right (AliasLast (Alias . Last $ Just "some value"), ["$.some-alias"], []) + + it "allows the field to be omitted" $ do + [yaml| + {} + |] `shouldDecodeTo_` AliasLast (Alias $ Last Nothing) + + it "rejects null" $ do + [yaml| + value: null + |] `shouldDecodeTo` (Left "Error while parsing $.value - expected String, but encountered Null" :: Result AliasLast) + context "with (,)" $ do it "captures unrecognized fields" $ do [yaml| @@ -95,7 +250,7 @@ role: engineer salary: 100000 foo: bar - |] `shouldDecodeTo` Right ((Person "Joe" 23 Nothing, Job "engineer" 100000), ["$.foo"]) + |] `shouldDecodeTo` Right ((Person "Joe" 23 Nothing, Job "engineer" 100000), ["$.foo"], []) context "with []" $ do it "captures unrecognized fields" $ do @@ -111,7 +266,7 @@ - name: "Marry" age: 25 bar: 42 - |] `shouldDecodeTo` Right (expected, ["$[1].bar", "$[0].address.foo"]) + |] `shouldDecodeTo` Right (expected, ["$[1].bar", "$[0].address.foo"], []) context "with Map" $ do it "captures unrecognized fields" $ do @@ -120,4 +275,4 @@ region: somewhere zip: '123456' foo: bar - |] `shouldDecodeTo` Right (Map.fromList [("Joe", Address "somewhere" "123456")], ["$.Joe.foo"]) + |] `shouldDecodeTo` Right (Map.fromList [("Joe", Address "somewhere" "123456")], ["$.Joe.foo"], []) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hpack-0.34.6/test/EndToEndSpec.hs new/hpack-0.35.0/test/EndToEndSpec.hs --- old/hpack-0.34.6/test/EndToEndSpec.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/hpack-0.35.0/test/EndToEndSpec.hs 2001-09-09 03:46:40.000000000 +0200 @@ -11,7 +11,7 @@ import Helper import Test.HUnit -import System.Directory (canonicalizePath, createDirectory) +import System.Directory (canonicalizePath) import Data.Maybe import Data.List import Data.String.Interpolate @@ -35,10 +35,15 @@ _foo: bar: 23 library: {} - |] `shouldRenderTo` library [i| - other-modules: - Paths_foo + |] `shouldRenderTo` library_ [i| |] + it "warns on duplicate fields" $ do + [i| + name: foo + name: foo + |] `shouldWarn` [ + "package.yaml: Duplicate field $.name" + ] describe "tested-with" $ do it "accepts a string" $ do @@ -62,14 +67,6 @@ , GHC == 7.4.2 |] - it "warns on duplicate fields" $ do - [i| - name: foo - name: foo - |] `shouldWarn` [ - "package.yaml: Duplicate field $.name" - ] - describe "handling of Paths_ module" $ do it "adds Paths_ to other-modules" $ do [i| @@ -77,6 +74,7 @@ |] `shouldRenderTo` library [i| other-modules: Paths_foo + default-language: Haskell2010 |] context "when cabal-version is >= 2" $ do @@ -90,6 +88,7 @@ Paths_foo autogen-modules: Paths_foo + default-language: Haskell2010 |]) { packageCabalVersion = "2.0" } context "when Paths_ module is listed explicitly under generated-other-modules" $ do @@ -104,6 +103,7 @@ Paths_foo autogen-modules: Paths_foo + default-language: Haskell2010 |]) { packageCabalVersion = "2.0" } context "when Paths_ module is listed explicitly under generated-exposed-modules" $ do @@ -118,6 +118,7 @@ Paths_foo autogen-modules: Paths_foo + default-language: Haskell2010 |]) { packageCabalVersion = "2.0" } context "when Paths_ is mentioned in a conditional that is always false" $ do @@ -128,9 +129,10 @@ - condition: false other-modules: Paths_foo |] `shouldRenderTo` library [i| + default-language: Haskell2010 |] - context "with RebindableSyntax and OverloadedStrings or OverloadedStrings" $ do + context "when Paths_ is used with RebindableSyntax and (OverloadedStrings or OverloadedLists)" $ do it "infers cabal-version 2.2" $ do [i| default-extensions: [RebindableSyntax, OverloadedStrings] @@ -143,6 +145,7 @@ Paths_foo autogen-modules: Paths_foo + default-language: Haskell2010 |]) {packageCabalVersion = "2.2"} context "when Paths_ is mentioned in a conditional that is always false" $ do @@ -157,6 +160,7 @@ default-extensions: RebindableSyntax OverloadedStrings + default-language: Haskell2010 |]) describe "spec-version" $ do @@ -342,11 +346,34 @@ github: sol/hpack-template path: defaults.yaml ref: "2017" - |] `shouldRenderTo` library [i| + |] `shouldRenderTo` library_ [i| exposed-modules: Foo - other-modules: - Paths_foo + |] + + it "accepts executable defaults" $ do + writeFile "defaults/sol/hpack-template/2017/.hpack/defaults.yaml" [i| + main: Foo.hs + |] + + [i| + executable: + defaults: sol/hpack-template@2017 + |] `shouldRenderTo` executable_ "foo" [i| + main-is: Foo.hs + |] + + it "gives `main` from executable section precedence" $ do + writeFile "defaults/sol/hpack-template/2017/.hpack/defaults.yaml" [i| + main: Foo.hs + |] + + [i| + executable: + main: Bar.hs + defaults: sol/hpack-template@2017 + |] `shouldRenderTo` executable_ "foo" [i| + main-is: Bar.hs |] it "accepts a list of defaults" $ do @@ -439,9 +466,7 @@ defaults: local: defaults/foo.yaml library: {} - |] `shouldRenderTo` library [i| - other-modules: - Paths_foo + |] `shouldRenderTo` library_ [i| default-extensions: RecordWildCards DeriveFunctor @@ -629,6 +654,19 @@ packageCabalVersion = "1.12" } + it "accepts build-tool-depends as an alias" $ do + [i| + executable: + build-tool-depends: + hspec-discover: 0.1.0 + |] `shouldRenderTo` (executable_ "foo" [i| + build-tool-depends: + hspec-discover:hspec-discover ==0.1.0 + |]) { + packageCabalVersion = "1.12" + , packageWarnings = ["package.yaml: $.executable.build-tool-depends is deprecated, use $.executable.build-tools instead"] + } + context "when the name of a build tool matches an executable from the same package" $ do it "adds it to build-tools" $ do [i| @@ -734,6 +772,17 @@ base |] + it "accepts build-depends as an alias" $ do + [i| + executable: + build-depends: base + |] `shouldRenderTo` (executable_ "foo" [i| + build-depends: + base + |]) { + packageWarnings = ["package.yaml: $.executable.build-depends is deprecated, use $.executable.dependencies instead"] + } + it "accepts dependencies with subcomponents" $ do [i| executable: @@ -794,6 +843,18 @@ , weston |] + it "accepts pkgconfig-depends as an alias" $ do + [i| + pkgconfig-depends: + - QtWebKit + - weston + executable: {} + |] `shouldRenderTo` executable_ "foo" [i| + pkgconfig-depends: + QtWebKit + , weston + |] + describe "include-dirs" $ do it "accepts include-dirs" $ do [i| @@ -867,9 +928,12 @@ when: condition: True cxx-options: -Wall - |] `shouldRenderTo` (executable_ "foo" [i| + |] `shouldRenderTo` (executable "foo" [i| + other-modules: + Paths_foo autogen-modules: Paths_foo + default-language: Haskell2010 if true if true if true @@ -891,6 +955,63 @@ cxxbits/bar.cc |]) {packageCabalVersion = "2.2"} + describe "language" $ do + it "accepts language" $ do + [i| + language: GHC2021 + executable: {} + |] `shouldRenderTo` executable "foo" [i| + other-modules: + Paths_foo + default-language: GHC2021 + |] + + it "omits language if it is null" $ do + [i| + language: null + executable: {} + |] `shouldRenderTo` executable "foo" [i| + other-modules: + Paths_foo + |] + + it "accepts default-language as an alias" $ do + [i| + default-language: GHC2021 + executable: {} + |] `shouldRenderTo` (executable "foo" [i| + other-modules: + Paths_foo + default-language: GHC2021 + |]) { + packageWarnings = ["package.yaml: $.default-language is deprecated, use $.language instead"] + } + + it "gives section-level language precedence" $ do + [i| + language: Haskell2010 + executable: + language: GHC2021 + |] `shouldRenderTo` executable "foo" [i| + other-modules: + Paths_foo + default-language: GHC2021 + |] + + it "accepts language from defaults" $ do + writeFile "defaults/sol/hpack-template/2017/.hpack/defaults.yaml" [i| + language: GHC2021 + |] + + [i| + defaults: sol/hpack-template@2017 + library: {} + |] `shouldRenderTo` library [i| + other-modules: + Paths_foo + default-language: GHC2021 + |] + describe "extra-lib-dirs" $ do it "accepts extra-lib-dirs" $ do [i| @@ -1054,6 +1175,7 @@ Foo other-modules: Foo + default-language: Haskell2010 |] context "with mixins" $ do @@ -1073,6 +1195,7 @@ foo mixins: foo (Blah as Etc) + default-language: Haskell2010 |]) {packageCabalVersion = "2.0"} describe "internal-libraries" $ do @@ -1137,6 +1260,7 @@ Foo other-modules: Paths_foo + default-language: Haskell2010 |] it "ignores duplicate modules" $ do @@ -1152,6 +1276,7 @@ Foo other-modules: Paths_foo + default-language: Haskell2010 |] context "with exposed-modules" $ do @@ -1170,6 +1295,7 @@ other-modules: Bar Paths_foo + default-language: Haskell2010 |] context "with other-modules" $ do @@ -1187,6 +1313,7 @@ Foo other-modules: Bar + default-language: Haskell2010 |] context "with both exposed-modules and other-modules" $ do @@ -1205,6 +1332,7 @@ Foo other-modules: Bar + default-language: Haskell2010 |] context "with neither exposed-modules nor other-modules" $ do @@ -1222,6 +1350,7 @@ Foo other-modules: Paths_foo + default-language: Haskell2010 |] context "with a conditional" $ do @@ -1236,15 +1365,17 @@ exposed-modules: - Foo - Paths_foo - |] `shouldRenderTo` library [i| - hs-source-dirs: - src - if os(windows) + |] `shouldRenderTo` package [i| + library + hs-source-dirs: + src exposed-modules: - Foo - Paths_foo - exposed-modules: - Bar + Bar + default-language: Haskell2010 + if os(windows) + exposed-modules: + Foo + Paths_foo |] context "with a source-dir inside the conditional" $ do @@ -1255,14 +1386,16 @@ when: condition: os(windows) source-dirs: windows - |] `shouldRenderTo` library [i| - other-modules: - Paths_foo - if os(windows) + |] `shouldRenderTo` package [i| + library other-modules: - Foo - hs-source-dirs: - windows + Paths_foo + default-language: Haskell2010 + if os(windows) + other-modules: + Foo + hs-source-dirs: + windows |] it "does not infer outer modules" $ do @@ -1278,17 +1411,19 @@ else: source-dirs: unix/ - |] `shouldRenderTo` library [i| - exposed-modules: - Foo - other-modules: - Paths_foo - if os(windows) - hs-source-dirs: - windows/ - else - hs-source-dirs: - unix/ + |] `shouldRenderTo` package [i| + library + exposed-modules: + Foo + other-modules: + Paths_foo + default-language: Haskell2010 + if os(windows) + hs-source-dirs: + windows/ + else + hs-source-dirs: + unix/ |] context "with generated modules" $ do @@ -1307,6 +1442,7 @@ Paths_foo Foo Bar + default-language: Haskell2010 |]) {packageCabalVersion = "2.0"} it "does not infer any mentioned generated modules" $ do @@ -1329,6 +1465,7 @@ Paths_foo Exposed Other + default-language: Haskell2010 |]) {packageCabalVersion = "2.0"} it "does not infer any generated modules mentioned inside conditionals" $ do @@ -1341,21 +1478,23 @@ condition: os(windows) generated-exposed-modules: Exposed generated-other-modules: Other - |] `shouldRenderTo` (library [i| - other-modules: - Paths_foo - autogen-modules: - Paths_foo - hs-source-dirs: - src - if os(windows) - exposed-modules: - Exposed + |] `shouldRenderTo` (package [i| + library other-modules: - Other + Paths_foo autogen-modules: - Other - Exposed + Paths_foo + hs-source-dirs: + src + default-language: Haskell2010 + if os(windows) + exposed-modules: + Exposed + other-modules: + Other + autogen-modules: + Other + Exposed |]) {packageCabalVersion = "2.0"} context "with an executable" $ do @@ -1374,6 +1513,7 @@ other-modules: Foo Paths_foo + default-language: Haskell2010 |] it "allows to specify other-modules" $ do @@ -1391,6 +1531,7 @@ src other-modules: Baz + default-language: Haskell2010 |] it "does not infer any mentioned generated modules" $ do @@ -1411,6 +1552,7 @@ autogen-modules: Paths_foo Foo + default-language: Haskell2010 |]) {packageCabalVersion = "2.0"} context "with a conditional" $ do @@ -1430,6 +1572,7 @@ Paths_foo hs-source-dirs: src + default-language: Haskell2010 if os(windows) other-modules: Foo @@ -1451,6 +1594,7 @@ Paths_foo hs-source-dirs: src + default-language: Haskell2010 if os(windows) other-modules: Bar @@ -1459,6 +1603,16 @@ |] describe "executables" $ do + it "accepts main-is as an alias for main" $ do + [i| + executable: + main-is: Foo.hs + |] `shouldRenderTo` (executable_ "foo" [i| + main-is: Foo.hs + |]) { + packageWarnings = ["package.yaml: $.executable.main-is is deprecated, use $.executable.main instead"] + } + it "accepts arbitrary entry points as main" $ do touch "src/Foo.hs" touch "src/Bar.hs" @@ -1475,6 +1629,7 @@ other-modules: Bar Paths_foo + default-language: Haskell2010 |] context "with a conditional" $ do @@ -1487,8 +1642,11 @@ when: condition: os(windows) main: Foo.hs - |] `shouldRenderTo` executable_ "foo" [i| + |] `shouldRenderTo` executable "foo" [i| ghc-options: -Wall + other-modules: + Paths_foo + default-language: Haskell2010 if os(windows) main-is: Foo.hs |] @@ -1500,7 +1658,10 @@ when: condition: os(windows) main: Foo - |] `shouldRenderTo` executable_ "foo" [i| + |] `shouldRenderTo` executable "foo" [i| + other-modules: + Paths_foo + default-language: Haskell2010 if os(windows) main-is: Foo.hs ghc-options: -main-is Foo @@ -1513,7 +1674,10 @@ condition: os(windows) dependencies: Win32 executable: {} - |] `shouldRenderTo` executable_ "foo" [i| + |] `shouldRenderTo` executable "foo" [i| + other-modules: + Paths_foo + default-language: Haskell2010 if os(windows) build-depends: Win32 @@ -1547,7 +1711,10 @@ else: dependencies: unix executable: {} - |] `shouldRenderTo` executable_ "foo" [i| + |] `shouldRenderTo` executable "foo" [i| + other-modules: + Paths_foo + default-language: Haskell2010 if os(windows) build-depends: Win32 @@ -1768,11 +1935,8 @@ shouldRenderTo :: HasCallStack => String -> Package -> Expectation shouldRenderTo input p = do writeFile packageConfig ("name: foo\n" ++ unindent input) - let currentDirectory = ".working-directory" - createDirectory currentDirectory - withCurrentDirectory currentDirectory $ do - (warnings, output) <- run ".." (".." </> packageConfig) expected - RenderResult warnings (dropEmptyLines output) `shouldBe` RenderResult (packageWarnings p) expected + (warnings, output) <- run "" packageConfig expected + RenderResult warnings (dropEmptyLines output) `shouldBe` RenderResult (packageWarnings p) expected where expected = dropEmptyLines (renderPackage p) dropEmptyLines = unlines . filter (not . null) . lines @@ -1813,7 +1977,6 @@ content = [i| library #{indentBy 2 $ unindent l} - default-language: Haskell2010 |] internalLibrary :: String -> String -> Package @@ -1842,7 +2005,6 @@ content = [i| executable #{name} #{indentBy 2 $ unindent e} - default-language: Haskell2010 |] package :: String -> Package diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hpack-0.34.6/test/Hpack/ConfigSpec.hs new/hpack-0.35.0/test/Hpack/ConfigSpec.hs --- old/hpack-0.34.6/test/Hpack/ConfigSpec.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/hpack-0.35.0/test/Hpack/ConfigSpec.hs 2001-09-09 03:46:40.000000000 +0200 @@ -28,12 +28,14 @@ import Hpack.Syntax.Dependencies import Hpack.Syntax.DependencyVersion import Hpack.Syntax.BuildTools -import Hpack.Config hiding (package) +import Hpack.Config hiding (section, package) import qualified Hpack.Config as Config import Data.Aeson.Config.Types import Data.Aeson.Config.FromValue +section :: a -> Section a +section a = (Config.section a) {sectionLanguage = Just $ Language "Haskell2010"} instance Exts.IsList (Maybe (List a)) where type Item (Maybe (List a)) = a @@ -421,6 +423,15 @@ - foo - bar |] + (packageLibrary >>> (`shouldBe` Just (section library) {sectionSourceDirs = ["foo", "bar"]})) + + it "accepts hs-source-dirs as an alias for source-dirs" $ do + withPackageConfig_ [i| + library: + hs-source-dirs: + - foo + - bar + |] (packageLibrary >>> (`shouldBe` Just (section library) {sectionSourceDirs = ["foo", "bar"]})) it "accepts default-extensions" $ do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hpack-0.34.6/test/Hpack/RenderSpec.hs new/hpack-0.35.0/test/Hpack/RenderSpec.hs --- old/hpack-0.34.6/test/Hpack/RenderSpec.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/hpack-0.35.0/test/Hpack/RenderSpec.hs 2001-09-09 03:46:40.000000000 +0200 @@ -14,7 +14,9 @@ library = Library Nothing Nothing [] [] [] [] [] executable :: Section Executable -executable = section (Executable (Just "Main.hs") [] []) +executable = (section $ Executable (Just "Main.hs") [] []) { + sectionLanguage = Just $ Language "Haskell2010" +} renderEmptySection :: Empty -> [Element] renderEmptySection Empty = [] @@ -117,20 +119,8 @@ , "" , "library" , " buildable: False" - , " default-language: Haskell2010" ] - context "when rendering library section" $ do - it "renders library section" $ do - renderPackage_ package {packageLibrary = Just $ section library} `shouldBe` unlines [ - "name: foo" - , "version: 0.0.0" - , "build-type: Simple" - , "" - , "library" - , " default-language: Haskell2010" - ] - context "when given list of existing fields" $ do it "retains field order" $ do renderPackageWith defaultRenderSettings 16 ["version", "build-type", "name"] [] package `shouldBe` unlines [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hpack-0.34.6/test/Hpack/Syntax/DependenciesSpec.hs new/hpack-0.35.0/test/Hpack/Syntax/DependenciesSpec.hs --- old/hpack-0.34.6/test/Hpack/Syntax/DependenciesSpec.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/hpack-0.35.0/test/Hpack/Syntax/DependenciesSpec.hs 2001-09-09 03:46:40.000000000 +0200 @@ -212,7 +212,7 @@ outer-name: name: inner-name path: somewhere - |] `shouldDecodeTo` Right (Dependencies [("outer-name", defaultInfo { dependencyInfoVersion = DependencyVersion source AnyVersion })], ["$.outer-name.name"]) + |] `shouldDecodeTo` Right (Dependencies [("outer-name", defaultInfo { dependencyInfoVersion = DependencyVersion source AnyVersion })], ["$.outer-name.name"], []) it "defaults to any version" $ do [yaml|

1 0

commit hledger-interest for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hledger-interest for openSUSE:Factory checked in at 2022-08-01 21:31:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hledger-interest (Old) and /work/SRC/openSUSE:Factory/.hledger-interest.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hledger-interest" Mon Aug 1 21:31:02 2022 rev:9 rq:987123 version:1.6.4 Changes: -------- --- /work/SRC/openSUSE:Factory/hledger-interest/hledger-interest.changes 2022-02-11 23:10:05.491064324 +0100 +++ /work/SRC/openSUSE:Factory/.hledger-interest.new.1533/hledger-interest.changes 2022-08-01 21:31:39.853874264 +0200 @@ -1,0 +2,12 @@ +Mon Jun 6 09:43:46 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update hledger-interest to version 1.6.4. + Upstream does not provide a change log file. + +------------------------------------------------------------------- +Mon Mar 14 13:03:36 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update hledger-interest to version 1.6.3 revision 2. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- Old: ---- hledger-interest-1.6.3.tar.gz hledger-interest.cabal New: ---- hledger-interest-1.6.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hledger-interest.spec ++++++ --- /var/tmp/diff_new_pack.ZPTVeL/_old 2022-08-01 21:31:40.969877466 +0200 +++ /var/tmp/diff_new_pack.ZPTVeL/_new 2022-08-01 21:31:40.973877477 +0200 @@ -1,7 +1,7 @@ # # spec file for package hledger-interest # -# 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 @@ -17,13 +17,12 @@ Name: hledger-interest -Version: 1.6.3 +Version: 1.6.4 Release: 0 Summary: Computes interest for a given account License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.t… -Source1: https://hackage.haskell.org/package/%{name}-%{version}/revision/1.cabal#/%{… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Decimal-devel BuildRequires: ghc-hledger-lib-devel @@ -89,7 +88,6 @@ %prep %autosetup -cp -p %{SOURCE1} %{name}.cabal %build %ghc_bin_build ++++++ hledger-interest-1.6.3.tar.gz -> hledger-interest-1.6.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-interest-1.6.3/Main.hs new/hledger-interest-1.6.4/Main.hs --- old/hledger-interest-1.6.3/Main.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/hledger-interest-1.6.4/Main.hs 2001-09-09 03:46:40.000000000 +0200 @@ -92,7 +92,7 @@ when (isNothing (optDCC opts)) (commandLineError "no day counting convention specified\n") when (isNothing (optRate opts)) (commandLineError "no interest rate specified\n") let ledgerInputOptions = definputopts { balancingopts_ = (balancingopts_ definputopts) { ignore_assertions_ = optIgnoreAssertions opts } } - jnl' <- readJournalFiles ledgerInputOptions (reverse (optInput opts)) >>= either fail return + jnl' <- runExceptT (readJournalFiles ledgerInputOptions (reverse (optInput opts))) >>= either fail return interestAcc <- case args of [] -> commandLineError "required argument ACCOUNT is missing\n" [acc] -> return $ T.pack acc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hledger-interest-1.6.3/hledger-interest.cabal new/hledger-interest-1.6.4/hledger-interest.cabal --- old/hledger-interest-1.6.3/hledger-interest.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/hledger-interest-1.6.4/hledger-interest.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ Name: hledger-interest -Version: 1.6.3 +Version: 1.6.4 Synopsis: computes interest for a given account License: BSD3 License-file: LICENSE @@ -119,7 +119,7 @@ Executable hledger-interest default-language: Haskell2010 Main-is: Main.hs - Build-depends: base >= 3 && < 5, hledger-lib == 1.23.*, time, mtl, Cabal, Decimal, text + Build-depends: base >= 3 && < 5, hledger-lib >= 1.26 && < 1.27, time, mtl, Cabal, Decimal, text other-modules: Hledger.Interest Hledger.Interest.DayCountConvention Hledger.Interest.Rate

1 0

commit happy for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package happy for openSUSE:Factory checked in at 2022-08-01 21:31:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/happy (Old) and /work/SRC/openSUSE:Factory/.happy.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "happy" Mon Aug 1 21:31:02 2022 rev:28 rq:987121 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/happy/happy.changes 2022-02-11 23:12:06.187413412 +0100 +++ /work/SRC/openSUSE:Factory/.happy.new.1533/happy.changes 2022-08-01 21:31:38.209869548 +0200 @@ -1,0 +2,6 @@ +Sun May 8 00:28:51 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update happy to version 1.20.0 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- New: ---- happy.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ happy.spec ++++++ --- /var/tmp/diff_new_pack.l95Ik9/_old 2022-08-01 21:31:39.005871832 +0200 +++ /var/tmp/diff_new_pack.l95Ik9/_new 2022-08-01 21:31:39.013871855 +0200 @@ -1,7 +1,7 @@ # # spec file for package happy # -# 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 @@ -24,6 +24,7 @@ License: BSD-2-Clause URL: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.t… +Source1: https://hackage.haskell.org/package/%{name}-%{version}/revision/1.cabal#/%{… BuildRequires: autoconf BuildRequires: docbook-dtd BuildRequires: docbook-xsl-stylesheets @@ -46,6 +47,7 @@ %prep %autosetup +cp -p %{SOURCE1} %{name}.cabal find . -type f -exec chmod -x {} + %build ++++++ happy.cabal ++++++ name: happy version: 1.20.0 x-revision: 1 license: BSD2 license-file: LICENSE copyright: (c) Andy Gill, Simon Marlow author: Andy Gill and Simon Marlow maintainer: Simon Marlow <marlowsd(a)gmail.com> bug-reports: https://github.com/simonmar/happy/issues stability: stable homepage: https://www.haskell.org/happy/ synopsis: Happy is a parser generator for Haskell category: Development cabal-version: >= 1.10 build-type: Simple Description: Happy is a parser generator for Haskell. Given a grammar specification in BNF, Happy generates Haskell code to parse the grammar. Happy works in a similar way to the @yacc@ tool for C. tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.1 data-dir: data/ data-files: HappyTemplate HappyTemplate-arrays HappyTemplate-arrays-coerce HappyTemplate-arrays-coerce-debug HappyTemplate-arrays-debug HappyTemplate-arrays-ghc HappyTemplate-arrays-ghc-debug HappyTemplate-coerce HappyTemplate-ghc GLR_Base GLR_Lib GLR_Lib-ghc GLR_Lib-ghc-debug extra-source-files: ANNOUNCE CHANGES Makefile README.md TODO doc/Makefile doc/aclocal.m4 doc/config.mk.in doc/configure.ac doc/docbook-xml.mk doc/fptools.css doc/happy.1.in doc/happy.xml examples/glr/nlp/Main.lhs examples/glr/nlp/Makefile examples/glr/nlp/README examples/glr/nlp/English.y examples/glr/nlp/Hugs.lhs examples/glr/Makefile examples/glr/Makefile.defs examples/glr/expr-eval/Main.lhs examples/glr/expr-eval/Makefile examples/glr/expr-eval/Expr.y examples/glr/expr-eval/README examples/glr/expr-eval/Hugs.lhs examples/glr/expr-tree/Main.lhs examples/glr/expr-tree/Makefile examples/glr/expr-tree/Expr.y examples/glr/expr-tree/README examples/glr/expr-tree/Tree.lhs examples/glr/expr-tree/Hugs.lhs examples/glr/highly-ambiguous/Main.lhs examples/glr/highly-ambiguous/Makefile examples/glr/highly-ambiguous/Expr.y examples/glr/highly-ambiguous/README examples/glr/highly-ambiguous/Hugs.lhs examples/glr/hidden-leftrec/Main.lhs examples/glr/hidden-leftrec/Makefile examples/glr/hidden-leftrec/Expr.y examples/glr/hidden-leftrec/README examples/glr/hidden-leftrec/Hugs.lhs examples/glr/expr-monad/Main.lhs examples/glr/expr-monad/Makefile examples/glr/expr-monad/Expr.y examples/glr/expr-monad/README examples/glr/expr-monad/Hugs.lhs examples/glr/bio-eg/Main.lhs examples/glr/bio-eg/Makefile examples/glr/bio-eg/Bio.y examples/glr/bio-eg/README examples/glr/bio-eg/1-1200.dna examples/glr/bio-eg/1-600.dna examples/glr/common/DV_lhs examples/glr/common/DaVinciTypes.hs examples/glr/packing/Main.lhs examples/glr/packing/Makefile examples/glr/packing/Expr.y examples/glr/packing/README examples/glr/packing/Hugs.lhs examples/PgnParser.ly examples/MonadTest.ly examples/igloo/ParserM.hs examples/igloo/Makefile examples/igloo/Parser.y examples/igloo/Foo.hs examples/igloo/README examples/igloo/Lexer.x examples/README examples/Calc.ly examples/DavesExample.ly examples/ErrorTest.ly examples/ErlParser.ly examples/SimonsExample.ly examples/LexerTest.ly happy.spec src/ARRAY-NOTES tests/AttrGrammar001.y tests/AttrGrammar002.y tests/Makefile tests/Partial.ly tests/Test.ly tests/TestMulti.ly tests/TestPrecedence.ly tests/bogus-token.y tests/bug001.ly tests/bug002.y tests/error001.stderr tests/error001.stdout tests/error001.y tests/monad001.y tests/monad002.ly tests/monaderror.y tests/precedence001.ly tests/precedence002.y tests/test_rules.y tests/issue91.y tests/issue93.y tests/issue94.y tests/issue95.y tests/monaderror-explist.y tests/typeclass_monad001.y tests/typeclass_monad002.ly tests/typeclass_monad_lexer.y tests/rank2.y tests/shift01.y source-repository head type: git location: https://github.com/simonmar/happy.git executable happy hs-source-dirs: src main-is: Main.lhs build-depends: base < 5, array, containers >= 0.4.2, mtl >= 2.2.1 && < 2.3 -- mtl-2.2.1 added Control.Monad.Except default-language: Haskell98 default-extensions: CPP, MagicHash, FlexibleContexts ghc-options: -Wall other-modules: Paths_happy AbsSyn First GenUtils Grammar Info LALR Lexer ParseMonad Parser ProduceCode ProduceGLRCode NameSet Target AttrGrammar AttrGrammarParser ParamRules PrettyGrammar test-suite tests type: exitcode-stdio-1.0 main-is: test.hs -- This line is important as it ensures that the local `exe:happy` component declared above is built before the test-suite component is invoked, as well as making sure that `happy` is made available on $PATH and `$happy_datadir` is set accordingly before invoking `test.hs` build-tools: happy build-depends: base, process default-language: Haskell98

1 0

commit git-annex for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package git-annex for openSUSE:Factory checked in at 2022-08-01 21:31:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git-annex (Old) and /work/SRC/openSUSE:Factory/.git-annex.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "git-annex" Mon Aug 1 21:31:00 2022 rev:25 rq:987120 version:10.20220624 Changes: -------- --- /work/SRC/openSUSE:Factory/git-annex/git-annex.changes 2022-02-11 23:10:04.475061386 +0100 +++ /work/SRC/openSUSE:Factory/.git-annex.new.1533/git-annex.changes 2022-08-01 21:31:36.993866059 +0200 @@ -1,0 +2,152 @@ +Thu Jun 23 18:00:23 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update git-annex to version 10.20220624. + git-annex (10.20220624) upstream; urgency=medium + + * init: Added --no-autoenable option. + * info: Added --autoenable option. + * initremote: Improve handling of type=git special remotes. + The location value no longer needs to match the url of an existing + git remote, and locations not using ssh:// will work now, including + both paths and host:/path + * Fix retrival of an empty file that is stored in a special remote with + chunking enabled. + (Fixes a reversion in 8.20201103) + * move: Improve resuming a move that succeeded in transferring the + content, but where dropping failed due to eg a network problem, + in cases where numcopies checks prevented the resumed + move from dropping the object from the source repository. + * add, fix, lock, rekey: When several files were being processed, + replacing an annex symlink of a file that was already processed + with a new large file could sometimes cause that large file to be + added to git. These races have been fixed. + * add: Also fix a similar race that could cause a large file be added + to git when a small file was modified or overwritten while it was + being added. + * add --batch: Fix handling of a file that is skipped due to being + gitignored. + + -- Joey Hess <id(a)joeyh.name> Thu, 23 Jun 2022 13:31:22 -0400 + +------------------------------------------------------------------- +Wed May 25 18:02:14 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update git-annex to version 10.20220525. + git-annex (10.20220525) upstream; urgency=medium + + * Special remotes with importtree=yes or exporttree=yes are once again + treated as untrusted, since files stored in them can be deleted or + modified at any time. + (Fixes a reversion in 8.20201129) + * Added support for "megabit" and related bandwidth units + in annex.stalldetection and everywhere else that git-annex parses + data units. Note that the short form is "Mbit" not "Mb" because + that differs from "MB" only in case, and git-annex parses units + case-insensitively. + * Special remotes using exporttree=yes and/or importtree=yes now + checksum content while it is being retrieved, instead of in a separate + pass at the end. + * fsck: Fix situations where the annex object file is stored in a + directory structure other than where annex symlinks point to. + * Deal with git's recent changes to fix CVE-2022-24765, which prevent + using git in a repository owned by someone else. + * Improve an error message displayed in that situation. + * Prevent git-annex init incorrectly reinitializing the repository in + that situation. + * test: When limiting tests to run with -p, work around tasty limitation + by automatically including dependent tests. + + -- Joey Hess <id(a)joeyh.name> Wed, 25 May 2022 13:44:46 -0400 + + git-annex (10.20220504) upstream; urgency=medium + + * Ignore annex.numcopies set to 0 in gitattributes or git config, + or by git-annex numcopies or by --numcopies, since that + configuration would make git-annex easily lose data. + Same for mincopies. + * assistant: When annex.autocommit is set, notice commits that + the user makes manually, and push them out to remotes promptly. + * multicast: Support uftp 5.0 by switching from aes256-cbc to + aes256-gcm. + * Fix test failure on NFS when cleaning up gpg temp directory. + * Fix a build failure with ghc 9.2.2. + Thanks, gnezdo for the patch. + * rsync 3.2.4 broke backwards-compatability by preventing exposing + filenames to the shell. Made the rsync and gcrypt special remotes + detect this and disable shellescape. Closes: #1010397 + * repair: Avoid treating refs/annex/last-index or other refs that + are not commit objects as evidence of repository corruption. + + -- Joey Hess <id(a)joeyh.name> Wed, 04 May 2022 11:45:27 -0400 + +------------------------------------------------------------------- +Tue Mar 22 17:57:22 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update git-annex to version 10.20220322. + git-annex (10.20220322) upstream; urgency=medium + + * Directory special remotes with importtree=yes have changed to once more + take inodes into account. This will cause extra work when importing + from a directory on a FAT filesystem that changes inodes on every + mount. To avoid that extra work, set ignoreinodes=yes when initializing + a new directory special remote, or change the configuration of your + existing remote: + git-annex enableremote foo ignoreinodes=yes + * add: Avoid unncessarily converting a newly unlocked file to be stored + in git when it is not modified, even when annex.largefiles does not + match it. + * The above change to add fixes a reversion in version 10.20220222, + where git-annex unlock followed by git-annex add, followed by git + commit file could result in git thinking the file was modified + after the commit. + * Detect when an unlocked file whose content is not present has gotten + some other content appended to it, and avoid treating it as a pointer + file, so that appended content will not be checked into git, but will + be annexed like any other file. + * smudge: Warn when encountering a pointer file that has other content + appended to it. + * When annex.freezecontent-command is set, and the filesystem does not + support removing write bits, avoid treating it as a crippled + filesystem. + * Run annex.thawcontent-command before deleting an object file, + in case annex.freezecontent-command did something that would prevent + deletion. + * Fix propagation of nonzero exit status from git ls-files when a specified + file does not exist, or a specified directory does not contain + any files checked into git. + * Fix build with aeson 2.0. + Thanks, sternenseemann for the patch. + * Avoid git-annex test being very slow when run from within the + standalone linux tarball or OSX app. + * test: Runs tests in parallel to speed up the test suite. + * test: Added --jobs option. + * Removed vendored copy of http-client-restricted, and removed the + HttpClientRestricted build flag that avoided that dependency. + * Removed the NetworkBSD build flag. + + -- Joey Hess <id(a)joeyh.name> Tue, 22 Mar 2022 13:56:12 -0400 + +------------------------------------------------------------------- +Tue Feb 22 17:35:50 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update git-annex to version 10.20220222. + git-annex (10.20220222) upstream; urgency=medium + + * annex.skipunknown now defaults to false, so commands like + `git annex get foo*` will not silently skip over files/dirs that are + not checked into git. + * info: Allow using matching options in more situations. File matching + options like --include will be rejected in situations where there is + no filename to match against. + * adb: Avoid find failing with "Argument list too long" + * Fix git-annex forget propagation between repositories. + (reversion introduced in version 7.20190122) + * registerurl, unregisterurl: Improved output when reading from stdin + to be more like other batch commands. + * registerurl, unregisterurl: Added --json and --json-error-messages options. + * Avoid git status taking a long time after git-annex unlock of many files. + * Pass --no-textconv when running git diff internally. + + -- Joey Hess <id(a)joeyh.name> Tue, 22 Feb 2022 13:01:20 -0400 + +------------------------------------------------------------------- Old: ---- git-annex-10.20220127.tar.gz New: ---- git-annex-10.20220624.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git-annex.spec ++++++ --- /var/tmp/diff_new_pack.jGRi2p/_old 2022-08-01 21:31:37.709868113 +0200 +++ /var/tmp/diff_new_pack.jGRi2p/_new 2022-08-01 21:31:37.717868136 +0200 @@ -17,7 +17,7 @@ Name: git-annex -Version: 10.20220127 +Version: 10.20220624 Release: 0 Summary: Manage files with git, without checking their contents into git License: AGPL-3.0-or-later AND GPL-3.0-or-later AND BSD-2-Clause AND MIT AND GPL-2.0-only @@ -32,6 +32,7 @@ BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-SafeSemaphore-devel BuildRequires: ghc-aeson-devel +BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-async-devel BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-aws-devel ++++++ git-annex-10.20220127.tar.gz -> git-annex-10.20220624.tar.gz ++++++ /work/SRC/openSUSE:Factory/git-annex/git-annex-10.20220127.tar.gz /work/SRC/openSUSE:Factory/.git-annex.new.1533/git-annex-10.20220624.tar.gz differ: char 13, line 1

1 0

commit ghc-zlib for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-zlib for openSUSE:Factory checked in at 2022-08-01 21:30:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-zlib (Old) and /work/SRC/openSUSE:Factory/.ghc-zlib.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-zlib" Mon Aug 1 21:30:59 2022 rev:25 rq:987119 version:0.6.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-zlib/ghc-zlib.changes 2021-09-10 23:41:37.934579876 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-zlib.new.1533/ghc-zlib.changes 2022-08-01 21:31:35.665862249 +0200 @@ -1,0 +2,9 @@ +Wed May 4 00:39:44 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update zlib to version 0.6.3.0. + Upstream has edited the change log file since the last release in + a non-trivial way, i.e. they did more than just add a new entry + at the top. You can review the file at: + http://hackage.haskell.org/package/zlib-0.6.3.0/src/changelog + +------------------------------------------------------------------- Old: ---- zlib-0.6.2.3.tar.gz zlib.cabal New: ---- zlib-0.6.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-zlib.spec ++++++ --- /var/tmp/diff_new_pack.zDjPmo/_old 2022-08-01 21:31:36.437864464 +0200 +++ /var/tmp/diff_new_pack.zDjPmo/_new 2022-08-01 21:31:36.445864487 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-zlib # -# 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 zlib %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6.2.3 +Version: 0.6.3.0 Release: 0 Summary: Compression and decompression in the gzip and zlib formats License: BSD-2-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros @@ -34,7 +33,6 @@ %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-tasty-devel -BuildRequires: ghc-tasty-hunit-devel BuildRequires: ghc-tasty-quickcheck-devel %endif @@ -61,7 +59,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -82,6 +79,6 @@ %license LICENSE %files devel -f %{name}-devel.files -%doc changelog examples +%doc README.md changelog examples %changelog ++++++ zlib-0.6.2.3.tar.gz -> zlib-0.6.3.0.tar.gz ++++++ ++++ 13400 lines of diff (skipped)

1 0

commit ghc-zip for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-zip for openSUSE:Factory checked in at 2022-08-01 21:30:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-zip (Old) and /work/SRC/openSUSE:Factory/.ghc-zip.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-zip" Mon Aug 1 21:30:58 2022 rev:7 rq:987118 version:1.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-zip/ghc-zip.changes 2021-11-11 21:38:40.836987488 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-zip.new.1533/ghc-zip.changes 2022-08-01 21:31:34.629859277 +0200 @@ -1,0 +2,6 @@ +Tue Apr 19 19:29:56 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update zip to version 1.7.2 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- New: ---- zip.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-zip.spec ++++++ --- /var/tmp/diff_new_pack.bbH2No/_old 2022-08-01 21:31:35.101860631 +0200 +++ /var/tmp/diff_new_pack.bbH2No/_new 2022-08-01 21:31:35.101860631 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-zip # -# 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 @@ License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel @@ -71,6 +72,7 @@ %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ zip.cabal ++++++ cabal-version: 1.18 name: zip version: 1.7.2 x-revision: 1 license: BSD3 license-file: LICENSE.md maintainer: Mark Karpov <markkarpov92(a)gmail.com> author: Mark Karpov <markkarpov92(a)gmail.com> tested-with: ghc ==8.8.4 ghc ==8.10.5 ghc ==9.0.1 homepage: https://github.com/mrkkrp/zip bug-reports: https://github.com/mrkkrp/zip/issues synopsis: Operations on zip archives description: Operations on zip archives. category: Codec build-type: Simple extra-doc-files: CHANGELOG.md README.md source-repository head type: git location: https://github.com/mrkkrp/zip.git flag dev description: Turn on development settings. default: False manual: True flag disable-bzip2 description: Removes dependency on bzip2 C library and hence support for BZip2 entries. default: False manual: True flag disable-zstd description: Removes dependency on zstd C library and hence support for Zstandard entries. default: False manual: True library exposed-modules: Codec.Archive.Zip Codec.Archive.Zip.CP437 Codec.Archive.Zip.Unix other-modules: Codec.Archive.Zip.Internal Codec.Archive.Zip.Type default-language: Haskell2010 build-depends: base >=4.13 && <5.0, bytestring >=0.9 && <0.12, case-insensitive >=1.2.0.2 && <1.3, cereal >=0.3 && <0.6, conduit >=1.3 && <1.4, conduit-extra >=1.3 && <1.4, containers >=0.5 && <0.7, digest <0.1, directory >=1.2.2 && <1.4, dlist >=0.8 && <2.0, exceptions >=0.6 && <0.11, filepath >=1.2 && <1.5, monad-control >=1.0 && <1.1, mtl >=2.0 && <3.0, resourcet >=1.2 && <1.3, text >=0.2 && <2.1, time >=1.4 && <1.13, transformers >=0.4 && <0.6, transformers-base if !flag(disable-bzip2) build-depends: bzlib-conduit >=0.3 && <0.4 if !flag(disable-zstd) build-depends: conduit-zstd >=0.0.2 && <0.1 if flag(dev) cpp-options: -DHASKELL_ZIP_DEV_MODE ghc-options: -O0 -Wall -Werror -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wnoncanonical-monad-instances else ghc-options: -O2 -Wall if !flag(disable-bzip2) cpp-options: -DENABLE_BZIP2 if !flag(disable-zstd) cpp-options: -DENABLE_ZSTD if os(windows) cpp-options: -DZIP_OS=0 else cpp-options: -DZIP_OS=3 build-depends: unix <2.8 executable haskell-zip-app main-is: Main.hs hs-source-dirs: bench-app default-language: Haskell2010 build-depends: base >=4.13 && <5.0, filepath >=1.2 && <1.5, zip if flag(dev) ghc-options: -Wall -Werror -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wnoncanonical-monad-instances else ghc-options: -O2 -Wall test-suite tests type: exitcode-stdio-1.0 main-is: Main.hs hs-source-dirs: tests default-language: Haskell2010 build-depends: base >=4.13 && <5.0, QuickCheck >=2.4 && <3.0, bytestring >=0.9 && <0.12, conduit >=1.3 && <1.4, containers >=0.5 && <0.7, directory >=1.2.2 && <1.4, dlist >=0.8 && <2.0, exceptions >=0.6 && <0.11, filepath >=1.2 && <1.5, hspec >=2.0 && <3.0, temporary >=1.1 && <1.4, text >=0.2 && <2.1, time >=1.4 && <1.13, transformers >=0.4 && <0.6, zip if flag(dev) ghc-options: -O0 -Wall -Werror else ghc-options: -O2 -Wall if !flag(disable-bzip2) cpp-options: -DENABLE_BZIP2 if !flag(disable-zstd) cpp-options: -DENABLE_ZSTD

1 0

commit ghc-yesod-persistent for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-yesod-persistent for openSUSE:Factory checked in at 2022-08-01 21:30:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-yesod-persistent (Old) and /work/SRC/openSUSE:Factory/.ghc-yesod-persistent.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-yesod-persistent" Mon Aug 1 21:30:57 2022 rev:7 rq:987117 version:1.6.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-yesod-persistent/ghc-yesod-persistent.changes 2021-05-11 23:04:19.440912898 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-yesod-persistent.new.1533/ghc-yesod-persistent.changes 2022-08-01 21:31:32.677853677 +0200 @@ -1,0 +2,8 @@ +Fri Apr 15 17:21:58 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update yesod-persistent to version 1.6.0.8. + ## 1.6.0.8 + + * Add support for `persistent-2.14` [#1706](https://github.com/yesodweb/yesod/pull/1760) + +------------------------------------------------------------------- Old: ---- yesod-persistent-1.6.0.7.tar.gz New: ---- yesod-persistent-1.6.0.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-yesod-persistent.spec ++++++ --- /var/tmp/diff_new_pack.AuMDtO/_old 2022-08-01 21:31:34.233858140 +0200 +++ /var/tmp/diff_new_pack.AuMDtO/_new 2022-08-01 21:31:34.237858152 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-yesod-persistent # -# 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,7 +19,7 @@ %global pkg_name yesod-persistent %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.6.0.7 +Version: 1.6.0.8 Release: 0 Summary: Some helpers for using Persistent from Yesod License: MIT ++++++ yesod-persistent-1.6.0.7.tar.gz -> yesod-persistent-1.6.0.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-persistent-1.6.0.7/ChangeLog.md new/yesod-persistent-1.6.0.8/ChangeLog.md --- old/yesod-persistent-1.6.0.7/ChangeLog.md 2021-05-07 13:10:52.000000000 +0200 +++ new/yesod-persistent-1.6.0.8/ChangeLog.md 2022-04-15 19:21:53.000000000 +0200 @@ -1,5 +1,9 @@ # ChangeLog for yesod-persistent +## 1.6.0.8 + +* Add support for `persistent-2.14` [#1706](https://github.com/yesodweb/yesod/pull/1760) + ## 1.6.0.7 * Add support for persistent 2.13. [#1723](https://github.com/yesodweb/yesod/pull/1723) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-persistent-1.6.0.7/Yesod/Persist/Core.hs new/yesod-persistent-1.6.0.8/Yesod/Persist/Core.hs --- old/yesod-persistent-1.6.0.7/Yesod/Persist/Core.hs 2021-05-07 13:10:52.000000000 +0200 +++ new/yesod-persistent-1.6.0.8/Yesod/Persist/Core.hs 2022-04-15 19:21:53.000000000 +0200 @@ -37,6 +37,9 @@ #if MIN_VERSION_persistent(2,13,0) import qualified Database.Persist.SqlBackend.Internal as SQL #endif +#if MIN_VERSION_persistent(2,14,0) +import Database.Persist.Class.PersistEntity +#endif unSqlPersistT :: a -> a unSqlPersistT = id @@ -187,14 +190,21 @@ -- is violated. -- -- @since 1.4.1 -#if MIN_VERSION_persistent(2,5,0) -insert400 :: (MonadIO m, PersistUniqueWrite backend, PersistRecordBackend val backend) - => val - -> ReaderT backend m (Key val) -#else -insert400 :: (MonadIO m, PersistUnique (PersistEntityBackend val), PersistEntity val) - => val - -> ReaderT (PersistEntityBackend val) m (Key val) +#if MIN_VERSION_persistent(2,14,0) +insert400 + :: (MonadIO m, PersistUniqueWrite backend, PersistRecordBackend val backend, SafeToInsert val) + => val + -> ReaderT backend m (Key val) +#elif MIN_VERSION_persistent(2,5,0) +insert400 + :: (MonadIO m, PersistUniqueWrite backend, PersistRecordBackend val backend) + => val + -> ReaderT backend m (Key val) +#else +insert400 + :: (MonadIO m, PersistUnique (PersistEntityBackend val), PersistEntity val) + => val + -> ReaderT (PersistEntityBackend val) m (Key val) #endif insert400 datum = do conflict <- checkUnique datum @@ -214,7 +224,12 @@ -- | Same as 'insert400', but doesn��t return a key. -- -- @since 1.4.1 -#if MIN_VERSION_persistent(2,5,0) +#if MIN_VERSION_persistent(2,14,0) +insert400_ :: (MonadIO m, PersistUniqueWrite backend, PersistRecordBackend val backend, SafeToInsert val) + => val + -> ReaderT backend m () + +#elif MIN_VERSION_persistent(2,5,0) insert400_ :: (MonadIO m, PersistUniqueWrite backend, PersistRecordBackend val backend) => val -> ReaderT backend m () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yesod-persistent-1.6.0.7/yesod-persistent.cabal new/yesod-persistent-1.6.0.8/yesod-persistent.cabal --- old/yesod-persistent-1.6.0.7/yesod-persistent.cabal 2021-05-07 13:10:52.000000000 +0200 +++ new/yesod-persistent-1.6.0.8/yesod-persistent.cabal 2022-04-15 19:21:53.000000000 +0200 @@ -1,6 +1,6 @@ cabal-version: >= 1.10 name: yesod-persistent -version: 1.6.0.7 +version: 1.6.0.8 license: MIT license-file: LICENSE author: Michael Snoyman <michael(a)snoyman.com>

1 0

commit ghc-xml-conduit for openSUSE:Factory
by Source-Sync 01 Aug '22

01 Aug '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-xml-conduit for openSUSE:Factory checked in at 2022-08-01 21:30:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-xml-conduit (Old) and /work/SRC/openSUSE:Factory/.ghc-xml-conduit.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-xml-conduit" Mon Aug 1 21:30:56 2022 rev:9 rq:987116 version:1.9.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-xml-conduit/ghc-xml-conduit.changes 2021-04-24 23:10:11.855483424 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-xml-conduit.new.1533/ghc-xml-conduit.changes 2022-08-01 21:31:31.445850142 +0200 @@ -1,0 +2,6 @@ +Sun May 22 09:54:16 UTC 2022 - Peter Simons <psimons(a)suse.com> + +- Update xml-conduit to version 1.9.1.1 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- New: ---- xml-conduit.cabal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-xml-conduit.spec ++++++ --- /var/tmp/diff_new_pack.MT7evv/_old 2022-08-01 21:31:32.501853172 +0200 +++ /var/tmp/diff_new_pack.MT7evv/_new 2022-08-01 21:31:32.509853195 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-xml-conduit # -# 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 @@ License: MIT URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-blaze-html-devel @@ -64,6 +65,7 @@ %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ xml-conduit.cabal ++++++ cabal-version: >= 1.14 name: xml-conduit version: 1.9.1.1 x-revision: 1 license: MIT license-file: LICENSE author: Michael Snoyman <michael(a)snoyman.com>, Aristid Breitkreuz <aristidb(a)googlemail.com> maintainer: Michael Snoyman <michael(a)snoyman.com> synopsis: Pure-Haskell utilities for dealing with XML with the conduit package. description: Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/xml-conduit>. category: XML, Conduit stability: Stable build-type: Custom homepage: http://github.com/snoyberg/xml extra-source-files: README.md ChangeLog.md tested-with: GHC >=8.0 && <8.12 custom-setup setup-depends: base >= 4 && <5, Cabal, cabal-doctest >= 1 && <1.1 library build-depends: base >= 4 && < 5 , conduit >= 1.3 && < 1.4 , conduit-extra >= 1.3 && < 1.4 , resourcet >= 1.2 && < 1.3 , bytestring >= 0.10.2 , text >= 0.7 , containers >= 0.2 , xml-types >= 0.3.4 && < 0.4 , attoparsec >= 0.10 , transformers >= 0.2 && < 0.7 , data-default-class , blaze-markup >= 0.5 , blaze-html >= 0.5 , deepseq >= 1.1.0.0 exposed-modules: Text.XML.Stream.Parse Text.XML.Stream.Render Text.XML.Unresolved Text.XML.Cursor Text.XML.Cursor.Generic Text.XML other-modules: Text.XML.Stream.Token ghc-options: -Wall hs-source-dirs: src default-language: Haskell2010 test-suite unit type: exitcode-stdio-1.0 main-is: unit.hs hs-source-dirs: test build-depends: base , containers , text , transformers , bytestring , xml-conduit , hspec >= 1.3 , HUnit , xml-types >= 0.3.1 , conduit , conduit-extra , blaze-markup , resourcet default-language: Haskell2010 test-suite doctest type: exitcode-stdio-1.0 main-is: doctest.hs hs-source-dirs: test build-depends: base , doctest >= 0.8 , xml-conduit default-language: Haskell2010 source-repository head type: git location: git://github.com/snoyberg/xml.git

1 0