From de399e8e3bef6f7c7a2914ae886c936ce2b8f684f16a92eb1fb3bf553f32954a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Feb 2022 13:44:54 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-shelly revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-shelly?expand=0&rev=28 --- ghc-shelly.changes | 9 ++ ghc-shelly.spec | 13 +-- shelly-1.10.0.tar.gz | 3 + shelly-1.9.0.tar.gz | 3 - shelly.cabal | 202 ------------------------------------------- 5 files changed, 16 insertions(+), 214 deletions(-) create mode 100644 shelly-1.10.0.tar.gz delete mode 100644 shelly-1.9.0.tar.gz delete mode 100644 shelly.cabal diff --git a/ghc-shelly.changes b/ghc-shelly.changes index b4e69ce..bec62c0 100644 --- a/ghc-shelly.changes +++ b/ghc-shelly.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Feb 4 12:15:10 UTC 2022 - psimons@suse.com + +- Update shelly to version 1.10.0. + Upstream has edited the change log file since the last release in + a non-trivial way, i.e. they did more than just add a new entry + at the top. You can review the file at: + http://hackage.haskell.org/package/shelly-1.10.0/src/ChangeLog.md + ------------------------------------------------------------------- Sat Nov 20 17:30:38 UTC 2021 - psimons@suse.com diff --git a/ghc-shelly.spec b/ghc-shelly.spec index a90fc56..90d4686 100644 --- a/ghc-shelly.spec +++ b/ghc-shelly.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-shelly # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,12 @@ %global pkg_name shelly %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.9.0 +Version: 1.10.0 Release: 0 Summary: Shell-like (systems) programming in Haskell License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-async-devel BuildRequires: ghc-bytestring-devel @@ -45,7 +44,6 @@ BuildRequires: ghc-time-devel BuildRequires: ghc-transformers-base-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-unix-compat-devel -BuildRequires: ghc-unix-devel ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-HUnit-devel @@ -58,14 +56,12 @@ 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. +demonstration of elegance, -* has detailed and useful error messages +* 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. @@ -85,7 +81,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/shelly-1.10.0.tar.gz b/shelly-1.10.0.tar.gz new file mode 100644 index 0000000..f30a211 --- /dev/null +++ b/shelly-1.10.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c54000aff5ed59dc50f75754390c689aedb9792d3b327406caf146983380ff41 +size 73208 diff --git a/shelly-1.9.0.tar.gz b/shelly-1.9.0.tar.gz deleted file mode 100644 index 518f7cc..0000000 --- a/shelly-1.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5eb5fd4fc105e218cef6cfa10971d299ad660324e6a6006b8cccc31edf39aace -size 73344 diff --git a/shelly.cabal b/shelly.cabal deleted file mode 100644 index a2e5baa..0000000 --- a/shelly.cabal +++ /dev/null @@ -1,202 +0,0 @@ -Name: shelly - -Version: 1.9.0 -x-revision: 2 -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: - - -Homepage: https://github.com/yesodweb/Shelly.hs -License: BSD3 -License-file: LICENSE -Author: Greg Weber, Petr Rockai -Maintainer: Greg Weber -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, 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