Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
terminfo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Rinat Striungis
terminfo
Commits
f199a165
Unverified
Commit
f199a165
authored
6 years ago
by
Judah Jacobson
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #32 from hvr/pr/base413
Prepare for upcoming base-4.13/ghc-8.8
parents
43fb3384
24b84620
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.travis.yml
+20
-36
20 additions, 36 deletions
.travis.yml
System/Console/Terminfo/Base.hs
+2
-2
2 additions, 2 deletions
System/Console/Terminfo/Base.hs
terminfo.cabal
+1
-1
1 addition, 1 deletion
terminfo.cabal
with
23 additions
and
39 deletions
.travis.yml
+
20
−
36
View file @
f199a165
env
:
# simplified haskell-ci Travis setup
-
GHCVER=7.0.1
# see also https://github.com/haskell-CI/haskell-ci
-
GHCVER=7.0.2
-
GHCVER=7.0.3
-
GHCVER=7.0.4
-
GHCVER=7.2.1
-
GHCVER=7.2.2
-
GHCVER=7.4.1
-
GHCVER=7.4.2
-
GHCVER=7.6.1
-
GHCVER=7.6.2
-
GHCVER=7.6.3
-
GHCVER=head
matrix
:
language
:
haskell
allow_failures
:
sudo
:
enabled
-
env
:
GHCVER=head
before_install
:
cache
:
-
sudo add-apt-repository -y ppa:hvr/ghc
directories
:
-
sudo apt-get update
-
$HOME/.cabal/store
-
sudo apt-get install cabal-install-1.18 ghc-$GHCVER autoconf
-
export PATH=/opt/ghc/$GHCVER/bin:$PATH
cabal
:
2.4
ghc
:
-
"
8.6.3"
-
"
8.4.4"
-
"
8.2.2"
-
"
8.0.2"
install
:
install
:
-
cabal
-1.18 update
-
cabal
--version
-
ghc --version
-
ghc --version
script
:
script
:
-
autoreconf -i
-
autoreconf -i
-
cabal-1.18 configure -v2
-
cabal v2-update
-
cabal-1.18 build
-
cabal v2-build all
-
cabal-1.18 check
-
cabal check
-
cabal-1.18 sdist
-
cabal v2-sdist
# The following scriptlet checks that the resulting source distribution can be built & installed
-
cd dist-newstyle/sdist/ && cabal v1-install terminfo-*.tar.gz
-
export SRC_TGZ=$(cabal-1.18 info . | awk '{print $2 ".tar.gz";exit}') ;
cd dist/;
if [ -f "$SRC_TGZ" ]; then
cabal-1.18 install "$SRC_TGZ";
else
echo "expected '$SRC_TGZ' not found";
exit 1;
fi
This diff is collapsed.
Click to expand it.
System/Console/Terminfo/Base.hs
+
2
−
2
View file @
f199a165
...
@@ -45,7 +45,7 @@ module System.Console.Terminfo.Base(
...
@@ -45,7 +45,7 @@ module System.Console.Terminfo.Base(
import
Control.Applicative
import
Control.Applicative
import
Control.Monad
import
Control.Monad
import
Data.Semigroup
(
Semigroup
(
..
))
import
Data.Semigroup
as
Sem
(
Semigroup
(
..
))
import
Foreign.C
import
Foreign.C
import
Foreign.ForeignPtr
import
Foreign.ForeignPtr
import
Foreign.Ptr
import
Foreign.Ptr
...
@@ -138,7 +138,7 @@ newtype TermOutput = TermOutput ([TermOutputType] -> [TermOutputType])
...
@@ -138,7 +138,7 @@ newtype TermOutput = TermOutput ([TermOutputType] -> [TermOutputType])
data
TermOutputType
=
TOCmd
LinesAffected
String
data
TermOutputType
=
TOCmd
LinesAffected
String
|
TOStr
String
|
TOStr
String
instance
Semigroup
TermOutput
where
instance
Sem
.
Semigroup
TermOutput
where
TermOutput
xs
<>
TermOutput
ys
=
TermOutput
(
xs
.
ys
)
TermOutput
xs
<>
TermOutput
ys
=
TermOutput
(
xs
.
ys
)
instance
Monoid
TermOutput
where
instance
Monoid
TermOutput
where
...
...
This diff is collapsed.
Click to expand it.
terminfo.cabal
+
1
−
1
View file @
f199a165
...
@@ -28,7 +28,7 @@ Library
...
@@ -28,7 +28,7 @@ Library
other-extensions: CPP, DeriveDataTypeable, FlexibleInstances, ScopedTypeVariables
other-extensions: CPP, DeriveDataTypeable, FlexibleInstances, ScopedTypeVariables
if impl(ghc>=7.3)
if impl(ghc>=7.3)
other-extensions: Safe, Trustworthy
other-extensions: Safe, Trustworthy
build-depends: base >= 4.9 && < 4.1
3
build-depends: base >= 4.9 && < 4.1
4
ghc-options: -Wall
ghc-options: -Wall
exposed-modules:
exposed-modules:
System.Console.Terminfo
System.Console.Terminfo
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment