Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-cabal-doctest for
openSUSE:Factory checked in at 2021-11-11 21:37:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-cabal-doctest (Old)
and /work/SRC/openSUSE:Factory/.ghc-cabal-doctest.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-cabal-doctest"
Thu Nov 11 21:37:31 2021 rev:15 rq:930428 version:1.0.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-cabal-doctest/ghc-cabal-doctest.changes
2020-12-22 11:37:02.649354219 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-cabal-doctest.new.1890/ghc-cabal-doctest.changes
2021-11-11 21:38:13.964967889 +0100
@@ -1,0 +2,9 @@
+Mon Nov 8 16:30:40 UTC 2021 - [email protected]
+
+- Update cabal-doctest to version 1.0.9.
+ 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/cabal-doctest-1.0.9/src/ChangeLog.md
+
+-------------------------------------------------------------------
Old:
----
cabal-doctest-1.0.8.tar.gz
cabal-doctest.cabal
New:
----
cabal-doctest-1.0.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-cabal-doctest.spec ++++++
--- /var/tmp/diff_new_pack.8WqNcN/_old 2021-11-11 21:38:15.976969356 +0100
+++ /var/tmp/diff_new_pack.8WqNcN/_new 2021-11-11 21:38:15.980969359 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-cabal-doctest
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,13 +18,12 @@
%global pkg_name cabal-doctest
Name: ghc-%{pkg_name}
-Version: 1.0.8
+Version: 1.0.9
Release: 0
-Summary: A Setup.hs helper for doctests running
+Summary: A Setup.hs helper for running doctests
License: BSD-3-Clause
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-directory-devel
BuildRequires: ghc-filepath-devel
@@ -32,11 +31,9 @@
ExcludeArch: %{ix86}
%description
-Currently (beginning of 2017), there isn't 'cabal doctest' command.
-Yet, to properly work doctest needs plenty of configuration. This library
-provides the common bits for writing custom Setup.hs See
-<https://github.com/haskell/cabal/issues/2327 Cabal/2327> for the progress of
-'cabal doctest', i.e. whether this library is obsolete.
+As of now (end of 2021), there isn't 'cabal doctest' command. Yet, to properly
+work, 'doctest' needs plenty of configuration. This library provides the common
+bits for writing a custom 'Setup.hs'.
%package devel
Summary: Haskell %{pkg_name} library development files
@@ -50,7 +47,6 @@
%prep
%autosetup -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ cabal-doctest-1.0.8.tar.gz -> cabal-doctest-1.0.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-doctest-1.0.8/ChangeLog.md
new/cabal-doctest-1.0.9/ChangeLog.md
--- old/cabal-doctest-1.0.8/ChangeLog.md 2001-09-09 03:46:40.000000000
+0200
+++ new/cabal-doctest-1.0.9/ChangeLog.md 2001-09-09 03:46:40.000000000
+0200
@@ -1,12 +1,16 @@
+# 1.0.9 -- 2021-11-07
+
+* Support `GHC-9.2`, `base-4.16`, and `Cabal-3.6` (thanks Alistair Burrowes).
+
# 1.0.8 -- 2019-10-02
-* Pass `-package-env=-` when compiler supports it
-* Amend examples to `unsetEnv "GHC_ENVIRONMENT"`
+* Pass `-package-env=-` when compiler supports it.
+* Amend examples to `unsetEnv "GHC_ENVIRONMENT"`.
# 1.0.7 -- 2019-08-26
-* Make `Distribution.Extra.Doctest` `-Wall`-clean
-* Support GHC-8.8, base-4.13, and Cabal-3.0
+* Make `Distribution.Extra.Doctest` `-Wall`-clean.
+* Support `GHC-8.8`, `base-4.13`, and `Cabal-3.0`.
# 1.0.6 -- 2018-01-28
@@ -26,23 +30,19 @@
# 1.0.3 -- 2017-11-02
-* Add an explicit `Prelude` import to `Build_doctests`
+* Add an explicit `Prelude` import to `Build_doctests`.
# 1.0.2 -- 2017-05-16
* Add `defaultMainAutoconfWithDoctests` and `addDoctestsUserHook`.
-
* Add support for `.hsc` and other preprocessed files
- ([#8](https://github.com/phadej/cabal-doctest/issues/8))
-
+ ([#8](https://github.com/phadej/cabal-doctest/issues/8)).
* Add support for `x-doctest-source-dirs` and `x-doctest-modules`.
# 1.0.1 -- 2017-05-05
-* Add support for `x-doctest-options` cabal-file field
-
-* Proper support for GHC-8.2.1 & Cabal-2.0.0.0
-
+* Add support for `x-doctest-options` cabal-file field.
+* Proper support for `GHC-8.2.1` and `Cabal-2.0.0.0`.
* Add support to `default-extensions` in library.
# 1 -- 2017-01-31
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-doctest-1.0.8/README.md
new/cabal-doctest-1.0.9/README.md
--- old/cabal-doctest-1.0.8/README.md 2001-09-09 03:46:40.000000000 +0200
+++ new/cabal-doctest-1.0.9/README.md 2001-09-09 03:46:40.000000000 +0200
@@ -1,19 +1,16 @@
cabal-doctest
=============
-[](https://hackage.haskell.org/package/cabal-doctest)
[](https://travis-ci.org/phadej/cabal-doctest)
+[](https://hackage.haskell.org/package/cabal-doctest)
[](https://github.com/haskellari/cabal-doctest/actions/workflows/haskell-ci.yml)
A `Setup.hs` helper for running `doctests`.
Simple example
--------------
-For most use cases???a `.cabal` file with a single library containing
-doctests???adapting the simple example located
-[here](https://github.com/phadej/cabal-doctest/tree/master/simple-example)
-will be sufficient. (Note that this example requires `Cabal-1.24` or later, but
-you can relax this bound safely, although running doctests won't be supported
-on versions of `Cabal` older than 1.24.)
+For the typical use case, namely a `.cabal` file with a single library
containing
+doctests, adapting the [simple
example](https://github.com/phadej/cabal-doctest/tree/master/simple-example)
+will be sufficient.
To use this library in your `Setup.hs`, you should specify a `custom-setup`
section in your `.cabal` file. For example:
@@ -26,8 +23,8 @@
cabal-doctest >= 1 && <1.1
```
-/Note:/ `Cabal` dependency is needed because of
-[Cabal/GH-4288](https://github.com/haskell/cabal/issues/4288) bug.
+_Note:_ The `Cabal` dependency is only needed for `cabal-install < 2.4`
+(see issue [haskell/cabal#4288](https://github.com/haskell/cabal/issues/4288)).
You'll also need to specify `build-type: Custom` at the top of the `.cabal`
file. Now put this into your `Setup.hs` file:
@@ -73,8 +70,8 @@
`cabal-doctest` also supports more exotic use cases where a `.cabal` file
contains more components with doctests than just the main library, including:
-* Doctests in executables
-* Doctests in Internal libraries (if using `Cabal-2.0` or later)
+* doctests in executables,
+* doctests in internal libraries (if using `Cabal-2.0` or later).
Unlike the simple example shown above, these examples involve _named_
components. You don't need to change the `Setup.hs` script to support
@@ -82,12 +79,12 @@
copies of the `flags`, `pkgs`, and `module_sources` values for each additional
named component.
-Simplest approach is to use `x-doctest-components` field, for example
+Simplest approach is to use `x-doctest-components` field, for example:
```
x-doctest-components: lib lib:internal exe:example
```
-In that case, the testdrive is general:
+In that case, the test driver is generally:
```haskell
module Main where
@@ -107,7 +104,7 @@
doctest args
```
-There's also a more explicit approach: if you have an executable named `foo`,
+There is also a more explicit approach: if you have an executable named `foo`,
then separate values named `flags_exe_foo`, `pkgs_exe_foo`, and
`module_sources_exe_foo` will
be generated in `Build_doctests`. If the name has hyphens in it
(e.g., `my-exe`), then `cabal-doctest` will convert those hyphens to
@@ -193,10 +190,6 @@
you have to use `explicit-setup-deps` setting in your `stack.yaml`.
([stack/GH-2094](https://github.com/commercialhaskell/stack/issues/2094))
-* There is [an issue in the Cabal issue
tracker](https://github.com/haskell/cabal/issues/2327)
- about adding `cabal doctest` command. After that command is implemented,
- this library will be deprecated.
-
* You can use `x-doctest-options` field in `test-suite doctests` to
pass additional flags to the `doctest`.
@@ -207,7 +200,7 @@
might fail with weird errors (ambiguous module errors). Workaround is
to move sources under `src/` or some non-top-level directory.
-* `extensions:` field isn't supported. Upgrade your `.cabal` file to use at
least
+* The `extensions:` field isn't supported. Upgrade your `.cabal` file to use
at least
`cabal-version: >= 1.10` and use `default-extensions` or `other-extensions`.
* If you use QuickCheck properties (`prop>`) in your doctests,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-doctest-1.0.8/cabal-doctest.cabal
new/cabal-doctest-1.0.9/cabal-doctest.cabal
--- old/cabal-doctest-1.0.8/cabal-doctest.cabal 2001-09-09 03:46:40.000000000
+0200
+++ new/cabal-doctest-1.0.9/cabal-doctest.cabal 2001-09-09 03:46:40.000000000
+0200
@@ -1,18 +1,16 @@
name: cabal-doctest
-version: 1.0.8
-synopsis: A Setup.hs helper for doctests running
+version: 1.0.9
+synopsis: A Setup.hs helper for running doctests
description:
- Currently (beginning of 2017), there isn't @cabal doctest@
- command. Yet, to properly work doctest needs plenty of configuration.
- This library provides the common bits for writing custom Setup.hs
- See <https://github.com/haskell/cabal/issues/2327 Cabal/2327> for the
progress
- of @cabal doctest@, i.e. whether this library is obsolete.
+ As of now (end of 2021), there isn't @cabal doctest@
+ command. Yet, to properly work, @doctest@ needs plenty of configuration.
+ This library provides the common bits for writing a custom @Setup.hs@.
-homepage: https://github.com/phadej/cabal-doctest
+homepage: https://github.com/haskellari/cabal-doctest
license: BSD3
license-file: LICENSE
author: Oleg Grenrus <[email protected]>
-maintainer: Oleg Grenrus <[email protected]>
+maintainer: Andreas Abel
copyright: (c) 2017 Oleg Grenrus
category: Distribution
build-type: Simple
@@ -21,19 +19,33 @@
ChangeLog.md
README.md
-tested-with: GHC ==8.8.1 || >=7.4 && <8.8 || ==7.2.2 || ==7.0.4
+tested-with:
+ GHC == 7.0.4
+ GHC == 7.2.2
+ GHC == 7.4.2
+ GHC == 7.6.3
+ GHC == 7.8.4
+ GHC == 7.10.3
+ GHC == 8.0.2
+ GHC == 8.2.2
+ GHC == 8.4.4
+ GHC == 8.6.5
+ GHC == 8.8.4
+ GHC == 8.10.7
+ GHC == 9.0.1
+ GHC == 9.2.1
source-repository head
type: git
- location: https://github.com/phadej/cabal-doctest
+ location: https://github.com/haskellari/cabal-doctest
library
exposed-modules: Distribution.Extra.Doctest
other-modules:
other-extensions:
build-depends:
- base >=4.3 && <4.14
- , Cabal >=1.10 && <3.1
+ base >=4.3 && <4.17
+ , Cabal >=1.10 && <3.8
, directory
, filepath
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cabal-doctest-1.0.8/src/Distribution/Extra/Doctest.hs
new/cabal-doctest-1.0.9/src/Distribution/Extra/Doctest.hs
--- old/cabal-doctest-1.0.8/src/Distribution/Extra/Doctest.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/cabal-doctest-1.0.9/src/Distribution/Extra/Doctest.hs 2001-09-09
03:46:40.000000000 +0200
@@ -125,6 +125,11 @@
(libraryNameString)
#endif
+#if MIN_VERSION_Cabal(3,6,0)
+import Distribution.Utils.Path
+ (getSymbolicPath)
+#endif
+
#if MIN_VERSION_directory(1,2,2)
import System.Directory
(makeAbsolute)
@@ -326,7 +331,11 @@
<- mapM makeAbsolute
$ compAutogenDir -- autogenerated files
: (distPref ++ "/build") -- preprocessed files (.hsc -> .hs);
"build" is hardcoded in Cabal.
+#if MIN_VERSION_Cabal(3,6,0)
+ : map getSymbolicPath (hsSourceDirs compBI)
+#else
: hsSourceDirs compBI
+#endif
includeArgs <- mapM (fmap ("-I"++) . makeAbsolute) $ includeDirs
compBI
-- We clear all includes, so the CWD isn't used.
let iArgs' = map ("-i"++) iArgsNoPrefix
