Merge branch 'main' into luca_joss/update-osmosis-v24

informalsystems · Apr 15, 2024 · 8b03823 · 8b03823
2 parents 6ea652a + 5e1ca8a
commit 8b03823
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 0 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -77,6 +77,9 @@
     gaia-main-src.url = "github:cosmos/gaia";
     gaia-main-src.flake = false;
 
+    gaia15-src.url = "github:cosmos/gaia/v15.2.0";
+    gaia15-src.flake = false;
+
     gaia14-src.url = "github:cosmos/gaia/v14.0.0";
     gaia14-src.flake = false;
 

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

diff --git a/packages/gaia.nix b/packages/gaia.nix
@@ -147,6 +147,21 @@
         # Tests have to be disabled because they require Docker to run
         doCheck = false;
       };
+
+      gaia15 = {
+        name = "gaia";
+        vendorHash = "sha256-3n/tBOEwM9gvrLikJTJN7vzwVL9td+0+2yqgS7jzRd0=";
+        version = "v15.2.0";
+        goVersion = "1.20";
+        src = gaia15-src;
+        rev = gaia15-src.rev;
+        tags = ["netgo"];
+        engine = "cometbft/cometbft";
+        proxyVendor = true;
+
+        # Tests have to be disabled because they require Docker to run
+        doCheck = false;
+      };
     };
 in
   gaias // {gaia-main = gaias.gaia8;}