-
Notifications
You must be signed in to change notification settings - Fork 13
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 Juno version #254
Merged
Merged
Update Juno version #254
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
9bb1ede
Update Juno from v21.0.0 to v22.0.0
ljoss17 4f4cdfd
Remove go version v1.20
ljoss17 60ada29
Update nix2container
ljoss17 9416ff8
Remove rnix-lsp as it is unmaintained
ljoss17 ca188b4
Update Apalache from v0.42.0 to v0.44.11
ljoss17 1949823
Use oxalica nil in devshells.nix
ljoss17 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ | |
devShells = { | ||
default = pkgs.mkShell { | ||
buildInputs = with pkgs; [ | ||
rnix-lsp | ||
nil | ||
alejandra | ||
]; | ||
}; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
apalache-src, | ||
pkgs, | ||
}: let | ||
version = "v0.42.0"; | ||
version = "v0.44.11 "; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh nice, I wasn't able to get this to work! |
||
|
||
postPatch = '' | ||
# Patch the build.sbt file so that it does not call the `git describe` command. | ||
|
@@ -11,20 +11,20 @@ | |
# not available, hence the dependency resolution would fail. As a workaround, | ||
# we use the version string provided in Nix as the build version. | ||
substituteInPlace ./build.sbt \ | ||
--replace 'Process("git describe --tags --always").!!.trim' '"${version}"' | ||
--replace-warn 'Process("git describe --tags --always").!!.trim' '"${version}"' | ||
# Patch the wrapper script to use a JRE from the Nix store, | ||
# and to load the JAR from the Nix store by default. | ||
substituteInPlace ./src/universal/bin/apalache-mc \ | ||
--replace 'exec java' 'exec ${pkgs.jre}/bin/java' \ | ||
--replace '$DIR/../lib/apalache.jar' "$out/lib/apalache.jar" | ||
--replace-warn 'exec java' 'exec ${pkgs.jre}/bin/java' \ | ||
--replace-warn '$DIR/../lib/apalache.jar' "$out/lib/apalache.jar" | ||
''; | ||
in | ||
pkgs.mkSbtDerivation { | ||
inherit version postPatch; | ||
pname = "apalache"; | ||
|
||
depsSha256 = "sha256-1/cI5JK1/uYVK7ihoyZwR4cHJqzsNW9eVaF7OKu92IE="; | ||
depsSha256 = "sha256-Bkw/ZV4xYPBR1bx31otb6j14ivg995MsVNEXbYha7B0="; | ||
src = apalache-src; | ||
buildPhase = "make dist"; | ||
installPhase = '' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you replace with
nil
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/oxalica/nil
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As it is part of
nixpkgs
it seems that simply addingnil
worked, 1949823.If I run
nix develop #cosmos-shell
and thennil --version
I get:nil 2023-08-09