update to 1.6.8.3

This commit is contained in:
Jens Petersen 2017-03-10 22:16:54 +09:00
parent 850f2f5158
commit ca3daa1177
4 changed files with 7 additions and 20 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/shelly-1.6.8.1.tar.gz
/constraints-0.9.tar.gz
/lifted-async-0.9.1.1.tar.gz
/shelly-1.6.8.3.tar.gz

View File

@ -1,13 +0,0 @@
diff --git a/src/Shelly/Pipe.hs b/src/Shelly/Pipe.hs
index 7fe7d98..7f3ff4c 100644
--- a/src/Shelly/Pipe.hs
+++ b/src/Shelly/Pipe.hs
@@ -119,8 +119,6 @@ import Data.Tree(Tree)
import Data.Text as T hiding (concat, all, find, cons)
-default (T.Text)
-
-- | This type is a simple wrapper for a type @Shelly.Sh@.
-- 'Sh' contains a list of results.

View File

@ -11,7 +11,7 @@
%bcond_with tests
Name: ghc-%{pkg_name}
Version: 1.6.8.1
Version: 1.6.8.3
# can only be reset when all subpkgs bumped
Release: 1%{?dist}
Summary: Shell-like systems programming in Haskell
@ -21,7 +21,6 @@ Url: https://hackage.haskell.org/package/%{pkg_name}
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
Source1: https://hackage.haskell.org/package/%{liftedasync}/%{liftedasync}.tar.gz
Source2: https://hackage.haskell.org/package/%{constraints}/%{constraints}.tar.gz
Patch1: https://github.com/k0001/Shelly.hs/commit/32a1e290961755e7b2379f59faa49b13d03dfef6.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra
@ -92,8 +91,7 @@ This package provides the Haskell %{pkg_name} library development files.
%prep
%setup -q -n %{pkgver} -a1 -a2
%patch1 -p1 -b .orig
cabal-tweak-dep-ver directory '< 1.3' '< 1.4'
%build
%ghc_libs_build %{subpkgs}
@ -127,6 +125,9 @@ cabal-tweak-dep-ver directory '< 1.3' '< 1.4'
%changelog
* Fri Mar 10 2017 Jens Petersen <petersen@redhat.com> - 1.6.8.3-1
- update to 1.6.8.3
* Thu Feb 23 2017 Jens Petersen <petersen@redhat.com> - 1.6.8.1-1
- update to 1.6.8.1
- subpackage lifted-async and constraints

View File

@ -1,3 +1 @@
SHA512 (constraints-0.9.tar.gz) = c2e9a04c44e83e422082ee83ddbc826f37a5bbe54f0ddbcbc05bb4953d62d6093d3ba1ec6d8dc92729fff8dce9f2664201d63f4434780db621e2ce94e8ec3acc
SHA512 (lifted-async-0.9.1.1.tar.gz) = c8e3d3e6bcfb361b5fe1bd948d21f8d2087e18b2f035557564e94fb444fae64baf0302d3938c5ca31f8a68a2fd5e7fb1389f1a318c3a2b447facee823511b5ad
SHA512 (shelly-1.6.8.1.tar.gz) = 76ab37289a9b6c51ecb6d5326161b326a4015ed27f6c61cd889d4dbf8f6417e6629d0059fdf65ec40f4093cb921ea3b4871105ccd77c94f863c2a087e3c2fab6
SHA512 (shelly-1.6.8.3.tar.gz) = 7dea447bd7cac45e4725979b714c706e24d94d3853343284d468c4e8aebf3ffc50ea5efc44349bfb4e5d4405373e5c4667ef67e1b11add245f5430c7e76577f8