From 826b8ddd3c397306dc67de0646b27dc5656fadf9 Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Thu, 25 Jul 2024 19:14:37 +0200 Subject: [PATCH] Add Gaia v18.1.0 (#258) * Add Gaia v18.1.0 * Gaia requires libwasmvm_1_5_0 instead --- flake.lock | 18 ++++++++++++++++++ flake.nix | 3 +++ modules/packages.nix | 3 ++- packages/gaia.nix | 22 ++++++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index e6597304..91327609 100644 --- a/flake.lock +++ b/flake.lock @@ -512,6 +512,23 @@ "type": "github" } }, + "gaia18-src": { + "flake": false, + "locked": { + "lastModified": 1720430036, + "narHash": "sha256-wATunCFeMgCP9usv2TK/IKDGZIWfOKx2zWip5qWDuqk=", + "owner": "cosmos", + "repo": "gaia", + "rev": "58b4e54a95c7fc6a64272ccd0f09f46213c005ad", + "type": "github" + }, + "original": { + "owner": "cosmos", + "ref": "v18.1.0", + "repo": "gaia", + "type": "github" + } + }, "gaia5-src": { "flake": false, "locked": { @@ -1371,6 +1388,7 @@ "gaia14-src": "gaia14-src", "gaia15-src": "gaia15-src", "gaia17-src": "gaia17-src", + "gaia18-src": "gaia18-src", "gaia5-src": "gaia5-src", "gaia6-ordered-src": "gaia6-ordered-src", "gaia6-src": "gaia6-src", diff --git a/flake.nix b/flake.nix index 87a68d14..c390ed14 100644 --- a/flake.nix +++ b/flake.nix @@ -77,6 +77,9 @@ gaia-main-src.url = "github:cosmos/gaia"; gaia-main-src.flake = false; + gaia18-src.url = "github:cosmos/gaia/v18.1.0"; + gaia18-src.flake = false; + gaia17-src.url = "github:cosmos/gaia/v17.2.0"; gaia17-src.flake = false; diff --git a/modules/packages.nix b/modules/packages.nix index d3323574..a6dc0c21 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -179,8 +179,9 @@ ([ # Gaia (import ../packages/gaia.nix { - inherit inputs; + inherit inputs cosmosLib; inherit (cosmosLib) mkCosmosGoApp; + inherit (self'.packages) libwasmvm_1_5_0; }) # IBC Go (import ../packages/ibc-go.nix { diff --git a/packages/gaia.nix b/packages/gaia.nix index 9b754ba1..c3c37cf0 100644 --- a/packages/gaia.nix +++ b/packages/gaia.nix @@ -1,6 +1,8 @@ { inputs, mkCosmosGoApp, + libwasmvm_1_5_0, + cosmosLib, }: let gaias = with inputs; builtins.mapAttrs (_: mkCosmosGoApp) @@ -174,6 +176,26 @@ # Tests have to be disabled because they require Docker to run doCheck = false; }; + + gaia18 = { + name = "gaia"; + vendorHash = "sha256-+vTP15mftPKWMkE4yI3avI+jQt917YCYGdUt29E1lYs="; + version = "v18.1.0"; + goVersion = "1.22"; + src = gaia18-src; + rev = gaia18-src.rev; + tags = ["netgo"]; + engine = "cometbft/cometbft"; + proxyVendor = true; + + preFixup = '' + ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_0 "gaiad"} + ''; + buildInputs = [libwasmvm_1_5_0]; + + # Tests have to be disabled because they require Docker to run + doCheck = false; + }; }; in gaias // {gaia-main = gaias.gaia8;}