update to 1.5.2

patch for ghc-7.10
This commit is contained in:
Jens Petersen 2016-10-05 16:58:47 +09:00
parent 5bb8cab306
commit bafbf83e23
4 changed files with 23 additions and 3 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/shelly-1.4.4.2.tar.gz
/shelly-1.5.0.1.tar.gz
/shelly-1.5.2.tar.gz

View File

@ -3,13 +3,14 @@
%global pkg_name shelly
Name: ghc-%{pkg_name}
Version: 1.5.0.1
Release: 6%{?dist}
Version: 1.5.2
Release: 1%{?dist}
Summary: Shell-like systems programming in Haskell
License: BSD
Url: https://hackage.haskell.org/package/%{pkg_name}
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
Patch0: shelly-Alternative.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@ -57,6 +58,7 @@ This package provides the Haskell %{pkg_name} library development files.
%prep
%setup -q -n %{pkg_name}-%{version}
%patch0 -p1 -b .orig
%build
@ -83,6 +85,10 @@ This package provides the Haskell %{pkg_name} library development files.
%changelog
* Wed Oct 5 2016 Jens Petersen <petersen@redhat.com> - 1.5.2-1
- update to 1.5.2
- add Alternative Sh instance
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

13
shelly-Alternative.patch Normal file
View File

@ -0,0 +1,13 @@
--- shelly-1.5.2/src/Shelly/Pipe.hs~ 2014-03-25 12:34:44.000000000 +0900
+++ shelly-1.5.2/src/Shelly/Pipe.hs 2016-10-05 16:54:59.613245757 +0900
@@ -138,6 +138,10 @@
pure = return
(<*>) = ap
+instance Alternative Sh where
+ (<|>) = mplus
+ empty = mzero
+
instance MonadPlus Sh where
mzero = Sh $ return []
mplus a b = Sh $ liftA2 (++) (unSh a) (unSh b)

View File

@ -1 +1 @@
3d715df46497c06386babde5f9bca69d shelly-1.5.0.1.tar.gz
11f1d75b44a11ec9ef0db6e4cdd64df7 shelly-1.5.2.tar.gz