terminfo 0.4.1.2 → 0.4.1.3
raw patch · 5 files changed
+26/−31 lines, 5 filesdep ~base
Dependency ranges changed: base
Files
- Changelog +5/−0
- LICENSE +14/−11
- System/Console/Terminfo/Base.hs +4/−14
- configure.ac +0/−3
- terminfo.cabal +3/−3
+ Changelog view
@@ -0,0 +1,5 @@+Changed in version 0.4.1.3:++- Switch the `LICENSE` file to BSD3 (#6).+- Increase the lower bound to `base>=4.9` (`ghc>=8.0.1`).+- Remove the obsolete `--with-cc` configure flag (#12).
LICENSE view
@@ -1,23 +1,26 @@ Copyright 2007, Judah Jacobson.-All Rights Reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -- Redistribution of source code must retain the above copyright notice,-this list of conditions and the following disclamer.+1. Redistributions of source code must retain the above copyright notice, this+list of conditions and the following disclaimer. -- Redistribution in binary form must reproduce the above copyright notice,-this list of conditions and the following disclamer in the documentation+2. Redistributions in binary form must reproduce the above copyright notice,+this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND ANY-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED+3. Neither the name of the copyright holder nor the names of its contributors+may be used to endorse or promote products derived from this software without+specific prior written permission.++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE CONTRIBUTORS BE LIABLE+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR-SERVICES; LOSS OF USE, DATA OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
System/Console/Terminfo/Base.hs view
@@ -1,7 +1,7 @@-{-# LANGUAGE CPP, DeriveDataTypeable, FlexibleInstances, ScopedTypeVariables #-}-#if __GLASGOW_HASKELL__ >= 703+{-# LANGUAGE DeriveDataTypeable #-}+{-# LANGUAGE FlexibleInstances #-}+{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE Trustworthy #-}-#endif -- | -- Maintainer : judah.jacobson@gmail.com -- Stability : experimental@@ -45,11 +45,7 @@ import Control.Applicative import Control.Monad-#if MIN_VERSION_base(4,9,0)-import Data.Semigroup-#elif !MIN_VERSION_base(4,8,0)-import Data.Monoid-#endif+import Data.Semigroup (Semigroup(..)) import Foreign.C import Foreign.ForeignPtr import Foreign.Ptr@@ -142,18 +138,12 @@ data TermOutputType = TOCmd LinesAffected String | TOStr String -#if MIN_VERSION_base(4,9,0) instance Semigroup TermOutput where TermOutput xs <> TermOutput ys = TermOutput (xs . ys) instance Monoid TermOutput where mempty = TermOutput id mappend = (<>)-#else-instance Monoid TermOutput where- mempty = TermOutput id- TermOutput xs `mappend` TermOutput ys = TermOutput (xs . ys)-#endif termText :: String -> TermOutput termText str = TermOutput (TOStr str :)
configure.ac view
@@ -13,9 +13,6 @@ TERMINFO_LIB_DIRS=$curses_libraries fi -AC_ARG_WITH([cc],- [C compiler],- [CC=$withval]) AC_PROG_CC() AC_CHECK_LIB(tinfow, setupterm, HaveLibCurses=YES; LibCurses=tinfow,
terminfo.cabal view
@@ -1,6 +1,6 @@ Name: terminfo Cabal-Version: >=1.10-Version: 0.4.1.2+Version: 0.4.1.3 Category: User Interfaces License: BSD3 License-File: LICENSE@@ -16,7 +16,7 @@ Stability: Stable Build-type: Configure -extra-source-files: configure.ac configure terminfo.buildinfo.in+extra-source-files: configure.ac configure terminfo.buildinfo.in Changelog extra-tmp-files: config.log config.status autom4te.cache terminfo.buildinfo Source-Repository head@@ -28,7 +28,7 @@ other-extensions: CPP, DeriveDataTypeable, FlexibleInstances, ScopedTypeVariables if impl(ghc>=7.3) other-extensions: Safe, Trustworthy- build-depends: base >= 4.3 && < 4.13+ build-depends: base >= 4.9 && < 4.13 ghc-options: -Wall exposed-modules: System.Console.Terminfo