Skip to content

Commit 1670adb

Browse files
authored
Add new metatheory-jailbreak devShell (#7361)
1 parent 2ac0e0b commit 1670adb

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,3 +115,4 @@ plutus-pab/test-node/alonzo-purple/db
115115
.nvimrc
116116
release-*
117117
TestCert.*
118+
worktrees

nix/agda-tools.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ let
143143

144144
# Path to the stdlib .agda-lib file for shell export.
145145
NIX_AGDA_STDLIB = "${agda-stdlib}/standard-library.agda-lib";
146-
147146
in
148147

149148
{

nix/metatheory.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ let
105105
exit 1
106106
fi
107107
'';
108-
109108
in
110109

111110
{

nix/outputs.nix

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,20 @@ let
9797
ghc910 = mkShell project.projectVariants.ghc910;
9898
};
9999

100+
# The default shell contains the agda-with-stdlib-and-metatheory package which will
101+
# break on `nix develop` if the .lagda files are broken. In order to escape this
102+
# situation we introduce a shell that doesn't contain that executable.
103+
metatheory-jailbreak-shell = non-profiled-shells.default.overrideAttrs (attrs: {
104+
buildInputs =
105+
lib.remove metatheory.agda-with-stdlib-and-metatheory attrs.buildInputs;
106+
nativeBuildInputs =
107+
lib.remove metatheory.agda-with-stdlib-and-metatheory attrs.nativeBuildInputs;
108+
});
109+
100110
devShells =
101111
(non-profiled-shells) //
102-
{ profiled = mkShell project.projectVariants.ghc96-profiled; };
112+
{ profiled = mkShell project.projectVariants.ghc96-profiled; } //
113+
{ metatheory-jailbreak = metatheory-jailbreak-shell; };
103114

104115
nested-ci-jobs = {
105116
"x86_64-linux" =

0 commit comments

Comments
 (0)