update to 1.10.0

refresh to cabal-rpm-2.1.0 with SPDX migration
This commit is contained in:
Jens Petersen 2023-01-23 01:39:13 +08:00
parent 32f3e3d72d
commit b2e1eaf39d
5 changed files with 265 additions and 223 deletions

3
.gitignore vendored
View File

@ -19,3 +19,6 @@
/type-equality-1.tar.gz /type-equality-1.tar.gz
/lifted-async-0.10.2.tar.gz /lifted-async-0.10.2.tar.gz
/constraints-0.12.tar.gz /constraints-0.12.tar.gz
/shelly-1.10.0.tar.gz
/lifted-async-0.10.2.3.tar.gz
/constraints-0.13.4.tar.gz

View File

@ -1,23 +1,23 @@
# generated by cabal-rpm-2.0.9 --subpackage # generated by cabal-rpm-2.1.0 --subpackage
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
%global pkg_name shelly %global pkg_name shelly
%global pkgver %{pkg_name}-%{version} %global pkgver %{pkg_name}-%{version}
%global liftedasync lifted-async-0.10.2 %global liftedasync lifted-async-0.10.2.3
%global constraints constraints-0.12 %global constraints constraints-0.13.4
%global typeequality type-equality-1 %global typeequality type-equality-1
%global subpkgs %{typeequality} %{constraints} %{liftedasync} %global subpkgs %{typeequality} %{constraints} %{liftedasync}
# testsuite missing deps: hspec-contrib # testsuite missing deps: hspec-contrib
Name: ghc-%{pkg_name} Name: ghc-%{pkg_name}
Version: 1.9.0 Version: 1.10.0
# can only be reset when all subpkgs bumped # can only be reset when all subpkgs bumped
Release: 9%{?dist} Release: 10%{?dist}
Summary: Shell-like (systems) programming in Haskell Summary: Shell-like (systems) programming in Haskell
License: BSD License: BSD-3-Clause
Url: https://hackage.haskell.org/package/%{pkg_name} Url: https://hackage.haskell.org/package/%{pkg_name}
# Begin cabal-rpm sources: # Begin cabal-rpm sources:
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
@ -30,6 +30,25 @@ Source4: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#
# Begin cabal-rpm deps: # Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-rpm-macros-extra
BuildRequires: ghc-async-devel
BuildRequires: ghc-base-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-directory-devel
BuildRequires: ghc-enclosed-exceptions-devel
BuildRequires: ghc-exceptions-devel
BuildRequires: ghc-filepath-devel
#BuildRequires: ghc-lifted-async-devel
BuildRequires: ghc-lifted-base-devel
BuildRequires: ghc-monad-control-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-process-devel
BuildRequires: ghc-text-devel
BuildRequires: ghc-time-devel
BuildRequires: ghc-transformers-devel
BuildRequires: ghc-transformers-base-devel
BuildRequires: ghc-unix-compat-devel
%if %{with ghc_prof}
BuildRequires: ghc-async-prof BuildRequires: ghc-async-prof
BuildRequires: ghc-base-prof BuildRequires: ghc-base-prof
BuildRequires: ghc-bytestring-prof BuildRequires: ghc-bytestring-prof
@ -47,14 +66,19 @@ BuildRequires: ghc-text-prof
BuildRequires: ghc-time-prof BuildRequires: ghc-time-prof
BuildRequires: ghc-transformers-prof BuildRequires: ghc-transformers-prof
BuildRequires: ghc-transformers-base-prof BuildRequires: ghc-transformers-base-prof
BuildRequires: ghc-unix-prof
BuildRequires: ghc-unix-compat-prof BuildRequires: ghc-unix-compat-prof
%endif
# for missing dep 'constraints': # for missing dep 'constraints':
BuildRequires: ghc-binary-devel
BuildRequires: ghc-deepseq-devel
BuildRequires: ghc-hashable-devel
BuildRequires: ghc-transformers-compat-devel
%if %{with ghc_prof}
BuildRequires: ghc-binary-prof BuildRequires: ghc-binary-prof
BuildRequires: ghc-deepseq-prof BuildRequires: ghc-deepseq-prof
BuildRequires: ghc-hashable-prof BuildRequires: ghc-hashable-prof
BuildRequires: ghc-semigroups-prof
BuildRequires: ghc-transformers-compat-prof BuildRequires: ghc-transformers-compat-prof
%endif
# End cabal-rpm deps # End cabal-rpm deps
%description %description
@ -113,9 +137,9 @@ This package provides the Haskell %{pkg_name} profiling library.
%global main_version %{version} %global main_version %{version}
%if %{defined ghclibdir} %if %{defined ghclibdir}
%ghc_lib_subpackage %{liftedasync} %ghc_lib_subpackage -l BSD-3-Clause %{liftedasync}
%ghc_lib_subpackage %{constraints} %ghc_lib_subpackage -l BSD-2-Clause %{constraints}
%ghc_lib_subpackage %{typeequality} %ghc_lib_subpackage -l BSD-3-Clause %{typeequality}
%endif %endif
%global version %{main_version} %global version %{main_version}
@ -127,7 +151,7 @@ This package provides the Haskell %{pkg_name} profiling library.
cp -bp %{SOURCE4} %{pkg_name}.cabal cp -bp %{SOURCE4} %{pkg_name}.cabal
# End cabal-rpm setup # End cabal-rpm setup
( cd %{typeequality} ( cd %{typeequality}
cabal-tweak-dep-ver base '<4.14' '<4.16' cabal-tweak-dep-ver base '<4.14' '<4.17'
) )
@ -142,7 +166,6 @@ cp -bp %{SOURCE4} %{pkg_name}.cabal
# Begin cabal-rpm install # Begin cabal-rpm install
%ghc_libs_install %{subpkgs} %ghc_libs_install %{subpkgs}
%ghc_lib_install %ghc_lib_install
%ghc_fix_rpath %{pkgver}
# End cabal-rpm install # End cabal-rpm install
@ -168,6 +191,10 @@ cp -bp %{SOURCE4} %{pkg_name}.cabal
%changelog %changelog
* Sun Jan 22 2023 Jens Petersen <petersen@redhat.com> - 1.10.0-10
- https://hackage.haskell.org/package/shelly-1.10.0/changelog
- refresh to cabal-rpm-2.1.0 with SPDX migration
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-9 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

219
shelly-1.10.0.cabal Normal file
View File

@ -0,0 +1,219 @@
Name: shelly
Version: 1.10.0
x-revision: 1
Synopsis: shell-like (systems) programming in Haskell
Description: Shelly provides convenient systems programming in Haskell,
similar in spirit to POSIX shells. Shelly:
.
* is aimed at convenience and getting things done rather than
being a demonstration of elegance,
.
* has detailed and useful error messages,
.
* maintains its own environment, making it thread-safe.
.
Shelly is originally forked from the Shellish package.
.
See the shelly-extra package for additional functionality.
.
An overview is available in the README: <https://github.com/yesodweb/Shelly.hs/blob/master/README.md>
Homepage: https://github.com/yesodweb/Shelly.hs
License: BSD3
License-file: LICENSE
Author: Greg Weber, Petr Rockai
Maintainer: Greg Weber <greg@gregweber.info>, Andreas Abel
Category: Development
Build-type: Simple
Cabal-version: >=1.10
tested-with:
GHC == 8.0.2
GHC == 8.2.2
GHC == 8.4.4
GHC == 8.6.5
GHC == 8.8.4
GHC == 8.10.7
GHC == 9.0.2
GHC == 9.2.2
-- for the sdist of the test suite
extra-source-files:
test/src/*.hs
test/examples/*.sh
test/examples/*.hs
test/data/zshrc
test/data/nonascii.txt
test/data/symlinked_dir/hoge_file
test/testall
README.md
ChangeLog.md
Library
Exposed-modules:
Shelly
Shelly.Lifted
Shelly.Pipe
Shelly.Unix
other-modules:
Shelly.Base
Shelly.Find
Shelly.Directory
hs-source-dirs: src
-- Andreas Abel, 2021-11-20:
-- Unless other constraints exist, lower bounds are chosen
-- such that all versions that build with GHC 8
-- (according to matrix.hackage.haskell.org) are included.
Build-depends:
base >= 4.9 && < 5
-- support GHC >= 8
, async
, bytestring >= 0.10.6.0
, containers >= 0.5.7.0
, directory >= 1.3.0.0 && < 1.4.0.0
, enclosed-exceptions
, exceptions >= 0.8.2.1
, filepath
, lifted-async
, lifted-base >= 0.2.3.2
, monad-control >= 0.3.2 && < 1.1
, mtl >= 2.2.2
, process >= 1.4
, text >= 1.2.2.0
, time >= 1.3 && < 1.13
, transformers >= 0.5.0.0
, transformers-base
, unix-compat >= 0.4.1.1 && < 0.7
ghc-options:
-Wall
-Wcompat
cpp-options:
-DNO_PRELUDE_CATCH
default-language: Haskell2010
default-extensions:
CPP
source-repository head
type: git
location: https://github.com/yesodweb/Shelly.hs
Flag lifted
Description: run the tests against Shelly.Lifted
Default: False
Test-Suite shelly-testsuite
type: exitcode-stdio-1.0
hs-source-dirs: test/src
main-is: TestMain.hs
other-modules:
CopySpec
EnvSpec
FailureSpec
FindSpec
Help
LiftedSpec
MoveSpec
ReadFileSpec
RmSpec
RunSpec
SshSpec
TestInit
WhichSpec
WriteSpec
ghc-options:
-threaded
-Wall
-Wcompat
-fwarn-tabs
-funbox-strict-fields
-fno-warn-type-defaults
default-language: Haskell2010
default-extensions:
OverloadedStrings
ExtendedDefaultRules
if flag(lifted)
cpp-options: -DLIFTED
build-depends:
shelly
, base
, bytestring
, directory
, filepath
, lifted-async
, mtl
, text
, transformers
, unix-compat
-- additional dependencies
, hspec >= 2.2.2
, hspec-contrib
, HUnit >= 1.2.5.2
default-extensions:
CPP
Flag build-examples
Description: build some example programs
Default: False
Manual: True
-- demonstrated that command output in Shellish was not shown until after the command finished
-- not necessary anymore
Executable drain
hs-source-dirs: test/examples
main-is: drain.hs
default-language: Haskell2010
if flag(build-examples)
buildable: True
build-depends: base
, shelly
, text
default-extensions:
CPP
else
buildable: False
Executable run-handles
hs-source-dirs: test/examples
main-is: run-handles.hs
default-language: Haskell2010
if flag(build-examples)
buildable: True
build-depends: base
, shelly
, text
default-extensions:
CPP
else
buildable: False
Executable Color
hs-source-dirs: test/examples
main-is: color.hs
default-language: Haskell2010
if flag(build-examples)
buildable: True
build-depends: base
, process
, shelly
, text
else
buildable: False

View File

@ -1,207 +0,0 @@
Name: shelly
Version: 1.9.0
x-revision: 3
Synopsis: shell-like (systems) programming in Haskell
Description: Shelly provides convenient systems programming in Haskell,
similar in spirit to POSIX shells. Shelly:
.
* is aimed at convenience and getting things done rather than
being a demonstration of elegance.
.
* has detailed and useful error messages
.
* maintains its own environment, making it thread-safe.
.
* is modern, using Text filepath/directory
.
Shelly is originally forked from the Shellish package.
.
See the shelly-extra package for additional functionality.
.
An overview is available in the README: <https://github.com/yesodweb/Shelly.hs/blob/master/README.md>
Homepage: https://github.com/yesodweb/Shelly.hs
License: BSD3
License-file: LICENSE
Author: Greg Weber, Petr Rockai
Maintainer: Greg Weber <greg@gregweber.info>
Category: Development
Build-type: Simple
Cabal-version: >=1.8
-- for the sdist of the test suite
extra-source-files: test/src/*.hs
test/examples/*.sh
test/examples/*.hs
test/data/zshrc
test/data/nonascii.txt
test/data/symlinked_dir/hoge_file
test/testall
README.md
ChangeLog.md
Library
Exposed-modules: Shelly, Shelly.Lifted, Shelly.Pipe, Shelly.Unix
other-modules: Shelly.Base, Shelly.Find, Shelly.Directory
hs-source-dirs: src
Build-depends:
containers >= 0.4.2.0,
time >= 1.3 && < 1.13,
directory >= 1.3.0.0 && < 1.4.0.0,
mtl >= 2,
process >= 1.0,
unix-compat < 0.6,
unix,
filepath,
monad-control >= 0.3.2 && < 1.1,
lifted-base,
lifted-async,
exceptions >= 0.6,
enclosed-exceptions,
text,
bytestring,
async,
transformers < 0.6,
-- ListT disappeared from transformers in 0.6
transformers-base
build-depends: base >= 4.9
if impl(ghc >= 7.6.1)
build-depends:
base >= 4.6 && < 5
else
build-depends:
base >= 4 && < 5
ghc-options: -Wall
if impl(ghc >= 7.6.1)
CPP-Options: -DNO_PRELUDE_CATCH
extensions:
CPP
source-repository head
type: git
location: https://github.com/yesodweb/Shelly.hs
Flag lifted
Description: run the tests against Shelly.Lifted
Default: False
Test-Suite shelly-testsuite
type: exitcode-stdio-1.0
hs-source-dirs: src test/src
main-is: TestMain.hs
other-modules:
CopySpec
EnvSpec
FailureSpec
FindSpec
Help
LiftedSpec
MoveSpec
ReadFileSpec
RmSpec
RunSpec
SshSpec
Shelly
Shelly.Base
Shelly.Find
Shelly.Lifted
TestInit
WhichSpec
WriteSpec
ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -threaded
-fno-warn-unused-do-bind -fno-warn-type-defaults
extensions: OverloadedStrings, ExtendedDefaultRules
if flag(lifted)
cpp-options: -DLIFTED
build-depends:
base >= 4.6,
text >= 0.11,
async,
bytestring >= 0.10,
containers >= 0.5.0.0,
directory >= 1.3.0.0 && < 1.4.0.0,
process >= 1.1.0,
unix-compat < 0.6,
unix,
time >= 1.3 && < 1.10,
mtl >= 2,
HUnit >= 1.2,
hspec >= 2.0,
hspec-contrib,
transformers,
transformers-base,
filepath,
monad-control,
lifted-base,
lifted-async,
enclosed-exceptions,
exceptions
if impl(ghc < 8.0)
build-depends: fail >= 4.9 && < 4.10
extensions:
CPP
Flag build-examples
Description: build some example programs
Default: False
Manual: True
-- demonstarated that command output in Shellish was not shown until after the command finished
-- not necessary anymore
Executable drain
hs-source-dirs: test/examples
main-is: drain.hs
if flag(build-examples)
buildable: True
build-depends: base >= 4.6
, shelly
, text
extensions:
CPP
else
buildable: False
Executable run-handles
hs-source-dirs: test/examples
main-is: run-handles.hs
if flag(build-examples)
buildable: True
build-depends: base >= 4.6
, shelly
, text
extensions:
CPP
else
buildable: False
Executable Color
hs-source-dirs: test/examples
main-is: color.hs
if flag(build-examples)
buildable: True
build-depends: base >= 4.6
, process
, shelly
, text
else
buildable: False

View File

@ -1,4 +1,4 @@
SHA512 (shelly-1.9.0.tar.gz) = 7c1eb25439e08095187746d0101fd92ad56ebb5a706820bad7330667cfc806066d4675c677e5d267440d4af7b517f36449e8f5e75332521780b564edc1586254 SHA512 (shelly-1.10.0.tar.gz) = b16e410dbf96b33b28069c88375296a6516bb99ec0b35058175bc466da5b400492e96ee3ee18d9208c8a096fd97df573d63cdef1eb26142e74ea13acd02e99ca
SHA512 (lifted-async-0.10.2.3.tar.gz) = b21ab3ccf04de748d3b0bf0ca8ae2c490fdfad4bcc5b9053a196da424923866d58bb735bc208ca600ae2d4d1d66545adc52e0826ba6bb63a7089d4946493e59a
SHA512 (constraints-0.13.4.tar.gz) = 3e4cf62ee897cc103332ae1823552c52568fe090968ee763b83a0cc95c978c6766db02a4cbc4e2c9d6f83d04bb731a91421d5078904847d204e5cc8d8ee59d5f
SHA512 (type-equality-1.tar.gz) = 633675251719afa59c311ae82d18476d6e000fbbdc553a29da598da38a29cf73fffcbcd4b23a70dd397f10734ba6617633390874eea8a563a1e258654a9fe7d8 SHA512 (type-equality-1.tar.gz) = 633675251719afa59c311ae82d18476d6e000fbbdc553a29da598da38a29cf73fffcbcd4b23a70dd397f10734ba6617633390874eea8a563a1e258654a9fe7d8
SHA512 (constraints-0.12.tar.gz) = 9c016cba65315d94fc5516490781f403b93cb928e7a0f2a26164ed5191a3609752fe1ecfa0fdb71ef8057fbafee4e1c13257b0148c0f851d0e337b804fa2b0dd
SHA512 (lifted-async-0.10.2.tar.gz) = eb2b33693ab1617fdeca934c6ede73c530e578425049804c3a0322a63b5262411453f80cb730dabd338590fc6b3093cd13872b9922f5cda4806741fc74ea63ee