Hello community,
here is the log from the commit of package ghc-optparse-simple for
openSUSE:Factory checked in at 2020-01-03 17:35:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-optparse-simple (Old)
and /work/SRC/openSUSE:Factory/.ghc-optparse-simple.new.6675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-optparse-simple"
Fri Jan 3 17:35:37 2020 rev:6 rq:760291 version:0.1.1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-optparse-simple/ghc-optparse-simple.changes
2018-07-21 10:22:20.058999257 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-optparse-simple.new.6675/ghc-optparse-simple.changes
2020-01-03 17:35:48.079259227 +0100
@@ -1,0 +2,18 @@
+Sun Dec 29 10:27:17 UTC 2019 - psim...@suse.com
+
+- Update optparse-simple to version 0.1.1.2.
+ # ChangeLog for optparse-simple
+
+ ## 0.1.1.2
+
+ * Run TH slice at the right time to get proper Git info
[#13](https://github.com/fpco/optparse-simple/issues/13)
+
+ ## 0.1.1.1
+
+ * Add explicit signature to work around
[#12](https://github.com/fpco/optparse-simple/issues/12)
+
+ ## 0.1.1
+
+ * Switch dependency `gitrev` to `githash`
+
+-------------------------------------------------------------------
Old:
----
optparse-simple-0.1.0.tar.gz
New:
----
optparse-simple-0.1.1.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-optparse-simple.spec ++++++
--- /var/tmp/diff_new_pack.0fbwua/_old 2020-01-03 17:35:49.423259917 +0100
+++ /var/tmp/diff_new_pack.0fbwua/_new 2020-01-03 17:35:49.427259919 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-optparse-simple
#
-# 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
@@ -12,22 +12,21 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global pkg_name optparse-simple
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.1.0
+Version: 0.1.1.2
Release: 0
Summary: Simple interface to optparse-applicative
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
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-gitrev-devel
+BuildRequires: ghc-githash-devel
BuildRequires: ghc-optparse-applicative-devel
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-template-haskell-devel
@@ -42,7 +41,6 @@
%package devel
Summary: Haskell %{pkg_name} library development files
-Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
++++++ optparse-simple-0.1.0.tar.gz -> optparse-simple-0.1.1.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/optparse-simple-0.1.0/ChangeLog.md
new/optparse-simple-0.1.1.2/ChangeLog.md
--- old/optparse-simple-0.1.0/ChangeLog.md 2017-11-28 10:33:56.000000000
+0100
+++ new/optparse-simple-0.1.1.2/ChangeLog.md 2019-04-23 10:51:36.000000000
+0200
@@ -1,3 +1,17 @@
+# ChangeLog for optparse-simple
+
+## 0.1.1.2
+
+* Run TH slice at the right time to get proper Git info
[#13](https://github.com/fpco/optparse-simple/issues/13)
+
+## 0.1.1.1
+
+* Add explicit signature to work around
[#12](https://github.com/fpco/optparse-simple/issues/12)
+
+## 0.1.1
+
+* Switch dependency `gitrev` to `githash`
+
## 0.1.0
* Migrate from `EitherT` to `ExceptT`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/optparse-simple-0.1.0/example/Simple.hs
new/optparse-simple-0.1.1.2/example/Simple.hs
--- old/optparse-simple-0.1.0/example/Simple.hs 1970-01-01 01:00:00.000000000
+0100
+++ new/optparse-simple-0.1.1.2/example/Simple.hs 2018-12-25
06:15:33.000000000 +0100
@@ -0,0 +1,8 @@
+{-# LANGUAGE TemplateHaskell #-}
+module Main (main) where
+
+import Options.Applicative.Simple (simpleVersion)
+import qualified Paths_optparse_simple as Meta
+
+main :: IO ()
+main = putStrLn $(simpleVersion Meta.version)
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/optparse-simple-0.1.0/optparse-simple.cabal
new/optparse-simple-0.1.1.2/optparse-simple.cabal
--- old/optparse-simple-0.1.0/optparse-simple.cabal 2017-11-28
10:34:07.000000000 +0100
+++ new/optparse-simple-0.1.1.2/optparse-simple.cabal 2019-04-23
10:53:45.000000000 +0200
@@ -1,11 +1,13 @@
--- This file has been generated from package.yaml by hpack version 0.20.0.
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.31.1.
--
-- see: https://github.com/sol/hpack
--
--- hash: 5955f8eb9562e24b8a68ecf2cb4c0674a9de7508574a10a44469d8e88bbebdb9
+-- hash: fa55f93c89cb6aea5dd08d557e397a862c381f89f99d22f74b8699ceb6361534
name: optparse-simple
-version: 0.1.0
+version: 0.1.1.2
synopsis: Simple interface to optparse-applicative
description: Please see the README at
<https://www.stackage.org/package/optparse-simple>
category: Options
@@ -17,32 +19,51 @@
license: BSD3
license-file: LICENSE
build-type: Simple
-cabal-version: >= 1.10
-
extra-source-files:
- ChangeLog.md
README.md
+ ChangeLog.md
source-repository head
type: git
location: https://github.com/fpco/optparse-simple
+flag build-example
+ description: Build the example executable
+ manual: True
+ default: False
+
library
hs-source-dirs:
src/
ghc-options: -Wall
build-depends:
- base >=4 && <5
- , gitrev
+ base >=4.9.1 && <5
+ , githash >=0.1.3.0
, optparse-applicative
, template-haskell
, transformers >=0.4
+ if impl (ghc < 8.0)
+ build-depends:
+ semigroups ==0.18.*
exposed-modules:
Options.Applicative.Simple
other-modules:
Paths_optparse_simple
default-language: Haskell2010
+executable simple
+ main-is: example/Simple.hs
+ other-modules:
+ Paths_optparse_simple
+ build-depends:
+ base >=4.9.1 && <5
+ , optparse-simple
+ if flag(build-example)
+ buildable: True
+ else
+ buildable: False
+ default-language: Haskell2010
+
test-suite test
type: exitcode-stdio-1.0
main-is: Main.hs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/optparse-simple-0.1.0/src/Options/Applicative/Simple.hs
new/optparse-simple-0.1.1.2/src/Options/Applicative/Simple.hs
--- old/optparse-simple-0.1.0/src/Options/Applicative/Simple.hs 2017-11-28
10:33:56.000000000 +0100
+++ new/optparse-simple-0.1.1.2/src/Options/Applicative/Simple.hs
2019-04-23 10:50:13.000000000 +0200
@@ -1,4 +1,8 @@
+-- Try to ensure that https://github.com/fpco/optparse-simple/issues/12
doesn't recur.
+{-# LANGUAGE OverloadedStrings #-}
+
{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE CPP #-}
-- | Simple interface to program arguments.
--
@@ -41,9 +45,11 @@
import Control.Monad.Trans.Class (lift)
import Control.Monad.Trans.Except
import Control.Monad.Trans.Writer
-import Data.Monoid
+#if !MIN_VERSION_base(4,11,0)
+import Data.Semigroup
+#endif
import Data.Version
-import Development.GitRev (gitDirty, gitHash)
+import GitHash (GitInfo, giDirty, giHash, tGitInfoCwdTry)
import Language.Haskell.TH (Q,Exp)
import qualified Language.Haskell.TH.Syntax as TH
import Options.Applicative
@@ -83,15 +89,13 @@
[|concat (["Version "
,$(TH.lift $ showVersion version)
] ++
- if $gitHash == ("UNKNOWN" :: String)
- then []
- else
- [", Git revision "
- ,$gitHash
- ,if $gitDirty
- then " (dirty)"
- else ""
- ])|]
+ case $(TH.unTypeQ tGitInfoCwdTry) :: Either String GitInfo of
+ Left _ -> []
+ Right gi -> [ ", Git revision "
+ , giHash gi
+ , if giDirty gi then " (dirty)" else ""
+ ]
+ )|]
-- | Add a command to the options dispatcher.
addCommand :: String -- ^ command string
