Skip to content

Commit 18b8e43

Browse files
committed
[ admin ] backport to Agda 2.5.4.2 and stdlib 0.17
Looks like 2.6.0 and 1.0 won't be released in time for the talk. So I'm rolling back the compatibility changes and sticking to the stable releases.
1 parent c247fa8 commit 18b8e43

3 files changed

Lines changed: 15 additions & 10 deletions

File tree

src/Generic/Identity.agda

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ open import Generic.Simulation.Syntactic
1717

1818
open import Function
1919
open import Relation.Binary.PropositionalEquality as PEq
20-
open import Relation.Binary.PropositionalEquality.WithK
20+
-- open import Relation.Binary.PropositionalEquality.WithK
2121
open ≡-Reasoning
2222

2323
-- If we directly try to prove that t[id] ≡ t we run into size-related issues.
@@ -54,7 +54,7 @@ module _ {I : Set} {d : Desc I} where
5454

5555
⟨ `σ A d ⟩≅⇒≡ (refl , eq) = cong -,_ (⟨ d _ ⟩≅⇒≡ eq)
5656
⟨ `X Δ j d ⟩≅⇒≡ (≅-pr , eq) = cong₂ _,_ (≅⇒≡ ≅-pr) (⟨ d ⟩≅⇒≡ eq)
57-
⟨ `∎ i ⟩≅⇒≡ eq = ≡-irrelevant _ _
57+
⟨ `∎ i ⟩≅⇒≡ eq = ≡-irrelevance _ _
5858

5959
-- We can now prove a lemma stating that t[id] ≅ t and we will obtain t[id] ≡ t as
6060
-- a corrolary.

travis/install_agda.sh

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@ if ! type "agda" > /dev/null || [ ! `agda -V | sed "s/[^2]*//"` = "$AGDA_VERSION
55
cabal update
66
cabal install alex happy cpphs --force-reinstalls
77
cabal install Agda-"$AGDA_VERSION" --force-reinstalls
8+
mkdir -p $HOME/.agda
9+
cp libraries-${VERSION} $HOME/.agda/
10+
cd $HOME/.agda/
11+
wget https://github.com/agda/agda-stdlib/archive/v0.17.tar.gz
12+
tar -xvzf v0.17.tar.gz
13+
cd -
814
fi
915

10-
mkdir -p $HOME/.agda
11-
cp libraries-"$AGDA_VERSION" $HOME/.agda/
12-
cd $HOME/.agda/
13-
git clone https://github.com/agda/agda-stdlib/ agda-stdlib-0.18
14-
cd agda-stdlib-0.18
15-
git checkout a0bfe7422d2aa0f0f49c9647659ce34e6e741375
16-
cd -
16+
# mkdir -p $HOME/.agda
17+
# cp libraries-"$AGDA_VERSION" $HOME/.agda/
18+
# cd $HOME/.agda/
19+
# git clone https://github.com/agda/agda-stdlib/ agda-stdlib-0.18
20+
# cd agda-stdlib-0.18
21+
# git checkout a0bfe7422d2aa0f0f49c9647659ce34e6e741375

travis/libraries-2.5.4.2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
$HOME/.agda/agda-stdlib-0.18/standard-library.agda-lib
1+
$HOME/.agda/agda-stdlib-0.17/standard-library.agda-lib

0 commit comments

Comments
 (0)