update to upstream snapshot that builds with ghc-8.2

This commit is contained in:
Jens Petersen 2018-02-05 20:37:33 +09:00
parent f9bb00326a
commit 80738e2af8
3 changed files with 25 additions and 11 deletions

3
.gitignore vendored
View File

@ -27,3 +27,6 @@ darcs-2.4.4.tar.gz
/wl-pprint-text-1.1.1.0.tar.gz
/fgl-5.5.4.0.tar.gz
/sandi-0.4.1.tar.gz
/knob-0.1.1.tar.gz
/graphviz-2999.19.0.0.tar.gz
/darcs-2.13.0.tar.gz

View File

@ -6,29 +6,32 @@
%global dataordlist data-ordlist-0.4.7.0
%global fgl fgl-5.5.4.0
%global graphviz graphviz-2999.18.1.2
%global graphviz graphviz-2999.19.0.0
%global regexapplicative regex-applicative-0.3.3
%global regexcompattdfa regex-compat-tdfa-0.95.1.4
%global wlpprinttext wl-pprint-text-1.1.1.0
%global subpkgs %{dataordlist} %{wlpprinttext} %{fgl} %{graphviz} %{regexapplicative} %{regexcompattdfa}
%global knob knob-0.1.1
%global subpkgs %{dataordlist} %{wlpprinttext} %{fgl} %{graphviz} %{regexapplicative} %{regexcompattdfa} %{knob}
%bcond_with tests
Name: %{pkg_name}
Version: 2.12.5
Version: 2.13.0
# can only be reset when all subpkgs bumped
Release: 11%{?dist}
Release: 12%{?dist}
Summary: Distributed Advanced Revision Control System
License: GPLv2+
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
#Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
Source0: darcs-2.13.0.tar.gz
Source1: https://hackage.haskell.org/package/%{dataordlist}/%{dataordlist}.tar.gz
Source2: https://hackage.haskell.org/package/%{fgl}/%{fgl}.tar.gz
Source3: https://hackage.haskell.org/package/%{graphviz}/%{graphviz}.tar.gz
Source4: https://hackage.haskell.org/package/%{regexapplicative}/%{regexapplicative}.tar.gz
Source5: https://hackage.haskell.org/package/%{regexcompattdfa}/%{regexcompattdfa}.tar.gz
Source6: https://hackage.haskell.org/package/%{wlpprinttext}/%{wlpprinttext}.tar.gz
Source7: https://hackage.haskell.org/package/%{knob}/%{knob}.tar.gz
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra
@ -51,6 +54,7 @@ BuildRequires: ghc-filepath-devel
BuildRequires: ghc-hashable-devel
BuildRequires: ghc-haskeline-devel
BuildRequires: ghc-html-devel
#BuildRequires: ghc-knob-devel
BuildRequires: ghc-mmap-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-network-devel
@ -63,10 +67,10 @@ BuildRequires: ghc-random-devel
#BuildRequires: ghc-regex-compat-tdfa-devel
BuildRequires: ghc-sandi-devel
BuildRequires: ghc-tar-devel
BuildRequires: ghc-temporary-devel
BuildRequires: ghc-terminfo-devel
BuildRequires: ghc-text-devel
BuildRequires: ghc-time-devel
BuildRequires: ghc-transformers-compat-devel
BuildRequires: ghc-transformers-devel
BuildRequires: ghc-unix-compat-devel
BuildRequires: ghc-unix-devel
@ -148,13 +152,14 @@ This package provides the Haskell %{name} library development files.
%ghc_lib_subpackage %{regexapplicative}
%ghc_lib_subpackage %{regexcompattdfa}
%ghc_lib_subpackage %{wlpprinttext}
%ghc_lib_subpackage %{knob}
%endif
%global version %{main_version}
%prep
%setup -q -n %{pkgver} -a1 -a2 -a3 -a4 -a5 -a6
%setup -q -n %{pkgver} -a1 -a2 -a3 -a4 -a5 -a6 -a7
%ifnarch %{ix86} x86_64 ppc
cabal-tweak-flag threaded False
%endif
@ -204,6 +209,11 @@ install -Dpm 644 contrib/darcs_completion %{buildroot}%{_datadir}/bash-completio
%changelog
* Mon Feb 5 2018 Jens Petersen <petersen@redhat.com> - 2.13.0-12
- update to 2018-01-24 snapshot which builds with ghc-8.2
- update to graphviz-2999.19.0.0
- subpackage new dep knob
* Tue Oct 10 2017 Jens Petersen <petersen@redhat.com> - 2.12.5-11
- rebuild

View File

@ -1,7 +1,8 @@
SHA512 (wl-pprint-text-1.1.1.0.tar.gz) = 16a265846b6f116b8e53b691875afab2e40c6c75dabd6ed74d2bc23aab8241208236aba880cb1b45b15dc2d3b0e1654f0187d8492145147922ee6ff4a36009fd
SHA512 (darcs-2.13.0.tar.gz) = b0fa53203af9ea5da86d7862aaccd9b7ba391a9461719596c41ef5c07dde1b103ff7c8b6440a2e7112e9309820c41a437ccf26aa888e2f6f3d9386ba3cc10121
SHA512 (data-ordlist-0.4.7.0.tar.gz) = a34ed99ea8eb34b29727a210f7a56c80b18a881e2da90fff0ae056b7c56b1f37212413a1daebc0b0118c193eb579d3d43bd426b25944da9044e8152eed80fa8b
SHA512 (fgl-5.5.4.0.tar.gz) = 3de94b65b878185e9f4790233ac9c37c80e97f4a83bd772f8782410ebaf5d7fcc17b2e17e0eef4fea56ede0066df3ce6b7258faf629ab3b248225cc906ac133f
SHA512 (darcs-2.12.5.tar.gz) = 9bda8149269dc23750321f3929e156e32c76de4f5bb8291bc248d0e326bf08b69c82ef7383f9d02dcc65ca199078f6e1ab575197fc2aee225486a8c1b9275542
SHA512 (graphviz-2999.19.0.0.tar.gz) = 0b49c197ce048f49e7db780168cda6026fec52bde1edd81f8fa41b15a1c89e9b2af2a99cf7892f8b81718d31bd21d207c4b3826cd9e24d29363beb97db99229c
SHA512 (knob-0.1.1.tar.gz) = b13e9a88de99fa941521135c7f61be4ad5b838806e7424ac4b38607d59635ec2ddd6808560f1568f6d974c531185d43b5e1510886e07bcb567b859a12659277b
SHA512 (regex-applicative-0.3.3.tar.gz) = 02358efaa912efd232654a404ef5f7cf825b8852bf2c59fd59122047044fcab5ae28bf26de6818b337d917c594fbe165eec917d88b02723e0b181fe2b57ffbe8
SHA512 (regex-compat-tdfa-0.95.1.4.tar.gz) = 7e387a7713ff8e43cfce4262b1288b85f8b60729162a842186bf6a7e1078dfb9e26013087ff7e9bcf81521f8c352926873bb280b9df57b016aef2ca4ce70aa14
SHA512 (graphviz-2999.18.1.2.tar.gz) = 1e0bc5b72b934febb923c13052f83db12270954e37483f46c64db8a23eb7ea3894b72c8e2cb303cde6bec30f75a28897c53d81e92fe9489ec21a4589e648dd3f
SHA512 (data-ordlist-0.4.7.0.tar.gz) = a34ed99ea8eb34b29727a210f7a56c80b18a881e2da90fff0ae056b7c56b1f37212413a1daebc0b0118c193eb579d3d43bd426b25944da9044e8152eed80fa8b
SHA512 (wl-pprint-text-1.1.1.0.tar.gz) = 16a265846b6f116b8e53b691875afab2e40c6c75dabd6ed74d2bc23aab8241208236aba880cb1b45b15dc2d3b0e1654f0187d8492145147922ee6ff4a36009fd