diff --git a/ghc-shelly.changes b/ghc-shelly.changes index 6c371f3..71c867c 100644 --- a/ghc-shelly.changes +++ b/ghc-shelly.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Wed Jan 25 08:58:27 UTC 2023 - Peter Simons + +- Update shelly to version 1.11.0. + # 1.11.0 + + Andreas Abel, 2023-01-24 + * Restore running of local scripts, e.g. `cmd "./foo.sh"`: + Issue [#107](https://github.com/gregwebs/Shelly.hs/issues/107) + fixed by Alfredo di Napoli in PR + [#216](https://github.com/gregwebs/Shelly.hs/pull/216). + * Builds with GHC 8.0 - 9.4. + + # 1.10.0.1 + + Andreas Abel, 2023-01-24 + * Allow `unix-compat-0.6`. + * Builds `-Wall` warning-free with GHC 8.0 - 9.4. + ------------------------------------------------------------------- Sun May 22 16:21:54 UTC 2022 - Peter Simons diff --git a/ghc-shelly.spec b/ghc-shelly.spec index d45d920..b7cb99e 100644 --- a/ghc-shelly.spec +++ b/ghc-shelly.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-shelly # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 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.10.0 +Version: 1.11.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/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-async-devel BuildRequires: ghc-bytestring-devel @@ -68,7 +67,7 @@ Shelly is originally forked from the Shellish package. See the shelly-extra package for additional functionality. An overview is available in the README: -. +. %package devel Summary: Haskell %{pkg_name} library development files @@ -82,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 deleted file mode 100644 index f30a211..0000000 --- a/shelly-1.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c54000aff5ed59dc50f75754390c689aedb9792d3b327406caf146983380ff41 -size 73208 diff --git a/shelly-1.11.0.tar.gz b/shelly-1.11.0.tar.gz new file mode 100644 index 0000000..5e57e53 --- /dev/null +++ b/shelly-1.11.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0c08494a1264a600c7dfe793fe731fbe4d425b9055c318bc831f1701746b16e +size 73410 diff --git a/shelly.cabal b/shelly.cabal deleted file mode 100644 index 7c27b44..0000000 --- a/shelly.cabal +++ /dev/null @@ -1,219 +0,0 @@ -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: - - -Homepage: https://github.com/yesodweb/Shelly.hs -License: BSD3 -License-file: LICENSE -Author: Greg Weber, Petr Rockai -Maintainer: Greg Weber , 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