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 Juno version #254

Merged
merged 6 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 17 additions & 15 deletions flake.lock

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

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
evmos-src.url = "github:evmos/evmos/v16.0.0-rc4";
evmos-src.flake = false;

juno-src.url = "github:CosmosContracts/juno/v21.0.0";
juno-src.url = "github:CosmosContracts/juno/v22.0.0";
juno-src.flake = false;

osmosis-src.url = "github:osmosis-labs/osmosis/v24.0.1";
Expand Down Expand Up @@ -212,7 +212,7 @@
wasmvm_1_beta7-src.url = "github:CosmWasm/wasmvm/v1.0.0-beta7";
wasmvm_1_beta7-src.flake = false;

apalache-src.url = "github:informalsystems/apalache/v0.42.0";
apalache-src.url = "github:informalsystems/apalache/v0.44.11";
apalache-src.flake = false;

ignite-cli-src.url = "github:ignite/cli/v0.24.0";
Expand Down
4 changes: 2 additions & 2 deletions lib/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ nix-std: {
additionalLdFlags ? [],
appName ? null,
preCheck ? null,
goVersion ? "1.20",
goVersion ? "1.21",
...
}: let
buildGoModuleArgs =
Expand Down Expand Up @@ -114,8 +114,8 @@ nix-std: {
else appName;

buildGoModuleVersion = {
"1.20" = pkgs.buildGo120Module;
"1.21" = pkgs.buildGo121Module;
"1.22" = pkgs.buildGo122Module;
};

buildGoModule = buildGoModuleVersion.${goVersion};
Expand Down
2 changes: 1 addition & 1 deletion modules/devshells.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
devShells = {
default = pkgs.mkShell {
buildInputs = with pkgs; [
rnix-lsp
Copy link
Collaborator

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?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

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 adding nil worked, 1949823.
If I run nix develop #cosmos-shell and then nil --version I get: nil 2023-08-09

nil
alejandra
];
};
Expand Down
1 change: 0 additions & 1 deletion packages/andromeda.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
libwasmvm_1_3_0,
}:
cosmosLib.mkCosmosGoApp {
goVersion = "1.20";
name = "andromeda";
version = "andromeda-1";
src = andromeda-src;
Expand Down
10 changes: 5 additions & 5 deletions packages/apalache.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apalache-src,
pkgs,
}: let
version = "v0.42.0";
version = "v0.44.11 ";
Copy link
Collaborator

Choose a reason for hiding this comment

The 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.
Expand All @@ -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 = ''
Expand Down
3 changes: 0 additions & 3 deletions packages/gaia.nix
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
name = "gaia";
vendorHash = "sha256-SQF6YNVVOfpL55Uc4LIzo2jv/cdKp8hHUeqcpc/dBEc=";
version = "v13.0.2";
goVersion = "1.20";
src = gaia13-src;
rev = gaia13-src.rev;
tags = ["netgo"];
Expand All @@ -137,7 +136,6 @@
name = "gaia";
vendorHash = "sha256-7hmP0Uc4HHW7voy3DRMkpAXifon/qnaaT6jaUf/h8HU=";
version = "v14.0.0";
goVersion = "1.20";
src = gaia14-src;
rev = gaia14-src.rev;
tags = ["netgo"];
Expand All @@ -152,7 +150,6 @@
name = "gaia";
vendorHash = "sha256-3n/tBOEwM9gvrLikJTJN7vzwVL9td+0+2yqgS7jzRd0=";
version = "v15.2.0";
goVersion = "1.20";
src = gaia15-src;
rev = gaia15-src.rev;
tags = ["netgo"];
Expand Down
1 change: 0 additions & 1 deletion packages/ibc-go.nix
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ with inputs;
src = ibc-go-v7-src;
rev = ibc-go-v7-src.rev;
vendorHash = "sha256-zjk/75+e/gWSCvpz7lrZkNEDigC/x8czpCSxxbSmWXg=";
goVersion = "1.20";
tags = ["netgo"];
engine = "cometbft/cometbft";
excludedPackages = ["./e2e" "./modules/apps/callbacks"];
Expand Down
1 change: 0 additions & 1 deletion packages/injective.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
libwasmvm_1_5_0,
}:
cosmosLib.mkCosmosGoApp {
goVersion = "1.20";
name = "injective";
version = "v1.12.1";
src = injective-src;
Expand Down
6 changes: 3 additions & 3 deletions packages/juno.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
}:
cosmosLib.mkCosmosGoApp {
name = "juno";
version = "v21.0.0";
goVersion = "1.21";
version = "v22.0.0";
goVersion = "1.22";
src = juno-src;
rev = juno-src.rev;
vendorHash = "sha256-Z5I16c/qRTmJJzAjQp6vmUrSd2F+RV13UYHHnLnhFcE=";
vendorHash = "sha256-5TTW7ftC5bQgdKOQJtmAQ8GyAuAtTmeFIl+hh12WX4M=";
tags = ["netgo"];
engine = "cometbft/cometbft";
excludedPackages = ["interchaintest"];
Expand Down
1 change: 0 additions & 1 deletion packages/provenance.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
cosmosLib.mkCosmosGoApp {
name = "provenance";
version = "v1.17.0";
goVersion = "1.20";
src = provenance-src;
rev = provenance-src.rev;
vendorHash = "sha256-XFU/+lMwg4hLlyYGUvDp0SqGqijrUQZddoH4VkIvqHg=";
Expand Down
1 change: 0 additions & 1 deletion packages/rollapp-evm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ mkCosmosGoApp {
rev = rollapp-evm-src.rev;
vendorHash = "sha256-rg3ZrNIMuUUW01lyjklTxn4zYlOiwFXyTqSE7scaRAk=";
tags = ["netgo"];
goVersion = "1.20";
engine = "cometbft/cometbft";
}