Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Agda 2.6.4 #814

Merged
merged 22 commits into from
Nov 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f8af639
set `--level-universe` flag
fredrik-bakke Oct 7, 2023
e7f688f
bump agda version to `2.6.4`
fredrik-bakke Oct 7, 2023
707cd25
Merge branch 'master' into agda-v2.6.4
EgbertRijke Oct 16, 2023
ca8e22a
Merge branch 'master' into agda-v2.6.4
fredrik-bakke Oct 16, 2023
d6cc503
Revert `--level-universe`
fredrik-bakke Oct 16, 2023
6d4d9ab
Merge branch 'master' into agda-v2.6.4
fredrik-bakke Oct 16, 2023
8796a1e
fix links
fredrik-bakke Oct 18, 2023
6517193
Merge branch 'master' into agda-v2.6.4
fredrik-bakke Oct 18, 2023
3e76907
pre-commit
fredrik-bakke Oct 18, 2023
c9f67c9
Merge branch 'master' into agda-v2.6.4
fredrik-bakke Oct 18, 2023
47bb66d
Merge branch 'master' into agda-v2.6.4
fredrik-bakke Oct 21, 2023
c0254f8
Merge branch 'master' into agda-v2.6.4
fredrik-bakke Oct 30, 2023
616fe6b
Merge branch 'master' into agda-v2.6.4
fredrik-bakke Nov 11, 2023
97b1ed3
bump `wenkokke/setup-agda`
fredrik-bakke Nov 11, 2023
0d579e4
Update DESIGN-PRINCIPLES.md
fredrik-bakke Nov 14, 2023
b21ec9b
Merge branch 'master' into agda-v2.6.4
fredrik-bakke Nov 14, 2023
22229c3
Bump nixpkgs for Agda 2.6.4
VojtechStep Nov 14, 2023
3e34ff2
Merge pull request #3 from VojtechStep/agda-v2.6.4
fredrik-bakke Nov 14, 2023
ed43cd2
Merge branch 'master' into agda-v2.6.4
fredrik-bakke Nov 23, 2023
341bf17
Merge branch 'master' into agda-v2.6.4
fredrik-bakke Nov 24, 2023
a4eb29d
Merge branch 'master' into agda-v2.6.4
EgbertRijke Nov 25, 2023
afcab4f
Merge branch 'master' into agda-v2.6.4
EgbertRijke Nov 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ jobs:
strategy:
matrix:
os: [macOS-latest, ubuntu-latest]
agda: ['2.6.3']
agda: ['2.6.4']
steps:
- name: Checkout our repository
uses: actions/checkout@v3
with:
path: master
- name: Setup Agda
uses: wenkokke/setup-agda@v2.0.0
uses: wenkokke/setup-agda@v2.1.0
with:
agda-version: ${{ matrix.agda }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: macOS-latest
strategy:
matrix:
agda: ['2.6.3']
agda: ['2.6.4']
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
Expand All @@ -44,7 +44,7 @@ jobs:
fetch-depth: 0

- name: Setup Agda
uses: wenkokke/setup-agda@v2.0.0
uses: wenkokke/setup-agda@v2.1.0
with:
agda-version: ${{ matrix.agda }}

Expand Down
2 changes: 1 addition & 1 deletion HOME.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ potential to be useful, and informative resources for both working and learning
mathematicians. Our library is designed to work towards this goal, and we
welcome contributions to the library within any topic in mathematics.

The `agda-unimath` library is compatible with Agda 2.6.3 and can be compiled by
The `agda-unimath` library is compatible with Agda 2.6.4 and can be compiled by
running `make check` from the root directory of the repository. Learn more about
using the library locally in our [installation guide](HOWTO-INSTALL.md).

Expand Down
6 changes: 3 additions & 3 deletions HOWTO-INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
### Quick setup

To work or experiment with the `agda-unimath` library on your machine, you will
need to have `agda` version 2.6.3 installed, and a suitable editor such as
need to have `agda` version 2.6.4 installed, and a suitable editor such as
[Emacs](https://www.gnu.org/software/emacs/) or
[Visual Studio Code](https://code.visualstudio.com/). The following instructions
will help you on your way right away:
Expand Down Expand Up @@ -122,15 +122,15 @@ working branches when necessary.

## Installing Agda {#installing-agda}

The `agda-unimath` library is built and verified with Agda 2.6.3, and we provide
The `agda-unimath` library is built and verified with Agda 2.6.4, and we provide
two methods for installation: with or without the package manager
[Nix](https://nixos.org/). Nix streamlines the installation of Agda and its
dependencies, providing a consistent and reproducible environment for the
library across different systems.

### Without Nix

To install Agda 2.6.3 without Nix, follow the
To install Agda 2.6.4 without Nix, follow the
[installation guide](https://agda.readthedocs.io/en/latest/getting-started/installation.html)
provided on the Agda documentation page.

Expand Down
23 changes: 20 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 16 additions & 12 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,25 @@
description = "agda-unimath";

inputs = {
# Unstable is needed for Agda 2.6.3, latest stable 22.11 only has 2.6.2.2
# Unstable is needed for Agda 2.6.4, latest stable 23.05 only has 2.6.3
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils";
# Nixpkgs with tested versions of mdbook crates;
# may be removed once we backport new mdbook assets to our
# modified versions
nixpkgs-mdbook.url = "github:NixOS/nixpkgs?rev=7fdd1421774a52277fb56d64b26aaf7765e1b3fa";
mdbook-catppuccin = {
url = "github:catppuccin/mdBook/v1.2.0";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs-mdbook";
};
};

outputs = { self, nixpkgs, flake-utils, mdbook-catppuccin }:
outputs = { self, nixpkgs, nixpkgs-mdbook, flake-utils, mdbook-catppuccin }:
flake-utils.lib.eachDefaultSystem
(system:
let
pkgs = nixpkgs.legacyPackages."${system}";
pkgs-mdbook = nixpkgs-mdbook.legacyPackages."${system}";
python = pkgs.python38.withPackages (p: with p; [
# Keep in sync with scripts/requirements.txt
# pre-commit <- not installed as a Python package but as a binary below
Expand Down Expand Up @@ -67,17 +72,16 @@
packages = [
# maintanance scripts
python
# working on the website
pkgs.mdbook
pkgs.mdbook-katex
pkgs.mdbook-pagetoc
pkgs.mdbook-linkcheck
mdbook-catppuccin.packages."${system}".default
# pre-commit checks
pkgs.pre-commit
];
] ++ (with pkgs-mdbook; [
# working on the website
mdbook
mdbook-katex
mdbook-pagetoc
mdbook-linkcheck
mdbook-catppuccin.packages."${system}".default
]);
};

devShell = self.devShells."${system}".default;
});
}