From 8515f69bb52afc0165854f9e46e1f0918e78874b Mon Sep 17 00:00:00 2001 From: Luca Joss <43531661+ljoss17@users.noreply.github.com> Date: Mon, 10 Jun 2024 10:47:04 +0200 Subject: [PATCH 1/5] Update Osmosis version from v24.0.1 to v25.0.0 (#253) --- flake.lock | 8 ++++---- flake.nix | 2 +- packages/osmosis.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 8983aca4..5d8bd361 100644 --- a/flake.lock +++ b/flake.lock @@ -1219,16 +1219,16 @@ "osmosis-src": { "flake": false, "locked": { - "lastModified": 1712687434, - "narHash": "sha256-j1PtSv4i/3IV6hUHxxgO/5t9/bfWs28i3D/uVAkf68Q=", + "lastModified": 1715157587, + "narHash": "sha256-D/CymboICWe73MBGF036W5NT/pyaV8Wvll2bJmYNmHg=", "owner": "osmosis-labs", "repo": "osmosis", - "rev": "0021d3812a8c8d2798ab17e58991a677b82e8955", + "rev": "15566f1f2945a16af9243dd376ee58a0d691b66a", "type": "github" }, "original": { "owner": "osmosis-labs", - "ref": "v24.0.1", + "ref": "v25.0.0", "repo": "osmosis", "type": "github" } diff --git a/flake.nix b/flake.nix index 3ce3bf01..e8c3d4ef 100644 --- a/flake.nix +++ b/flake.nix @@ -155,7 +155,7 @@ juno-src.url = "github:CosmosContracts/juno/v21.0.0"; juno-src.flake = false; - osmosis-src.url = "github:osmosis-labs/osmosis/v24.0.1"; + osmosis-src.url = "github:osmosis-labs/osmosis/v25.0.0"; osmosis-src.flake = false; sentinel-src.url = "github:sentinel-official/hub/v0.9.0-rc0"; diff --git a/packages/osmosis.nix b/packages/osmosis.nix index 2e945777..bbc1325a 100644 --- a/packages/osmosis.nix +++ b/packages/osmosis.nix @@ -5,11 +5,11 @@ }: cosmosLib.mkCosmosGoApp { name = "osmosis"; - version = "v24.0.1"; + version = "v25.0.0"; goVersion = "1.21"; src = osmosis-src; rev = osmosis-src.rev; - vendorHash = "sha256-RjBnaHKge3b1CwIFUFsyE/Yv83QC8UsGtx87mgI1PPo="; + vendorHash = "sha256-G/LIUpwWDIwB8oGBnNQ00Y7knoZSYjnON+3+VgIHSQQ="; tags = ["netgo"]; excludedPackages = ["cl-genesis-positions"]; engine = "cometbft/cometbft"; From eaf5f4da4b35d8138b2c42aa39bc314b9be89958 Mon Sep 17 00:00:00 2001 From: Luca Joss <43531661+ljoss17@users.noreply.github.com> Date: Mon, 10 Jun 2024 11:26:55 +0200 Subject: [PATCH 2/5] Update Neutron from v3.0.2 to v3.0.5 (#255) --- flake.lock | 8 ++++---- flake.nix | 2 +- packages/neutron.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 5d8bd361..baa6c89b 100644 --- a/flake.lock +++ b/flake.lock @@ -1006,16 +1006,16 @@ "neutron-src": { "flake": false, "locked": { - "lastModified": 1712330928, - "narHash": "sha256-3olixILNnkRcNwtpPDqQJ63cYjV5qiVYTM+fJEIH65s=", + "lastModified": 1713877185, + "narHash": "sha256-cslMi835EdyByhSUN1FG9ucXjh5tQxqs3YfCLqGwYLg=", "owner": "neutron-org", "repo": "neutron", - "rev": "d652580f204231a5d6d76c83a084d7110d981416", + "rev": "73f419c3c60a3b811b08788519063560e84d97a8", "type": "github" }, "original": { "owner": "neutron-org", - "ref": "v3.0.2", + "ref": "v3.0.5", "repo": "neutron", "type": "github" } diff --git a/flake.nix b/flake.nix index e8c3d4ef..0daa37a4 100644 --- a/flake.nix +++ b/flake.nix @@ -233,7 +233,7 @@ celestia-node-src.url = "github:celestiaorg/celestia-node/v0.13.0"; celestia-node-src.flake = false; - neutron-src.url = "github:neutron-org/neutron/v3.0.2"; + neutron-src.url = "github:neutron-org/neutron/v3.0.5"; neutron-src.flake = false; provenance-src.url = "github:/provenance-io/provenance/v1.17.0"; diff --git a/packages/neutron.nix b/packages/neutron.nix index 502be471..65f56ed5 100644 --- a/packages/neutron.nix +++ b/packages/neutron.nix @@ -6,10 +6,10 @@ cosmosLib.mkCosmosGoApp { goVersion = "1.21"; name = "neutron"; - version = "v3.0.2"; + version = "v3.0.5"; src = neutron-src; rev = neutron-src.rev; - vendorHash = "sha256-Ao/soQsOw00QZ8c7BF42od303wdiFo30flWSPTm5Mzc="; + vendorHash = "sha256-6WV7Z0KbvDReCJ7JccPnRWPkR4BMrfxRouTC5cC6PZc="; engine = "cometbft/cometbft"; preFixup = '' ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "neutrond"} From 4f354f4c042519a2681cc2fefd6b276ee88815f9 Mon Sep 17 00:00:00 2001 From: Luca Joss <43531661+ljoss17@users.noreply.github.com> Date: Mon, 10 Jun 2024 12:07:12 +0200 Subject: [PATCH 3/5] Add Gaia v17.2.0 (#252) --- flake.lock | 18 ++++++++++++++++++ flake.nix | 3 +++ modules/apps.nix | 4 ++++ packages/gaia.nix | 15 +++++++++++++++ 4 files changed, 40 insertions(+) diff --git a/flake.lock b/flake.lock index baa6c89b..13132a51 100644 --- a/flake.lock +++ b/flake.lock @@ -493,6 +493,23 @@ "type": "github" } }, + "gaia17-src": { + "flake": false, + "locked": { + "lastModified": 1717626378, + "narHash": "sha256-FiCnGz5ZQQv2NyPW/Z7puZw6oFKcdoNsspSCK8Nkc44=", + "owner": "cosmos", + "repo": "gaia", + "rev": "17f2ba0b90d1d2884f7b67518ec08dfd37f001a7", + "type": "github" + }, + "original": { + "owner": "cosmos", + "ref": "v17.2.0", + "repo": "gaia", + "type": "github" + } + }, "gaia5-src": { "flake": false, "locked": { @@ -1350,6 +1367,7 @@ "gaia13-src": "gaia13-src", "gaia14-src": "gaia14-src", "gaia15-src": "gaia15-src", + "gaia17-src": "gaia17-src", "gaia5-src": "gaia5-src", "gaia6-ordered-src": "gaia6-ordered-src", "gaia6-src": "gaia6-src", diff --git a/flake.nix b/flake.nix index 0daa37a4..71a69ad9 100644 --- a/flake.nix +++ b/flake.nix @@ -77,6 +77,9 @@ gaia-main-src.url = "github:cosmos/gaia"; gaia-main-src.flake = false; + gaia17-src.url = "github:cosmos/gaia/v17.2.0"; + gaia17-src.flake = false; + gaia15-src.url = "github:cosmos/gaia/v15.2.0"; gaia15-src.flake = false; diff --git a/modules/apps.nix b/modules/apps.nix index 0e78fd41..732295fe 100644 --- a/modules/apps.nix +++ b/modules/apps.nix @@ -90,6 +90,10 @@ type = "app"; program = "${packages.gaia15}/bin/gaiad"; }; + gaia17 = { + type = "app"; + program = "${packages.gaia17}/bin/gaiad"; + }; gaia-main = { type = "app"; program = "${packages.gaia-main}/bin/gaiad"; diff --git a/packages/gaia.nix b/packages/gaia.nix index 6c112626..fe6e32ed 100644 --- a/packages/gaia.nix +++ b/packages/gaia.nix @@ -162,6 +162,21 @@ # Tests have to be disabled because they require Docker to run doCheck = false; }; + + gaia17 = { + name = "gaia"; + vendorHash = "sha256-gDzq+Jfs5EyH0tbeBzkz3xR75t324yaWLRhw59U8aRI="; + version = "v17.2.0"; + goVersion = "1.21"; + src = gaia17-src; + rev = gaia17-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;} From 832ddb55eac90996c82d5a6ffe04cc3e2d8b17cf Mon Sep 17 00:00:00 2001 From: Luca Joss <43531661+ljoss17@users.noreply.github.com> Date: Mon, 10 Jun 2024 14:19:28 +0200 Subject: [PATCH 4/5] Update wasmd from v0.50.0 to v0.51.0 (#256) --- flake.lock | 28 +++++++++++++++++++++++----- flake.nix | 5 ++++- modules/packages.nix | 2 +- packages/libwasmvm.nix | 12 ++++++++++++ packages/wasmd.nix | 10 +++++----- 5 files changed, 45 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 13132a51..cd576736 100644 --- a/flake.lock +++ b/flake.lock @@ -1424,7 +1424,8 @@ "wasmvm_1_3_0-src": "wasmvm_1_3_0-src", "wasmvm_1_5_0-src": "wasmvm_1_5_0-src", "wasmvm_1_5_2-src": "wasmvm_1_5_2-src", - "wasmvm_1_beta7-src": "wasmvm_1_beta7-src" + "wasmvm_1_beta7-src": "wasmvm_1_beta7-src", + "wasmvm_2_0_0-src": "wasmvm_2_0_0-src" } }, "rust-overlay": { @@ -1666,16 +1667,16 @@ "wasmd-src": { "flake": false, "locked": { - "lastModified": 1700749637, - "narHash": "sha256-rKbuaWcRdHXSI+acHrx/hCdGOx5prPd+Dmng4BVrhzs=", + "lastModified": 1713797184, + "narHash": "sha256-k7c8RdLggeM6hSQhJt0UREY/48T3ZRSSijA+TMFKhUc=", "owner": "CosmWasm", "repo": "wasmd", - "rev": "7ea00e2ea858ed599141e322bd68171998a3259a", + "rev": "7b418de3f6cf8fbac1e9cb11c57983fcc17264d0", "type": "github" }, "original": { "owner": "CosmWasm", - "ref": "v0.50.0", + "ref": "v0.51.0", "repo": "wasmd", "type": "github" } @@ -1841,6 +1842,23 @@ "repo": "wasmvm", "type": "github" } + }, + "wasmvm_2_0_0-src": { + "flake": false, + "locked": { + "lastModified": 1710250586, + "narHash": "sha256-OmETCXyhCXWOEW/emf1ZruLMPlH8iLvM8xrqFoDaxnw=", + "owner": "CosmWasm", + "repo": "wasmvm", + "rev": "5307690b77a5fef2da3747ec72abe8f29664aeca", + "type": "github" + }, + "original": { + "owner": "CosmWasm", + "ref": "v2.0.0", + "repo": "wasmvm", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 71a69ad9..4b42ebde 100644 --- a/flake.nix +++ b/flake.nix @@ -182,12 +182,15 @@ composable-cosmos-src.url = "github:ComposableFi/composable-cosmos/v6.4.88"; composable-cosmos-src.flake = false; - wasmd-src.url = "github:CosmWasm/wasmd/v0.50.0"; + wasmd-src.url = "github:CosmWasm/wasmd/v0.51.0"; wasmd-src.flake = false; wasmvm_1-src.url = "github:CosmWasm/wasmvm/v1.0.0"; wasmvm_1-src.flake = false; + wasmvm_2_0_0-src.url = "github:CosmWasm/wasmvm/v2.0.0"; + wasmvm_2_0_0-src.flake = false; + wasmvm_1_5_2-src.url = "github:CosmWasm/wasmvm/v1.5.2"; wasmvm_1_5_2-src.flake = false; diff --git a/modules/packages.nix b/modules/packages.nix index 2621ff53..d3323574 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -166,7 +166,7 @@ }; wasmd = import ../packages/wasmd.nix { inherit (inputs) wasmd-src; - inherit (self'.packages) libwasmvm_1_5_0; + inherit (self'.packages) libwasmvm_2_0_0; inherit cosmosLib; }; rollapp-evm = import ../packages/rollapp-evm.nix { diff --git a/packages/libwasmvm.nix b/packages/libwasmvm.nix index 255548dd..b9131551 100644 --- a/packages/libwasmvm.nix +++ b/packages/libwasmvm.nix @@ -17,6 +17,18 @@ in builtins.mapAttrs (_: libwasmvm: pkgs.rustPlatform.buildRustPackage (libwasmvmCommon // libwasmvm)) { + libwasmvm_2_0_0 = { + src = "${inputs.wasmvm_2_0_0-src}/libwasmvm"; + version = "v2.0.0"; + cargoSha256 = "sha256-BFou131HI+YKXU9H51Xa/y7A441Z7QkAA92mhquJ5l4="; + cargoLock = { + lockFile = "${inputs.wasmvm_2_0_0-src}/libwasmvm/Cargo.lock"; + outputHashes = { + "cosmwasm-crypto-2.0.0" = "sha256-wXBWwc1jZsO0kfrh0jkl4+TeFsM/8ZkptCEJSpgsLG8="; + }; + }; + }; + libwasmvm_1_5_2 = { src = "${inputs.wasmvm_1_5_2-src}/libwasmvm"; version = "v1.5.2"; diff --git a/packages/wasmd.nix b/packages/wasmd.nix index 6ecdff86..5e308d4c 100644 --- a/packages/wasmd.nix +++ b/packages/wasmd.nix @@ -1,20 +1,20 @@ { wasmd-src, cosmosLib, - libwasmvm_1_5_0, + libwasmvm_2_0_0, }: cosmosLib.mkCosmosGoApp { name = "wasm"; - version = "v0.50.0"; + version = "v0.51.0"; goVersion = "1.21"; src = wasmd-src; rev = wasmd-src.rev; - vendorHash = "sha256-IS+WupPaOZgx1iJTHKbX8r6z3/9TsWamTEZCJbVpCOg="; + vendorHash = "sha256-hurRN9NUz5Lh1AOpsZNZEKPYAu+6U6GEsYz4ZUh1aAs="; tags = ["netgo"]; engine = "cometbft/cometbft"; - preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_0 "wasmd"; + preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_2_0_0 "wasmd"; dontStrip = true; - buildInputs = [libwasmvm_1_5_0]; + buildInputs = [libwasmvm_2_0_0]; # main module (github.com/CosmWasm/wasmd) does not contain package github.com/CosmWasm/wasmd/tests/system excludedPackages = ["tests/system"]; From d7f2eacb0e70c55c5499318cc9626b1fe80f338a Mon Sep 17 00:00:00 2001 From: Luca Joss <43531661+ljoss17@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:57:29 +0200 Subject: [PATCH 5/5] 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 --- flake.lock | 32 +++++++++++++++++--------------- flake.nix | 4 ++-- lib/default.nix | 4 ++-- modules/devshells.nix | 2 +- packages/andromeda.nix | 1 - packages/apalache.nix | 10 +++++----- packages/gaia.nix | 3 --- packages/ibc-go.nix | 1 - packages/injective.nix | 1 - packages/juno.nix | 6 +++--- packages/provenance.nix | 1 - packages/rollapp-evm.nix | 1 - 12 files changed, 30 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index cd576736..24b0c1b9 100644 --- a/flake.lock +++ b/flake.lock @@ -35,15 +35,16 @@ "apalache-src": { "flake": false, "locked": { - "narHash": "sha256-Z/tmBMv+QshFJLo2kBgBdkqfKwF93CgURVIbYF3dwJE=", + "lastModified": 1714996894, + "narHash": "sha256-3xw7bajvhGL+wGne4MRh/HpDFdp+HGfnfzqq8YSx9tc=", "owner": "informalsystems", "repo": "apalache", - "rev": "ec979d4554360faf9d73ddf72dccf350614076d5", + "rev": "5dee24e4d05dc3476977a2e49f4963e3802fae2f", "type": "github" }, "original": { "owner": "informalsystems", - "ref": "v0.42.0", + "ref": "v0.44.11", "repo": "apalache", "type": "github" } @@ -336,11 +337,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -958,16 +959,16 @@ "juno-src": { "flake": false, "locked": { - "lastModified": 1709992388, - "narHash": "sha256-8VcxdvaaBNyzza6U65PELt8bUII3teruokfbu5j7i9M=", + "lastModified": 1713701044, + "narHash": "sha256-AN9g1t/zOZVs5S/ZXP4/MrIC9kN6nUGG/wLNJz5fL6E=", "owner": "CosmosContracts", "repo": "juno", - "rev": "e98863bf7112f4b117a2114e22f7482367362764", + "rev": "b0faafbd6df4bb03940d99df13030af7f7bc315b", "type": "github" }, "original": { "owner": "CosmosContracts", - "ref": "v21.0.0", + "ref": "v22.0.0", "repo": "juno", "type": "github" } @@ -1084,11 +1085,11 @@ ] }, "locked": { - "lastModified": 1708764364, - "narHash": "sha256-+pOtDvmuVTg0Gi58hKDUyrNla5NbyUvt3Xs3gLR0Fws=", + "lastModified": 1712990762, + "narHash": "sha256-hO9W3w7NcnYeX8u8cleHiSpK2YJo7ecarFTUlbybl7k=", "owner": "nlewo", "repo": "nix2container", - "rev": "c891f90d2e3c48a6b33466c96e4851e0fc0cf455", + "rev": "20aad300c925639d5d6cbe30013c8357ce9f2a2e", "type": "github" }, "original": { @@ -1189,10 +1190,11 @@ }, "nixpkgs_3": { "locked": { - "narHash": "sha256-FtPPshEpxH/ewBOsdKBNhlsL2MLEFv1hEnQ19f/bFsQ=", + "lastModified": 1717868076, + "narHash": "sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ad9903c16126a7d949101687af0aa589b1d7d3d", + "rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4b42ebde..3d6448a0 100644 --- 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 index 20aee77a..e07169c3 100644 --- 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 index 709f55af..da1b2cb1 100644 --- 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 index 104dcb32..091f1c2d 100644 --- 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 index 6be8c038..dd121a25 100644 --- 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 index fe6e32ed..9b754ba1 100644 --- 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 index 6088d347..57973a9d 100644 --- 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 index 1fbf9521..d9337d67 100644 --- 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 index 219e9dbd..25afd201 100644 --- 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 index 2dc93b76..cbea2307 100644 --- 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 index 9e9ffc37..dee68346 100644 --- 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"; }