Hello community,
here is the log from the commit of package ghc-cabal-doctest for
openSUSE:Factory checked in at 2019-08-29 17:20:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-cabal-doctest (Old)
and /work/SRC/openSUSE:Factory/.ghc-cabal-doctest.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-cabal-doctest"
Thu Aug 29 17:20:20 2019 rev:7 rq:726807 version:1.0.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-cabal-doctest/ghc-cabal-doctest.changes
2018-10-25 08:21:19.191938964 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-cabal-doctest.new.7948/ghc-cabal-doctest.changes
2019-08-29 17:20:22.267338933 +0200
@@ -1,0 +2,9 @@
+Tue Aug 27 02:02:00 UTC 2019 - [email protected]
+
+- Update cabal-doctest to version 1.0.7.
+ # 1.0.7 -- 2019-??-??
+
+ * Make `Distribution.Extra.Doctest` `-Wall`-clean
+ * Support GHC-8.8, base-4.13, and Cabal-3.0
+
+-------------------------------------------------------------------
Old:
----
cabal-doctest-1.0.6.tar.gz
cabal-doctest.cabal
New:
----
cabal-doctest-1.0.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-cabal-doctest.spec ++++++
--- /var/tmp/diff_new_pack.AnlU5x/_old 2019-08-29 17:20:22.727338856 +0200
+++ /var/tmp/diff_new_pack.AnlU5x/_new 2019-08-29 17:20:22.727338856 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-cabal-doctest
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,14 +18,13 @@
%global pkg_name cabal-doctest
Name: ghc-%{pkg_name}
-Version: 1.0.6
+Version: 1.0.7
Release: 0
Summary: A Setup.hs helper for doctests running
License: BSD-3-Clause
Group: Development/Libraries/Haskell
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
@@ -51,7 +50,6 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ cabal-doctest-1.0.6.tar.gz -> cabal-doctest-1.0.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-doctest-1.0.6/ChangeLog.md
new/cabal-doctest-1.0.7/ChangeLog.md
--- old/cabal-doctest-1.0.6/ChangeLog.md 2018-01-28 16:56:55.000000000
+0100
+++ new/cabal-doctest-1.0.7/ChangeLog.md 2001-09-09 03:46:40.000000000
+0200
@@ -1,3 +1,8 @@
+# 1.0.7 -- 2019-??-??
+
+* Make `Distribution.Extra.Doctest` `-Wall`-clean
+* Support GHC-8.8, base-4.13, and Cabal-3.0
+
# 1.0.6 -- 2018-01-28
* Hook `haddock` build too. Fixes issue when `haddock` fails, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-doctest-1.0.6/README.md
new/cabal-doctest-1.0.7/README.md
--- old/cabal-doctest-1.0.6/README.md 2018-01-28 16:56:55.000000000 +0100
+++ new/cabal-doctest-1.0.7/README.md 2001-09-09 03:46:40.000000000 +0200
@@ -192,7 +192,7 @@
`defaultMainAutoconfWithDoctests` function to make custom `Setup.hs` script.
* If you use the default `.` in `hs-source-dirs`, then running `doctests`
- might fail with weird errors (ambigious module errors). Workaround is
+ 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cabal-doctest-1.0.6/cabal-doctest.cabal
new/cabal-doctest-1.0.7/cabal-doctest.cabal
--- old/cabal-doctest-1.0.6/cabal-doctest.cabal 2018-01-28 16:56:55.000000000
+0100
+++ new/cabal-doctest-1.0.7/cabal-doctest.cabal 2001-09-09 03:46:40.000000000
+0200
@@ -1,5 +1,5 @@
name: cabal-doctest
-version: 1.0.6
+version: 1.0.7
synopsis: A Setup.hs helper for doctests running
description:
Currently (beginning of 2017), there isn't @cabal doctest@
@@ -27,7 +27,10 @@
GHC==7.8.4,
GHC==7.10.3,
GHC==8.0.2,
- GHC==8.2.2
+ GHC==8.2.2,
+ GHC==8.4.4,
+ GHC==8.6.5,
+ GHC==8.8.1
source-repository head
type: git
@@ -38,9 +41,13 @@
other-modules:
other-extensions:
build-depends:
- base >=4.3 && <4.11,
- Cabal >= 1.10 && <2.1,
+ base >=4.3 && <4.14,
+ Cabal >= 1.10 && <3.1,
filepath,
directory
hs-source-dirs: src
default-language: Haskell2010
+ ghc-options: -Wall
+ if !impl(ghc >= 7.2)
+ -- Work around a pattern-match coverage checking bug in GHC 7.0
+ ghc-options: -fno-warn-overlapping-patterns
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cabal-doctest-1.0.6/src/Distribution/Extra/Doctest.hs
new/cabal-doctest-1.0.7/src/Distribution/Extra/Doctest.hs
--- old/cabal-doctest-1.0.6/src/Distribution/Extra/Doctest.hs 2018-01-28
16:56:55.000000000 +0100
+++ new/cabal-doctest-1.0.7/src/Distribution/Extra/Doctest.hs 2001-09-09
03:46:40.000000000 +0200
@@ -56,10 +56,6 @@
(for_)
import qualified Data.Traversable as T
(traverse)
-import qualified Distribution.ModuleName as ModuleName
- (fromString)
-import Distribution.ModuleName
- (ModuleName)
import Distribution.Package
(InstalledPackageId)
import Distribution.Package
@@ -69,8 +65,6 @@
PackageDescription (), TestSuite (..))
import Distribution.Simple
(UserHooks (..), autoconfUserHooks, defaultMainWithHooks,
simpleUserHooks)
-import Distribution.Simple.BuildPaths
- (autogenModulesDir)
import Distribution.Simple.Compiler
(PackageDB (..), showCompilerId)
import Distribution.Simple.LocalBuildInfo
@@ -79,17 +73,19 @@
import Distribution.Simple.Setup
(BuildFlags (buildDistPref, buildVerbosity), HaddockFlags
(haddockDistPref, haddockVerbosity), fromFlag, emptyBuildFlags)
import Distribution.Simple.Utils
- (createDirectoryIfMissingVerbose, findFile, rewriteFile)
+ (createDirectoryIfMissingVerbose, info)
import Distribution.Text
(display, simpleParse)
import System.FilePath
- ((</>), (<.>), dropExtension)
+ ((</>))
import Data.IORef (newIORef, modifyIORef, readIORef)
-#if MIN_VERSION_Cabal(1,25,0)
import Distribution.Simple.BuildPaths
+#if MIN_VERSION_Cabal(1,25,0)
(autogenComponentModulesDir)
+#else
+ (autogenModulesDir)
#endif
#if MIN_VERSION_Cabal(2,0,0)
import Distribution.Types.MungedPackageId
@@ -104,6 +100,16 @@
(CondTree (..))
#endif
+#if MIN_VERSION_Cabal(3,0,0)
+import Distribution.Simple.Utils (findFileEx)
+#else
+import Distribution.Simple.Utils (findFile)
+#endif
+
+#if MIN_VERSION_Cabal(3,0,0)
+import Distribution.Types.LibraryName (libraryNameString)
+#endif
+
#if MIN_VERSION_directory(1,2,2)
import System.Directory
(makeAbsolute)
@@ -120,6 +126,11 @@
return $ cwd </> p
#endif
+#if !MIN_VERSION_Cabal(3,0,0)
+findFileEx :: verbosity -> [FilePath] -> FilePath -> IO FilePath
+findFileEx _ = findFile
+#endif
+
-- | A default main with doctests:
--
-- @
@@ -233,6 +244,7 @@
-- First, we create the autogen'd module Build_doctests.
-- Initially populate Build_doctests with a simple preamble.
+ info verbosity $ "cabal-doctest: writing Build_doctests to " ++
buildDoctestsFile
writeFile buildDoctestsFile $ unlines
[ "module Build_doctests where"
, ""
@@ -306,7 +318,7 @@
-- even though the main-is module is named Main, its filepath might
-- actually be Something.hs. To account for this possibility, we
simply
-- pass the full path to the main-is module instead.
- mainIsPath <- T.traverse (findFile iArgsNoPrefix) (compMainIs comp)
+ mainIsPath <- T.traverse (findFileEx verbosity iArgsNoPrefix)
(compMainIs comp)
let all_sources = map display module_sources
++ additionalModules
@@ -334,8 +346,8 @@
getBuildDoctests withExeLBI (NameExe . executableName) (const [])
(Just . modulePath) buildInfo
components <- readIORef componentsRef
- F.for_ components $ \(Component name pkgs flags sources) -> do
- let compSuffix = nameToString name
+ F.for_ components $ \(Component cmpName cmpPkgs cmpFlags cmpSources) -> do
+ let compSuffix = nameToString cmpName
pkgs_comp = "pkgs" ++ compSuffix
flags_comp = "flags" ++ compSuffix
module_sources_comp = "module_sources" ++ compSuffix
@@ -344,13 +356,13 @@
appendFile buildDoctestsFile $ unlines
[ -- -package-id etc. flags
pkgs_comp ++ " :: [String]"
- , pkgs_comp ++ " = " ++ show pkgs
+ , pkgs_comp ++ " = " ++ show cmpPkgs
, ""
, flags_comp ++ " :: [String]"
- , flags_comp ++ " = " ++ show flags
+ , flags_comp ++ " = " ++ show cmpFlags
, ""
, module_sources_comp ++ " :: [String]"
- , module_sources_comp ++ " = " ++ show sources
+ , module_sources_comp ++ " = " ++ show cmpSources
, ""
]
@@ -432,7 +444,9 @@
isSpecific _ = False
mbLibraryName :: Library -> Name
-#if MIN_VERSION_Cabal(2,0,0)
+#if MIN_VERSION_Cabal(3,0,0)
+ mbLibraryName = NameLib . fmap unUnqualComponentName . libraryNameString .
libName
+#elif MIN_VERSION_Cabal(2,0,0)
-- Cabal-2.0 introduced internal libraries, which are named.
mbLibraryName = NameLib . fmap unUnqualComponentName . libName
#else
