From 3b46d70aeb4be87f52896199cc2aceeeb9d55deb Mon Sep 17 00:00:00 2001 From: Jonathan Lorimer <32466011+JonathanLorimer@users.noreply.github.com> Date: Thu, 30 Nov 2023 12:29:44 -0500 Subject: [PATCH] Update non-cosmos inputs (#179) * update non-cosmos inputs, switch to vendorHash * update rust overlay * switch from nightly to stable --- flake.lock | 83 ++++++-------------------------- flake.nix | 3 +- lib/default.nix | 6 +-- modules/devshells.nix | 2 +- packages/akash.nix | 2 +- packages/celestia.nix | 2 +- packages/centauri.nix | 2 +- packages/cometbft.nix | 2 +- packages/cosmovisor.nix | 2 +- packages/crescent.nix | 2 +- packages/evmos.nix | 2 +- packages/gaia.nix | 24 ++++----- packages/gex.nix | 2 +- packages/gm.nix | 4 +- packages/ibc-go.nix | 16 +++--- packages/ica.nix | 2 +- packages/ignite-cli.nix | 2 +- packages/interchain-security.nix | 2 +- packages/ixo.nix | 2 +- packages/juno.nix | 2 +- packages/libwasmvm.nix | 4 +- packages/migaloo.nix | 2 +- packages/neutron.nix | 2 +- packages/osmosis.nix | 2 +- packages/provenance.nix | 2 +- packages/regen.nix | 2 +- packages/relayer.nix | 2 +- packages/sentinel.nix | 2 +- packages/sifchain.nix | 2 +- packages/simd.nix | 2 +- packages/stargaze.nix | 2 +- packages/stride.nix | 8 +-- packages/umee.nix | 2 +- packages/wasmd.nix | 2 +- packages/wasmd_next.nix | 2 +- 35 files changed, 75 insertions(+), 127 deletions(-) diff --git a/flake.lock b/flake.lock index c7bebcf5..f59b42e2 100644 --- a/flake.lock +++ b/flake.lock @@ -192,24 +192,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -224,16 +206,13 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, + "flake-utils_2": { "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -784,11 +763,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699725108, - "narHash": "sha256-NTiPW4jRC+9puakU4Vi8WpFEirhp92kTOSThuZke+FA=", + "lastModified": 1701040486, + "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "911ad1e67f458b6bcf0278fa85e33bb9924fed7e", + "rev": "45827faa2132b8eade424f6bdd48d8828754341a", "type": "github" }, "original": { @@ -834,11 +813,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1699343069, - "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", + "lastModified": 1674990008, + "narHash": "sha256-4zOyp+hFW2Y7imxIpZqZGT8CEqKmDjwgfD6BzRUE0mQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", + "rev": "d2bbcbe6c626d339b25a4995711f07625b508214", "type": "github" }, "original": { @@ -929,7 +908,6 @@ "crescent-src": "crescent-src", "evmos-src": "evmos-src", "flake-parts": "flake-parts", - "flake-utils": "flake-utils", "gaia-main-src": "gaia-main-src", "gaia10-src": "gaia10-src", "gaia11-src": "gaia11-src", @@ -991,27 +969,26 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1688265347, - "narHash": "sha256-oe3kLnNvw2VWbG4Rp6IWUO5Uu5gF8J2oq8DbqbCsdZ4=", + "lastModified": 1701310566, + "narHash": "sha256-CL9J3xUR2Ejni4LysrEGX0IdO+Y4BXCiH/By0lmF3eQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b8f3db465405014039985f1c5cea92cc29e1b3b5", + "rev": "6d3c6e185198b8bf7ad639f22404a75aa9a09bff", "type": "github" }, "original": { "owner": "oxalica", "repo": "rust-overlay", - "rev": "b8f3db465405014039985f1c5cea92cc29e1b3b5", "type": "github" } }, "sbt-derivation": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_3" }, "locked": { @@ -1160,36 +1137,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "umee-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 03ce2e9c..de84cd08 100644 --- a/flake.nix +++ b/flake.nix @@ -32,8 +32,7 @@ inputs = { # Nix Inputs nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - rust-overlay.url = "github:oxalica/rust-overlay/b8f3db465405014039985f1c5cea92cc29e1b3b5"; + rust-overlay.url = "github:oxalica/rust-overlay"; sbt-derivation.url = "github:zaninime/sbt-derivation"; nix-std.url = "github:chessai/nix-std"; flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/lib/default.nix b/lib/default.nix index 187d9e55..a2c8aa3e 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -4,7 +4,7 @@ nix-std: pkgs: let version, src, engine, - vendorSha256, + vendorHash, additionalLdFlags ? "", appName ? null, preCheck ? null, @@ -15,7 +15,7 @@ nix-std: pkgs: let pkgs.lib.filterAttrs (n: _: builtins.all (a: a != n) - ["src" "name" "version" "vendorSha256" "appName"]) + ["src" "name" "version" "vendorHash" "appName"]) args; dependency-version = with nix-std.lib; let @@ -51,7 +51,7 @@ nix-std: pkgs: let buildGoModule = buildGoModuleVersion.${goVersion}; in buildGoModule ({ - inherit version src vendorSha256; + inherit version src vendorHash; pname = name; preCheck = if preCheck == null diff --git a/modules/devshells.nix b/modules/devshells.nix index b468015b..4575833f 100644 --- a/modules/devshells.nix +++ b/modules/devshells.nix @@ -21,7 +21,7 @@ buildInputs = with pkgs; [ go - rust-bin.stable.latest.default + (rust-bin.selectLatestNightlyWith (toolchain: toolchain.default)) openssl shellcheck ] diff --git a/packages/akash.nix b/packages/akash.nix index 7c662585..ee8283f8 100644 --- a/packages/akash.nix +++ b/packages/akash.nix @@ -4,7 +4,7 @@ version = "v0.15.0-rc17"; appName = "akash"; src = akash-src; - vendorSha256 = "sha256-p7GVC1DkOdekfXMaHkXeIZw/CjtTpQCSO0ivDZkmx4c="; + vendorHash = "sha256-p7GVC1DkOdekfXMaHkXeIZw/CjtTpQCSO0ivDZkmx4c="; tags = ["netgo"]; engine = "tendermint/tendermint"; doCheck = false; diff --git a/packages/celestia.nix b/packages/celestia.nix index e47f5f9f..1dc1031d 100644 --- a/packages/celestia.nix +++ b/packages/celestia.nix @@ -7,7 +7,7 @@ mkCosmosGoApp { version = "v1.4.0"; src = celestia-src; goVersion = "1.21"; - vendorSha256 = "sha256-KvkVqJZ5kvkKWXTYgG7+Ksz8aLhGZPBG5zkM44fVNT4="; + vendorHash = "sha256-KvkVqJZ5kvkKWXTYgG7+Ksz8aLhGZPBG5zkM44fVNT4="; engine = "tendermint/tendermint"; doCheck = false; } diff --git a/packages/centauri.nix b/packages/centauri.nix index 14ab664b..e4f70660 100644 --- a/packages/centauri.nix +++ b/packages/centauri.nix @@ -7,7 +7,7 @@ cosmosLib.mkCosmosGoApp { name = "centauri"; version = "v6.3.1"; src = centauri-src; - vendorSha256 = "sha256-MRADQxw+T8lVJujJn2yEaZOEs6AYGgaiBbYJUI3cugA="; + vendorHash = "sha256-MRADQxw+T8lVJujJn2yEaZOEs6AYGgaiBbYJUI3cugA="; tags = ["netgo"]; engine = "cometbft/cometbft"; excludedPackages = ["interchaintest" "simd"]; diff --git a/packages/cometbft.nix b/packages/cometbft.nix index 6dc1972b..38e61aaa 100644 --- a/packages/cometbft.nix +++ b/packages/cometbft.nix @@ -2,6 +2,6 @@ buildGoModule { name = "cometbft"; src = cometbft-src; - vendorSha256 = "sha256-rZeC0B5U0bdtZAw/hnMJ7XG73jN0nsociAN8GGdmlUY="; + vendorHash = "sha256-rZeC0B5U0bdtZAw/hnMJ7XG73jN0nsociAN8GGdmlUY="; doCheck = false; } diff --git a/packages/cosmovisor.nix b/packages/cosmovisor.nix index 5c9ac4fa..0f1a3a78 100644 --- a/packages/cosmovisor.nix +++ b/packages/cosmovisor.nix @@ -2,6 +2,6 @@ buildGoModule { name = "cosmovisor"; src = "${cosmos-sdk-src}/cosmovisor"; - vendorSha256 = "sha256-APJ+mt8e2zHiO/8UI7Zt63P5HFxEG2ogLf5uxfp58cQ="; + vendorHash = "sha256-APJ+mt8e2zHiO/8UI7Zt63P5HFxEG2ogLf5uxfp58cQ="; doCheck = false; } diff --git a/packages/crescent.nix b/packages/crescent.nix index 62cc9ca5..3f3bf1af 100644 --- a/packages/crescent.nix +++ b/packages/crescent.nix @@ -3,7 +3,7 @@ name = "crescent"; version = "v1.0.0-rc3"; src = crescent-src; - vendorSha256 = "sha256-WLLQKXjPRhK19oEdqp2UBZpi9W7wtYjJMj07omH41K0="; + vendorHash = "sha256-WLLQKXjPRhK19oEdqp2UBZpi9W7wtYjJMj07omH41K0="; tags = ["netgo"]; engine = "tendermint/tendermint"; additionalLdFlags = '' diff --git a/packages/evmos.nix b/packages/evmos.nix index 305070fe..6cdb8cf5 100644 --- a/packages/evmos.nix +++ b/packages/evmos.nix @@ -3,7 +3,7 @@ name = "evmos"; version = "v9.1.0"; src = evmos-src; - vendorSha256 = "sha256-AjWuufyAz5KTBwKiWvhPeqGm4fn3MUqg39xb4pJ0hTM="; + vendorHash = "sha256-AjWuufyAz5KTBwKiWvhPeqGm4fn3MUqg39xb4pJ0hTM="; tags = ["netgo"]; engine = "tendermint/tendermint"; } diff --git a/packages/gaia.nix b/packages/gaia.nix index 4bca4445..a6350bfc 100644 --- a/packages/gaia.nix +++ b/packages/gaia.nix @@ -7,7 +7,7 @@ with inputs; { gaia-main = { name = "gaia"; - vendorSha256 = "sha256-V0DMuwKeCYpVlzF9g3cQD6YViJZQZeoszxbUqrUyQn4="; + vendorHash = "sha256-V0DMuwKeCYpVlzF9g3cQD6YViJZQZeoszxbUqrUyQn4="; version = "v8.0.0"; src = gaia5-src; engine = "tendermint/tendermint"; @@ -15,7 +15,7 @@ with inputs; gaia5 = { name = "gaia"; - vendorSha256 = "sha256-V0DMuwKeCYpVlzF9g3cQD6YViJZQZeoszxbUqrUyQn4="; + vendorHash = "sha256-V0DMuwKeCYpVlzF9g3cQD6YViJZQZeoszxbUqrUyQn4="; version = "v5.0.6"; src = gaia5-src; tags = ["netgo"]; @@ -24,7 +24,7 @@ with inputs; gaia6 = { name = "gaia"; - vendorSha256 = "sha256-KeF3gO5sUJEXWqb6EVYBYXpVBfhvyXZ4f03l63wYTjE="; + vendorHash = "sha256-KeF3gO5sUJEXWqb6EVYBYXpVBfhvyXZ4f03l63wYTjE="; version = "v6.0.4"; src = gaia6-src; tags = ["netgo"]; @@ -33,7 +33,7 @@ with inputs; gaia6-ordered = { name = "gaia"; - vendorSha256 = "sha256-4gBFn+zY3JK2xGKdIlYgRbK3WWjmtKFdEaUc1+nT4zw="; + vendorHash = "sha256-4gBFn+zY3JK2xGKdIlYgRbK3WWjmtKFdEaUc1+nT4zw="; version = "v6.0.4-ordered"; src = gaia6-ordered-src; tags = ["netgo"]; @@ -42,7 +42,7 @@ with inputs; gaia7 = { name = "gaia"; - vendorSha256 = "sha256-bNeSSZ1n1fEvO9ITGGJzsc+S2QE7EoB703mPHzrEqAg="; + vendorHash = "sha256-bNeSSZ1n1fEvO9ITGGJzsc+S2QE7EoB703mPHzrEqAg="; version = "v7.1.0"; src = gaia7-src; tags = ["netgo"]; @@ -54,7 +54,7 @@ with inputs; gaia8 = { name = "gaia"; - vendorSha256 = "sha256-w3MLjxXzKytMxCN9Q9RPeeXq7ijDQXoH0d+ti5FLMtA="; + vendorHash = "sha256-w3MLjxXzKytMxCN9Q9RPeeXq7ijDQXoH0d+ti5FLMtA="; version = "v8.0.1"; src = gaia8-src; tags = ["netgo"]; @@ -67,7 +67,7 @@ with inputs; gaia9 = { name = "gaia"; - vendorSha256 = "sha256-W1pKtrWfXe0pdO7ntcjFbDa0LTpD91yI2mUMXBiDo1w="; + vendorHash = "sha256-W1pKtrWfXe0pdO7ntcjFbDa0LTpD91yI2mUMXBiDo1w="; version = "v9.0.3"; src = gaia9-src; tags = ["netgo"]; @@ -80,7 +80,7 @@ with inputs; gaia10 = { name = "gaia"; - vendorSha256 = "sha256-W0+XQyXDvwKq7iS9GhW/UK0/4D32zK26u0abGNPsdZc="; + vendorHash = "sha256-W0+XQyXDvwKq7iS9GhW/UK0/4D32zK26u0abGNPsdZc="; version = "v10.0.2"; src = gaia10-src; tags = ["netgo"]; @@ -93,7 +93,7 @@ with inputs; gaia11 = { name = "gaia"; - vendorSha256 = "sha256-05S5mmex/IReEBfo0BgB/99NWY7tGM2wWCi0qTa50oM="; + vendorHash = "sha256-05S5mmex/IReEBfo0BgB/99NWY7tGM2wWCi0qTa50oM="; version = "v11.0.0"; src = gaia11-src; tags = ["netgo"]; @@ -106,7 +106,7 @@ with inputs; gaia12 = { name = "gaia"; - vendorSha256 = "sha256-yULjy7lBfxgm0rZjqwIAu99TYBnW4O29mz7u+Bnu6gY="; + vendorHash = "sha256-yULjy7lBfxgm0rZjqwIAu99TYBnW4O29mz7u+Bnu6gY="; version = "v12.0.0"; src = gaia12-src; tags = ["netgo"]; @@ -119,7 +119,7 @@ with inputs; gaia13 = { name = "gaia"; - vendorSha256 = "sha256-SQF6YNVVOfpL55Uc4LIzo2jv/cdKp8hHUeqcpc/dBEc="; + vendorHash = "sha256-SQF6YNVVOfpL55Uc4LIzo2jv/cdKp8hHUeqcpc/dBEc="; version = "v13.0.2"; goVersion = "1.20"; src = gaia13-src; @@ -133,7 +133,7 @@ with inputs; gaia14 = { name = "gaia"; - vendorSha256 = "sha256-7hmP0Uc4HHW7voy3DRMkpAXifon/qnaaT6jaUf/h8HU="; + vendorHash = "sha256-7hmP0Uc4HHW7voy3DRMkpAXifon/qnaaT6jaUf/h8HU="; version = "v14.0.0"; goVersion = "1.20"; src = gaia14-src; diff --git a/packages/gex.nix b/packages/gex.nix index 8fabda2a..0e2c158e 100644 --- a/packages/gex.nix +++ b/packages/gex.nix @@ -6,5 +6,5 @@ buildGoModule { name = "gex"; doCheck = false; src = gex-src; - vendorSha256 = "sha256-3vD0ge0zWSnGoeh5FAFEw60a7q5/YWgDsGjjgibBBNI="; + vendorHash = "sha256-3vD0ge0zWSnGoeh5FAFEw60a7q5/YWgDsGjjgibBBNI="; } diff --git a/packages/gm.nix b/packages/gm.nix index b441c524..9a6f8b2c 100644 --- a/packages/gm.nix +++ b/packages/gm.nix @@ -10,13 +10,13 @@ let stoml = pkgs.buildGoModule { name = "stoml"; src = inputs.stoml-src; - vendorSha256 = "sha256-i5m2I0IApTwD9XIjsDwU4dpNtwGI0EGeSkY6VbXDOAM="; + vendorHash = "sha256-i5m2I0IApTwD9XIjsDwU4dpNtwGI0EGeSkY6VbXDOAM="; }; sconfig = pkgs.buildGoModule { name = "sconfig"; src = inputs.sconfig-src; - vendorSha256 = "sha256-J3L8gPtCShn//3mliMzvRTxRgb86f1pJ+yjZkF5ixEk="; + vendorHash = "sha256-J3L8gPtCShn//3mliMzvRTxRgb86f1pJ+yjZkF5ixEk="; }; in stdenv.mkDerivation { pname = "gm"; diff --git a/packages/ibc-go.nix b/packages/ibc-go.nix index f538af5b..ebbd7348 100644 --- a/packages/ibc-go.nix +++ b/packages/ibc-go.nix @@ -9,7 +9,7 @@ with inputs; name = "simapp"; src = ibc-go-v2-src; version = "v2.4.1"; - vendorSha256 = "sha256-edKJYHKYOkpdXs1xHEdFjlNT1m4IhhhyyzIKjYvhE38="; + vendorHash = "sha256-edKJYHKYOkpdXs1xHEdFjlNT1m4IhhhyyzIKjYvhE38="; tags = ["netgo"]; engine = "tendermint/tendermint"; }; @@ -18,7 +18,7 @@ with inputs; name = "simapp"; version = "v3.3.0"; src = ibc-go-v3-src; - vendorSha256 = "sha256-jI1Ky8SzwZ3PhAZrDJQknAWUnu0G9rktAyaE4J/o8Cw="; + vendorHash = "sha256-jI1Ky8SzwZ3PhAZrDJQknAWUnu0G9rktAyaE4J/o8Cw="; tags = ["netgo"]; engine = "tendermint/tendermint"; }; @@ -27,7 +27,7 @@ with inputs; name = "simapp"; version = "v4.2.0"; src = ibc-go-v4-src; - vendorSha256 = "sha256-M8N6IPBnhOQp4LsCgdKc0NOtdeLNkAcXtGsvHS00D+g="; + vendorHash = "sha256-M8N6IPBnhOQp4LsCgdKc0NOtdeLNkAcXtGsvHS00D+g="; tags = ["netgo"]; engine = "tendermint/tendermint"; }; @@ -36,7 +36,7 @@ with inputs; name = "simapp"; version = "v5.1.0"; src = ibc-go-v5-src; - vendorSha256 = "sha256-KajTi+hCMM8AoLsGmWV7qVGbYA8vZhn+0tmG20zJgPI="; + vendorHash = "sha256-KajTi+hCMM8AoLsGmWV7qVGbYA8vZhn+0tmG20zJgPI="; tags = ["netgo"]; engine = "tendermint/tendermint"; excludedPackages = ["./e2e"]; @@ -46,7 +46,7 @@ with inputs; name = "simapp"; version = "v6.1.0"; src = ibc-go-v6-src; - vendorSha256 = "sha256-hP/DTNkB1NI7yZZDn5tYy/9jYIb3BqESxIG2A4wgjJU"; + vendorHash = "sha256-hP/DTNkB1NI7yZZDn5tYy/9jYIb3BqESxIG2A4wgjJU"; tags = ["netgo"]; engine = "tendermint/tendermint"; excludedPackages = ["./e2e"]; @@ -58,7 +58,7 @@ with inputs; name = "simd"; version = "v7.3.0"; src = inputs.ibc-go-v7-src; - vendorSha256 = "sha256-Wn7krfvF7E93g4KnGZ8iXaSjc+kmGgQ8Jb5egWNMQg8="; + vendorHash = "sha256-Wn7krfvF7E93g4KnGZ8iXaSjc+kmGgQ8Jb5egWNMQg8="; goVersion = "1.20"; tags = ["netgo"]; engine = "cometbft/cometbft"; @@ -72,7 +72,7 @@ with inputs; name = "simd"; version = "v8.0.0"; src = inputs.ibc-go-v8-src; - vendorSha256 = "sha256-XlbW/4KIzWhdwXR6/oZ/wLbm76BcszbHibGNuxvgCAE="; + vendorHash = "sha256-XlbW/4KIzWhdwXR6/oZ/wLbm76BcszbHibGNuxvgCAE="; goVersion = "1.21"; tags = ["netgo"]; engine = "cometbft/cometbft"; @@ -86,7 +86,7 @@ with inputs; name = "simd"; version = "channel-upgrade-alpha.0"; src = inputs.ibc-go-v8-channel-upgrade-src; - vendorSha256 = "sha256-FOCQcn9r7mmpjY9h4gvwcRqL4qhu3wkXsx1KM1n17Cg="; + vendorHash = "sha256-FOCQcn9r7mmpjY9h4gvwcRqL4qhu3wkXsx1KM1n17Cg="; goVersion = "1.21"; tags = ["netgo"]; engine = "cometbft/cometbft"; diff --git a/packages/ica.nix b/packages/ica.nix index cf034efb..d89e073e 100644 --- a/packages/ica.nix +++ b/packages/ica.nix @@ -5,5 +5,5 @@ buildGoModule { name = "ica"; src = ica-src; - vendorSha256 = "sha256-ZIP6dmHugLLtdA/8N8byg3D3JinjNxpvxyK/qiIs7bI="; + vendorHash = "sha256-ZIP6dmHugLLtdA/8N8byg3D3JinjNxpvxyK/qiIs7bI="; } diff --git a/packages/ignite-cli.nix b/packages/ignite-cli.nix index 65b8cb3b..59cd4648 100644 --- a/packages/ignite-cli.nix +++ b/packages/ignite-cli.nix @@ -2,7 +2,7 @@ buildGoModule rec { name = "ignite-cli"; src = ignite-cli-src; - vendorSha256 = "sha256-P1NYgvdobi6qy1sSKFwkBwPRpLuvCJE5rCD2s/vvm14="; + vendorHash = "sha256-P1NYgvdobi6qy1sSKFwkBwPRpLuvCJE5rCD2s/vvm14="; doCheck = false; ldflags = '' -X github.com/ignite/cli/ignite/version.Head=${src.rev} diff --git a/packages/interchain-security.nix b/packages/interchain-security.nix index e8f5690a..c1080d3b 100644 --- a/packages/interchain-security.nix +++ b/packages/interchain-security.nix @@ -4,7 +4,7 @@ appName = "interchain-security"; version = "v3.0.0-pre"; src = interchain-security-src; - vendorSha256 = "sha256-TnU7lJnoD/ZzPS2XfvFGkb/ycLbH3iHvKRim+31+Yro="; + vendorHash = "sha256-TnU7lJnoD/ZzPS2XfvFGkb/ycLbH3iHvKRim+31+Yro="; tags = ["netgo"]; engine = "cometbft/cometbft"; doCheck = false; # tests are currently failing diff --git a/packages/ixo.nix b/packages/ixo.nix index 67b7d39e..580cb0ac 100644 --- a/packages/ixo.nix +++ b/packages/ixo.nix @@ -3,7 +3,7 @@ name = "ixo"; version = "v0.18.0-rc1"; src = ixo-src; - vendorSha256 = "sha256-g6dKujkFZLpFGpxgzb7v1YOo4cdeP6eEAbUjMzAIkF8="; + vendorHash = "sha256-g6dKujkFZLpFGpxgzb7v1YOo4cdeP6eEAbUjMzAIkF8="; tags = ["netgo"]; engine = "tendermint/tendermint"; doCheck = false; diff --git a/packages/juno.nix b/packages/juno.nix index 0c5c6dca..6d94bce7 100644 --- a/packages/juno.nix +++ b/packages/juno.nix @@ -3,7 +3,7 @@ name = "juno"; version = "v17.1.1"; src = juno-src; - vendorSha256 = "sha256-ftmNMjCFWq4XGM9+ad64dzzcgQJ1ApH4YmthldfrB54="; + vendorHash = "sha256-ftmNMjCFWq4XGM9+ad64dzzcgQJ1ApH4YmthldfrB54="; tags = ["netgo"]; engine = "cometbft/cometbft"; excludedPackages = ["interchaintest"]; diff --git a/packages/libwasmvm.nix b/packages/libwasmvm.nix index 64fb9642..725386bd 100644 --- a/packages/libwasmvm.nix +++ b/packages/libwasmvm.nix @@ -5,7 +5,9 @@ }: let libwasmvmCommon = { pname = "libwasmvm"; - nativeBuildInputs = with pkgs; [rust-bin.stable.latest.default]; + nativeBuildInputs = with pkgs; [ + rust-bin.stable.latest.default + ]; postInstall = '' cp ./bindings.h $out/lib/ ln -s $out/lib/libwasmvm.so $out/lib/libwasmvm.${builtins.head (pkgs.lib.strings.splitString "-" system)}.so diff --git a/packages/migaloo.nix b/packages/migaloo.nix index 2657432a..22969fbb 100644 --- a/packages/migaloo.nix +++ b/packages/migaloo.nix @@ -7,7 +7,7 @@ cosmosLib.mkCosmosGoApp { name = "migaloo"; version = "v3.0.2"; src = migaloo-src; - vendorSha256 = "sha256-GQDfI4hSkkrsBfIczdGoOhghR7/FqEvXavyP4E6iHM4="; + vendorHash = "sha256-GQDfI4hSkkrsBfIczdGoOhghR7/FqEvXavyP4E6iHM4="; engine = "tendermint/tendermint"; preFixup = '' ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_2_3 "migalood"} diff --git a/packages/neutron.nix b/packages/neutron.nix index 4f042ad4..b955af44 100644 --- a/packages/neutron.nix +++ b/packages/neutron.nix @@ -7,7 +7,7 @@ cosmosLib.mkCosmosGoApp { name = "neutron"; version = "v1.0.4"; src = neutron-src; - vendorSha256 = "sha256-jlzFYx09U7BkBg9LDZqfwT4aASQSbuVBl0a/WCrly8A="; + vendorHash = "sha256-jlzFYx09U7BkBg9LDZqfwT4aASQSbuVBl0a/WCrly8A="; engine = "tendermint/tendermint"; preFixup = '' ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_2_3 "neutrond"} diff --git a/packages/osmosis.nix b/packages/osmosis.nix index 4d409449..5496dd29 100644 --- a/packages/osmosis.nix +++ b/packages/osmosis.nix @@ -3,7 +3,7 @@ name = "osmosis"; version = "v20.4.0"; src = osmosis-src; - vendorSha256 = "sha256-WN6H+lRS+wX4CiVEVMxp4fW2vtZxTi+O6SncJdrUFLo="; + vendorHash = "sha256-WN6H+lRS+wX4CiVEVMxp4fW2vtZxTi+O6SncJdrUFLo="; tags = ["netgo"]; excludedPackages = ["cl-genesis-positions"]; engine = "tendermint/tendermint"; diff --git a/packages/provenance.nix b/packages/provenance.nix index f36ed8fd..3c2c70ae 100644 --- a/packages/provenance.nix +++ b/packages/provenance.nix @@ -4,7 +4,7 @@ version = "v1.17.0"; goVersion = "1.20"; src = provenance-src; - vendorSha256 = "sha256-XFU/+lMwg4hLlyYGUvDp0SqGqijrUQZddoH4VkIvqHg="; + vendorHash = "sha256-XFU/+lMwg4hLlyYGUvDp0SqGqijrUQZddoH4VkIvqHg="; tags = ["netgo"]; engine = "tendermint/tendermint"; preFixup = '' diff --git a/packages/regen.nix b/packages/regen.nix index 3eb1286f..306946a2 100644 --- a/packages/regen.nix +++ b/packages/regen.nix @@ -4,7 +4,7 @@ version = "v3.0.0"; subPackages = ["app/regen"]; src = regen-src; - vendorSha256 = "sha256-IdxIvL8chuGD71q4V7c+RWZ7PoEAVQ7++Crdlz2q/XI="; + vendorHash = "sha256-IdxIvL8chuGD71q4V7c+RWZ7PoEAVQ7++Crdlz2q/XI="; tags = ["netgo"]; engine = "tendermint/tendermint"; } diff --git a/packages/relayer.nix b/packages/relayer.nix index 59cd4d4d..cfb0c6d8 100644 --- a/packages/relayer.nix +++ b/packages/relayer.nix @@ -2,6 +2,6 @@ buildGoModule { name = "relayer"; src = relayer-src; - vendorSha256 = "sha256-oJSxRUKXhjpDWk0bk7Q8r0AAc7UOhEOLj+SgsZsnzsk="; + vendorHash = "sha256-oJSxRUKXhjpDWk0bk7Q8r0AAc7UOhEOLj+SgsZsnzsk="; doCheck = false; } diff --git a/packages/sentinel.nix b/packages/sentinel.nix index e343335f..50e9a73a 100644 --- a/packages/sentinel.nix +++ b/packages/sentinel.nix @@ -4,7 +4,7 @@ version = "v9.0.0-rc0"; appName = "sentinelhub"; src = sentinel-src; - vendorSha256 = "sha256-ktIKTw7J4EYKWu6FBfxzvYm8ldHG00KakRY5QR8cjrI="; + vendorHash = "sha256-ktIKTw7J4EYKWu6FBfxzvYm8ldHG00KakRY5QR8cjrI="; tags = ["netgo"]; engine = "tendermint/tendermint"; } diff --git a/packages/sifchain.nix b/packages/sifchain.nix index e2d984ac..97eb20ba 100644 --- a/packages/sifchain.nix +++ b/packages/sifchain.nix @@ -3,7 +3,7 @@ name = "sifchain"; version = "v0.12.1"; src = sifchain-src; - vendorSha256 = "sha256-AX5jLfH9RnoGZm5MVyM69NnxVjYMR45CNaKzQn5hsXg="; + vendorHash = "sha256-AX5jLfH9RnoGZm5MVyM69NnxVjYMR45CNaKzQn5hsXg="; tags = ["netgo"]; engine = "tendermint/tendermint"; additionalLdFlags = '' diff --git a/packages/simd.nix b/packages/simd.nix index c570a44b..cf640ec7 100644 --- a/packages/simd.nix +++ b/packages/simd.nix @@ -2,7 +2,7 @@ buildGoModule { name = "simd"; src = cosmos-sdk-src; - vendorSha256 = "sha256-ZlfvpnaF/SBHeXW2tzO3DVEyh1Uh4qNNXBd+AoWd/go="; + vendorHash = "sha256-ZlfvpnaF/SBHeXW2tzO3DVEyh1Uh4qNNXBd+AoWd/go="; doCheck = false; excludedPackages = [ "./client/v2" diff --git a/packages/stargaze.nix b/packages/stargaze.nix index 07119660..58521667 100644 --- a/packages/stargaze.nix +++ b/packages/stargaze.nix @@ -5,7 +5,7 @@ version = "v3.0.0"; src = stargaze-src; buildInputs = [libwasmvm_1beta7]; - vendorSha256 = "sha256-IJwyjto86gnWyeux1AS+aPZONhpyB7+MSQcCRs3LHzw="; + vendorHash = "sha256-IJwyjto86gnWyeux1AS+aPZONhpyB7+MSQcCRs3LHzw="; preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_1beta7 "starsd"; tags = ["netgo"]; engine = "tendermint/tendermint"; diff --git a/packages/stride.nix b/packages/stride.nix index 43df736d..6a3d9d57 100644 --- a/packages/stride.nix +++ b/packages/stride.nix @@ -9,7 +9,7 @@ with inputs; name = "stride"; version = "v8.0.0"; src = stride-src; - vendorSha256 = "sha256-z4vT4CeoJF76GwljHm2L2UF1JxyEJtvqAkP9TmIgs10="; + vendorHash = "sha256-z4vT4CeoJF76GwljHm2L2UF1JxyEJtvqAkP9TmIgs10="; engine = "tendermint/tendermint"; doCheck = false; @@ -19,7 +19,7 @@ with inputs; name = "stride-consumer"; version = "v12.1.0"; src = stride-consumer-src; - vendorSha256 = "sha256-tH56oB9Lw0/+ypWRj9n8o/QHPcLQuuNkzD4zFy6bW04="; + vendorHash = "sha256-tH56oB9Lw0/+ypWRj9n8o/QHPcLQuuNkzD4zFy6bW04="; engine = "cometbft/cometbft"; doCheck = false; @@ -29,7 +29,7 @@ with inputs; name = "stride-consumer-no-admin"; version = "v12.1.0"; src = stride-consumer-src; - vendorSha256 = "sha256-tH56oB9Lw0/+ypWRj9n8o/QHPcLQuuNkzD4zFy6bW04="; + vendorHash = "sha256-tH56oB9Lw0/+ypWRj9n8o/QHPcLQuuNkzD4zFy6bW04="; engine = "cometbft/cometbft"; patches = [../patches/stride-no-admin-check.patch]; @@ -40,7 +40,7 @@ with inputs; name = "stride-no-admin"; version = "v8.0.0"; src = stride-src; - vendorSha256 = "sha256-z4vT4CeoJF76GwljHm2L2UF1JxyEJtvqAkP9TmIgs10="; + vendorHash = "sha256-z4vT4CeoJF76GwljHm2L2UF1JxyEJtvqAkP9TmIgs10="; engine = "tendermint/tendermint"; patches = [../patches/stride-no-admin-check.patch]; diff --git a/packages/umee.nix b/packages/umee.nix index 994a165f..600766fd 100644 --- a/packages/umee.nix +++ b/packages/umee.nix @@ -4,7 +4,7 @@ version = "v2.0.0"; subPackages = ["cmd/umeed"]; src = umee-src; - vendorSha256 = "sha256-VXBB2ZBh4QFbGQm3bXsl63MeASZMI1++wnhm2IrDrwk="; + vendorHash = "sha256-VXBB2ZBh4QFbGQm3bXsl63MeASZMI1++wnhm2IrDrwk="; tags = ["netgo"]; engine = "tendermint/tendermint"; } diff --git a/packages/wasmd.nix b/packages/wasmd.nix index 52f0c963..9f3ebee5 100644 --- a/packages/wasmd.nix +++ b/packages/wasmd.nix @@ -7,7 +7,7 @@ cosmosLib.mkCosmosGoApp { name = "wasm"; version = "v0.30.0"; src = wasmd-src; - vendorSha256 = "sha256-8Uo/3SdXwblt87WU78gjpRPcHy+ZotmhF6xTyb3Jxe0"; + vendorHash = "sha256-8Uo/3SdXwblt87WU78gjpRPcHy+ZotmhF6xTyb3Jxe0"; tags = ["netgo"]; engine = "tendermint/tendermint"; preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_1_1_1 "wasmd"; diff --git a/packages/wasmd_next.nix b/packages/wasmd_next.nix index 538f31a5..c99d7bab 100644 --- a/packages/wasmd_next.nix +++ b/packages/wasmd_next.nix @@ -7,7 +7,7 @@ cosmosLib.mkCosmosGoApp { name = "wasm"; version = "v0.40.0-rc.1"; src = wasmd_next-src; - vendorSha256 = "sha256-FWpclJuuIkbcoXxRTeZwDR0wZP2eHkPKsu7xme5vLPg="; + vendorHash = "sha256-FWpclJuuIkbcoXxRTeZwDR0wZP2eHkPKsu7xme5vLPg="; tags = ["netgo"]; engine = "cometbft/cometbft"; preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_1_2_3 "wasmd";