Skip to content

Commit

Permalink
Merge pull request #4863 from melted/release-1.3.3
Browse files Browse the repository at this point in the history
Release 1.3.3
  • Loading branch information
melted authored May 23, 2020
2 parents 5ac59fd + 0bc39d4 commit 0f4c4a6
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 10 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,18 @@ before_install:
- if [ -n "$STYLISH" ]; then ./stylize.sh; exit $?; fi
- if [ -n "$IDRIS2" ];
then
git clone https://github.com/edwinb/Idris2 &&
git clone https://github.com/edwinb/Idris2-boot &&
wget https://github.com/cisco/ChezScheme/archive/v9.5.2.tar.gz &&
tar xvzf v9.5.2.tar.gz &&
cd ChezScheme-9.5.2 &&
./configure --threads --installprefix=$HOME/opt/scheme &&
make -j install &&
cd .. &&
cabal v1-update &&
travis_wait cabal v1-install --only-dependencies &&
travis_wait cabal v1-install &&
cd Idris2 &&
make idris2 && make base && make contrib;
travis_wait make idris2 && make base && make contrib;
exit $?;
fi

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# New since last release

# New in 1.3.3
+ Updated to work with GHC 8.8 and cabal 3.0
+ Bugfixes and documentation updates

# New in 1.3.2
+ Documentation added to proof section
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
# The short X.Y version.
version = '1.3'
# The full version, including alpha/beta/rc tags.
release = '1.3.2'
release = '1.3.3'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion docs/listing/idris-prompt-helloworld.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$ idris hello.idr
____ __ _
/ _/___/ /____(_)____
/ // __ / ___/ / ___/ Version 1.3.2
/ // __ / ___/ / ___/ Version 1.3.3
_/ // /_/ / / / (__ ) https://www.idris-lang.org/
/___/\__,_/_/ /_/____/ Type :? for help

Expand Down
2 changes: 1 addition & 1 deletion docs/listing/idris-prompt-start.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$ idris
____ __ _
/ _/___/ /____(_)____
/ // __ / ___/ / ___/ Version 1.3.2
/ // __ / ___/ / ___/ Version 1.3.3
_/ // /_/ / / / (__ ) https://www.idris-lang.org/
/___/\__,_/_/ /_/____/ Type :? for help

Expand Down
2 changes: 1 addition & 1 deletion docs/parserLibrary/lexer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ input string as parameters:
idris -p contrib parserEx.idr
____ __ _
/ _/___/ /____(_)____
/ // __ / ___/ / ___/ Version 1.3.2
/ // __ / ___/ / ___/ Version 1.3.3
_/ // /_/ / / / (__ ) http://www.idris-lang.org/
/___/\__,_/_/ /_/____/ Type :? for help
Expand Down
6 changes: 3 additions & 3 deletions idris.cabal
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Cabal-Version: 2.4
Name: idris
Version: 1.3.2
Version: 1.3.3
License: BSD-3-Clause
License-file: LICENSE
Author: Edwin Brady
Maintainer: Edwin Brady <eb@cs.st-andrews.ac.uk>
Maintainer: Niklas Larsson <niklas@mm.st>
Homepage: https://www.idris-lang.org/
Bug-reports: https://github.com/idris-lang/Idris-dev/issues

Expand Down Expand Up @@ -44,7 +44,7 @@ Description: Idris is a general purpose language with full dependent types.

Build-type: Custom

Tested-With: GHC == 7.10.3, GHC == 8.0.1
Tested-With: GHC == 8.6.5, GHC == 8.8.4

-- NOTE: due to https://github.com/haskell/cabal/issues/6125 the use of ** is
-- heavily discouraged.
Expand Down
2 changes: 1 addition & 1 deletion man/idris.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Manpage for Idris.
.\" Contact <> to correct errors or typos.
.TH man 1 "23 October 2018" "1.3.2" "Idris man page"
.TH man 1 "23 May 2020" "1.3.3" "Idris man page"
.SH NAME
idris -\ a general purpose pure functional programming language with dependent types.
.SH SYNOPSIS
Expand Down

0 comments on commit 0f4c4a6

Please sign in to comment.