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.

Sign up for GitHub

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

Agda 2.6.4 updates #262814

Merged
merged 7 commits into from
Oct 29, 2023
Merged

Agda 2.6.4 updates #262814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6c2b227
agdaPackages.*: support literate Typst files
ncfavier Oct 22, 2023
e8bf86a
agdaPackages.standard-library: 1.7.2 -> 1.7.3
ncfavier Oct 22, 2023
ae86b08
agdaPackages.agda-categories: 0.1.7.1a -> 0.1.7.2
ncfavier Oct 22, 2023
170a977
agdaPackages._1lab: unstable-2023-03-07 -> unstable-2023-10-11
ncfavier Oct 22, 2023
8b59b95
agdaPackages.{agda-prelude,functional-linear-algebra}: mark as broken
ncfavier Oct 22, 2023
57eea05
agdaPackages.cubical: 0.5 -> 0.6
ncfavier Oct 24, 2023
1df7685
agdaPackages.agda-prelude: unstable-2022-01-14 -> unstable-2023-10-04
ncfavier Oct 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
1 change: 1 addition & 0 deletions pkgs/build-support/agda/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ let
"lagda.org"
"lagda.rst"
"lagda.tex"
"lagda.typ"
];

defaults =
Expand Down
2 changes: 1 addition & 1 deletion pkgs/build-support/agda/lib.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* interfaceFile "Everything.agda" == "Everything.agdai"
* interfaceFile "src/Everything.lagda.tex" == "src/Everything.agdai"
*/
interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex))?'' agdaFile) + "agdai";
interfaceFile = agdaFile: lib.head (builtins.match ''(.*\.)l?agda(\.(md|org|rst|tex|typ))?'' agdaFile) + "agdai";

/* Takes an arbitrary derivation and says whether it is an agda library package
* that is not marked as broken.
Expand Down
7 changes: 3 additions & 4 deletions pkgs/development/libraries/agda/1lab/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@

mkDerivation rec {
pname = "1lab";
version = "unstable-2023-03-07";
version = "unstable-2023-10-11";

src = fetchFromGitHub {
owner = "plt-amy";
repo = pname;
# Last commit that compiles with Agda 2.6.3
rev = "c6ee57a2da327def241324b4775ec2c67cdab2af";
hash = "sha256-zDqFaDZxAdFxYM6l2zc7ZTi4XwMThw1AQwHfvhOxzdg=";
rev = "c6e0c3c714486fd6c89ace31443428ba48871685";
hash = "sha256-PC75NtT0e99HVyFedox+6xz/CY2zP2g4Vzqruj5Bjhc=";
};

# We don't need anything in support; avoid installing LICENSE.agda
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/agda/agda-categories/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ lib, mkDerivation, fetchFromGitHub, standard-library }:

mkDerivation rec {
version = "0.1.7.1a";
version = "0.1.7.2";
pname = "agda-categories";

src = fetchFromGitHub {
owner = "agda";
repo = "agda-categories";
rev = "v${version}";
sha256 = "sha256-VlxRDxXg+unzYlACUU58JQUHXxtg0fI5dEQvlBRxJtU=";
sha256 = "sha256-lQzAfPqkdb0pG5seYVODPngSLrJxhbH1jf0K6qqoj3c=";
};

postPatch = ''
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/libraries/agda/agda-prelude/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ lib, mkDerivation, fetchFromGitHub }:

mkDerivation rec {
version = "unstable-2022-01-14";
version = "unstable-2023-10-04";
pname = "agda-prelude";

src = fetchFromGitHub {
owner = "UlfNorell";
repo = "agda-prelude";
rev = "3d143d6d0a3f75966602480665623e87233ff93e";
hash = "sha256-ILhXDq788vrceMp5mCiQUMrJxeLPtS4yGtvMHMYxzg8=";
rev = "ff3b13253612caf0784a06e2d7d0f30be16c32e4";
hash = "sha256-A05uDv3fJqKncea9AL6eQa0XAskLZwAIUl1OAOVeP8I=";
};

preConfigure = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/agda/cubical/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

mkDerivation rec {
pname = "cubical";
version = "0.5";
version = "0.6";

src = fetchFromGitHub {
repo = pname;
owner = "agda";
rev = "v${version}";
hash = "sha256-47GOfZYwvE9TbGzdy/xSYZagTbjs/oeDpwjYUvI7z3k=";
hash = "sha256-2quAZ/j7kQaFkh9W5Bj1y7YQj9BT7FwHqVWyj8T4AH8=";
};

# The cubical library has several `Everything.agda` files, which are
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/libraries/agda/functional-linear-algebra/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@ mkDerivation rec {
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ ryanorendorff ];
broken = true;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/agda/standard-library/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

mkDerivation rec {
pname = "standard-library";
version = "1.7.2";
version = "1.7.3";

src = fetchFromGitHub {
repo = "agda-stdlib";
owner = "agda";
rev = "v${version}";
hash = "sha256-vvbyfC5+Yyx18IDikSbAAcTHHtU6krlz45Fd2YlwsBg=";
hash = "sha256-vtL6VPvTXhl/mepulUm8SYyTjnGsqno4RHDmTIy22Xg=";
};

nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
Expand Down