Skip to content

Commit b6eb2b1

Browse files
committed
nix: use upstream Agda overlay
The overlay was fixed after the 2.8.0 release.
1 parent b4e81f8 commit b6eb2b1

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

flake.lock

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
flake = false;
99
};
1010
inputs.agda = {
11-
url = "github:agda/agda/v2.8.0";
11+
url = "github:agda/agda";
1212
inputs = {
1313
nixpkgs.follows = "nixpkgs";
1414
};
@@ -18,20 +18,6 @@
1818
let
1919
inherit (nixpkgs.lib) cleanSourceWith hasSuffix;
2020

21-
# Required until the upstream agda overlay is fixed (https://github.com/agda/agda/issues/7755).
22-
# Afterwards, use agda.overlays.default instead.
23-
agdaOverlay = final: prev: {
24-
haskellPackages = prev.haskellPackages.override (old: {
25-
overrides = prev.lib.composeExtensions (old.overrides or (_: _: { }))
26-
(hfinal: hprev: {
27-
# The agda wrapper expects a separate bin output
28-
# (fixed in https://github.com/NixOS/nixpkgs/pull/424180/commits/ee74abc225)
29-
Agda = final.haskell.lib.enableSeparateBinOutput
30-
agda.packages.${prev.system}.default;
31-
});
32-
});
33-
};
34-
3521
overlay = final: prev: {
3622
cubical = final.agdaPackages.mkDerivation rec {
3723
pname = "cubical";
@@ -62,7 +48,7 @@
6248
agdaWithCubical = final.agdaPackages.agda.withPackages [final.cubical];
6349
};
6450

65-
overlays = [ agdaOverlay overlay ];
51+
overlays = [ agda.overlays.default overlay ];
6652
in
6753
{ overlays.default = overlay; } //
6854
flake-utils.lib.eachDefaultSystem (system:

0 commit comments

Comments
 (0)