Use latest commit on main for Gaia v20

informalsystems · Sep 2, 2024 · 483a52c · 483a52c
1 parent d87f011
commit 483a52c
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 1 deletion.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -81,6 +81,9 @@
     gaia-main-src.url = "github:cosmos/gaia";
     gaia-main-src.flake = false;
 
+    gaia20-src.url = "github:cosmos/gaia/b5b22dc6e8eef40a6de67d62409601c6e5198fed";
+    gaia20-src.flake = false;
+
     gaia19-src.url = "github:cosmos/gaia/v19.1.0";
     gaia19-src.flake = false;
 

diff --git a/modules/apps.nix b/modules/apps.nix
@@ -98,6 +98,10 @@
             type = "app";
             program = "${packages.gaia19}/bin/gaiad";
           };
+          gaia20 = {
+            type = "app";
+            program = "${packages.gaia20}/bin/gaiad";
+          };
           gaia-main = {
             type = "app";
             program = "${packages.gaia-main}/bin/gaiad";

diff --git a/modules/packages.nix b/modules/packages.nix
@@ -176,7 +176,7 @@
           (import ../packages/gaia.nix {
             inherit inputs cosmosLib;
             inherit (cosmosLib) mkCosmosGoApp;
-            inherit (self'.packages) libwasmvm_1_5_0 libwasmvm_2_0_0;
+            inherit (self'.packages) libwasmvm_1_5_0 libwasmvm_2_0_0 libwasmvm_2_1_2;
           })
           # IBC Go
           (import ../packages/ibc-go.nix {

diff --git a/packages/gaia.nix b/packages/gaia.nix
@@ -3,6 +3,7 @@
   mkCosmosGoApp,
   libwasmvm_1_5_0,
   libwasmvm_2_0_0,
+  libwasmvm_2_1_2,
   cosmosLib,
 }: let
   gaias = with inputs;
@@ -221,6 +222,30 @@
 
         excludedPackages = ["tests/interchain"];
       };
+
+      gaia20 = {
+        name = "gaia";
+        vendorHash = "sha256-D7fvLjWUhEr+/wxicdKZthcqRDiop0JxNQaM+Lc9sOM=";
+        version = "v20.0.0-alpha1";
+        # nixpkgs latest go version v1.22 is v1.22.5 but Gaia v20.0.0 requires
+        # v1.22.6 or more so v1.23 is used instead
+        goVersion = "1.23";
+        src = gaia20-src;
+        rev = gaia20-src.rev;
+        tags = ["netgo"];
+        engine = "cometbft/cometbft";
+        proxyVendor = true;
+
+        preFixup = ''
+          ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_1_2 "gaiad"}
+        '';
+        buildInputs = [libwasmvm_2_1_2];
+
+        # Tests have to be disabled because they require Docker to run
+        doCheck = false;
+
+        excludedPackages = ["tests/interchain"];
+      };
     };
 in
   gaias // {gaia-main = gaias.gaia8;}