Update Juno version (#254)

* Update Juno from v21.0.0 to v22.0.0 * Remove go version v1.20 * Update nix2container * Remove rnix-lsp as it is unmaintained * Update Apalache from v0.42.0 to v0.44.11 * Use oxalica nil in devshells.nix
informalsystems · Jun 10, 2024 · d7f2eac · d7f2eac
1 parent 832ddb5
commit d7f2eac
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 36 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -155,7 +155,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/v25.0.0";
@@ -218,7 +218,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";

diff --git a/lib/default.nix b/lib/default.nix
@@ -75,7 +75,7 @@ nix-std: {
     additionalLdFlags ? [],
     appName ? null,
     preCheck ? null,
-    goVersion ? "1.20",
+    goVersion ? "1.21",
     ...
   }: let
     buildGoModuleArgs =
@@ -114,8 +114,8 @@ nix-std: {
       else appName;
 
     buildGoModuleVersion = {
-      "1.20" = pkgs.buildGo120Module;
       "1.21" = pkgs.buildGo121Module;
+      "1.22" = pkgs.buildGo122Module;
     };
 
     buildGoModule = buildGoModuleVersion.${goVersion};

diff --git a/modules/devshells.nix b/modules/devshells.nix
@@ -12,7 +12,7 @@
     devShells = {
       default = pkgs.mkShell {
         buildInputs = with pkgs; [
-          rnix-lsp
+          nil
           alejandra
         ];
       };

diff --git a/packages/andromeda.nix b/packages/andromeda.nix
@@ -4,7 +4,6 @@
   libwasmvm_1_3_0,
 }:
 cosmosLib.mkCosmosGoApp {
-  goVersion = "1.20";
   name = "andromeda";
   version = "andromeda-1";
   src = andromeda-src;

diff --git a/packages/apalache.nix b/packages/apalache.nix
@@ -2,7 +2,7 @@
   apalache-src,
   pkgs,
 }: let
-  version = "v0.42.0";
+  version = "v0.44.11 ";
 
   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 = ''

diff --git a/packages/gaia.nix b/packages/gaia.nix
@@ -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"];
@@ -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"];
@@ -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"];

diff --git a/packages/ibc-go.nix b/packages/ibc-go.nix
@@ -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"];

diff --git a/packages/injective.nix b/packages/injective.nix
@@ -4,7 +4,6 @@
   libwasmvm_1_5_0,
 }:
 cosmosLib.mkCosmosGoApp {
-  goVersion = "1.20";
   name = "injective";
   version = "v1.12.1";
   src = injective-src;

diff --git a/packages/juno.nix b/packages/juno.nix
@@ -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"];

diff --git a/packages/provenance.nix b/packages/provenance.nix
@@ -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=";

diff --git a/packages/rollapp-evm.nix b/packages/rollapp-evm.nix
@@ -9,6 +9,5 @@ mkCosmosGoApp {
   rev = rollapp-evm-src.rev;
   vendorHash = "sha256-rg3ZrNIMuUUW01lyjklTxn4zYlOiwFXyTqSE7scaRAk=";
   tags = ["netgo"];
-  goVersion = "1.20";
   engine = "cometbft/cometbft";
 }