Skip to content

Commit

Permalink
Update non-cosmos inputs (#179)
Browse files Browse the repository at this point in the history 
* update non-cosmos inputs, switch to vendorHash

* update rust overlay

* switch from nightly to stable
  • Loading branch information
@JonathanLorimer
JonathanLorimer authored Nov 30, 2023
1 parent f0346a8 commit 3b46d70
Show file tree
Hide file tree
Showing 35 changed files with 75 additions and 127 deletions.
83 changes: 15 additions & 68 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
6 changes: 3 additions & 3 deletions lib/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ nix-std: pkgs: let
version,
src,
engine,
vendorSha256,
vendorHash,
additionalLdFlags ? "",
appName ? null,
preCheck ? null,
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/devshells.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
buildInputs = with pkgs;
[
go
rust-bin.stable.latest.default
(rust-bin.selectLatestNightlyWith (toolchain: toolchain.default))
openssl
shellcheck
]
Expand Down
2 changes: 1 addition & 1 deletion packages/akash.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/celestia.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion packages/centauri.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
2 changes: 1 addition & 1 deletion packages/cometbft.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
buildGoModule {
name = "cometbft";
src = cometbft-src;
vendorSha256 = "sha256-rZeC0B5U0bdtZAw/hnMJ7XG73jN0nsociAN8GGdmlUY=";
vendorHash = "sha256-rZeC0B5U0bdtZAw/hnMJ7XG73jN0nsociAN8GGdmlUY=";
doCheck = false;
}
2 changes: 1 addition & 1 deletion packages/cosmovisor.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
buildGoModule {
name = "cosmovisor";
src = "${cosmos-sdk-src}/cosmovisor";
vendorSha256 = "sha256-APJ+mt8e2zHiO/8UI7Zt63P5HFxEG2ogLf5uxfp58cQ=";
vendorHash = "sha256-APJ+mt8e2zHiO/8UI7Zt63P5HFxEG2ogLf5uxfp58cQ=";
doCheck = false;
}
2 changes: 1 addition & 1 deletion packages/crescent.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
Expand Down
2 changes: 1 addition & 1 deletion packages/evmos.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name = "evmos";
version = "v9.1.0";
src = evmos-src;
vendorSha256 = "sha256-AjWuufyAz5KTBwKiWvhPeqGm4fn3MUqg39xb4pJ0hTM=";
vendorHash = "sha256-AjWuufyAz5KTBwKiWvhPeqGm4fn3MUqg39xb4pJ0hTM=";
tags = ["netgo"];
engine = "tendermint/tendermint";
}
24 changes: 12 additions & 12 deletions packages/gaia.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ with inputs;
{
gaia-main = {
name = "gaia";
vendorSha256 = "sha256-V0DMuwKeCYpVlzF9g3cQD6YViJZQZeoszxbUqrUyQn4=";
vendorHash = "sha256-V0DMuwKeCYpVlzF9g3cQD6YViJZQZeoszxbUqrUyQn4=";
version = "v8.0.0";
src = gaia5-src;
engine = "tendermint/tendermint";
};

gaia5 = {
name = "gaia";
vendorSha256 = "sha256-V0DMuwKeCYpVlzF9g3cQD6YViJZQZeoszxbUqrUyQn4=";
vendorHash = "sha256-V0DMuwKeCYpVlzF9g3cQD6YViJZQZeoszxbUqrUyQn4=";
version = "v5.0.6";
src = gaia5-src;
tags = ["netgo"];
Expand All @@ -24,7 +24,7 @@ with inputs;

gaia6 = {
name = "gaia";
vendorSha256 = "sha256-KeF3gO5sUJEXWqb6EVYBYXpVBfhvyXZ4f03l63wYTjE=";
vendorHash = "sha256-KeF3gO5sUJEXWqb6EVYBYXpVBfhvyXZ4f03l63wYTjE=";
version = "v6.0.4";
src = gaia6-src;
tags = ["netgo"];
Expand All @@ -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"];
Expand All @@ -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"];
Expand All @@ -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"];
Expand All @@ -67,7 +67,7 @@ with inputs;

gaia9 = {
name = "gaia";
vendorSha256 = "sha256-W1pKtrWfXe0pdO7ntcjFbDa0LTpD91yI2mUMXBiDo1w=";
vendorHash = "sha256-W1pKtrWfXe0pdO7ntcjFbDa0LTpD91yI2mUMXBiDo1w=";
version = "v9.0.3";
src = gaia9-src;
tags = ["netgo"];
Expand All @@ -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"];
Expand All @@ -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"];
Expand All @@ -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"];
Expand All @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/gex.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ buildGoModule {
name = "gex";
doCheck = false;
src = gex-src;
vendorSha256 = "sha256-3vD0ge0zWSnGoeh5FAFEw60a7q5/YWgDsGjjgibBBNI=";
vendorHash = "sha256-3vD0ge0zWSnGoeh5FAFEw60a7q5/YWgDsGjjgibBBNI=";
}
4 changes: 2 additions & 2 deletions packages/gm.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Loading

0 comments on commit 3b46d70

Please sign in to comment.