From b40bfa4b8deb1d47e00184c9dee6ab86563e64e6 Mon Sep 17 00:00:00 2001 From: Soares Chen Date: Wed, 22 Dec 2021 11:34:47 +0100 Subject: [PATCH 1/3] Update gaia6 from v6.0.0-rc3 to v6.0.0 --- flake.lock | 19 +++++++++---------- flake.nix | 5 ++--- resources/gaia6/default.nix | 3 +-- resources/gaia6/last-synced.narHash | 2 +- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index ed576739..16d4e27b 100644 --- a/flake.lock +++ b/flake.lock @@ -99,16 +99,16 @@ "gaia6-src": { "flake": false, "locked": { - "lastModified": 1636639080, - "narHash": "sha256-VOS2hKK2K4Ys2WBWMlb22G1NAyqvr40i8yBUHQiejpw=", + "lastModified": 1637748909, + "narHash": "sha256-3MKw6jdb8bpUK9zW2BZKXpxfLlEY4sGtNRSgM1w/bIY=", "owner": "cosmos", "repo": "gaia", - "rev": "07f9892a925f451ae280d0c9d1a5401d8fc252a3", + "rev": "6ed5b7397a57c42112cf1b16f550bd0a6e263953", "type": "github" }, "original": { "owner": "cosmos", - "ref": "v6.0.0-rc3", + "ref": "v6.0.0", "repo": "gaia", "type": "github" } @@ -119,16 +119,15 @@ "utils": "utils" }, "locked": { - "lastModified": 1632617337, - "narHash": "sha256-8e7I7oUlK3doJTE839cL1rmONrultLCEWGh3vuNHRM0=", - "owner": "JonathanLorimer", + "lastModified": 1639197850, + "narHash": "sha256-Qknxy+YjVA39v/LwiUNsAcMAg9Df8aYAuqkH+EiAHRA=", + "owner": "tweag", "repo": "gomod2nix", - "rev": "c2e45e19dad38922e84da1abe03f72913fa3f0b5", + "rev": "596d01fd55ed8521853807df1f4e9d858cf75d7e", "type": "github" }, "original": { - "owner": "JonathanLorimer", - "ref": "allow-custom-vendors", + "owner": "tweag", "repo": "gomod2nix", "type": "github" } diff --git a/flake.nix b/flake.nix index 84f9c6e0..9ea41378 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ naersk.url = github:nmattia/naersk; # Go Inputs - gomod2nix.url = github:JonathanLorimer/gomod2nix/allow-custom-vendors; + gomod2nix.url = github:tweag/gomod2nix; # Freshautomations inputs stoml-src.url = github:freshautomations/stoml; @@ -32,7 +32,7 @@ # Chain Sources gaia6-src.flake = false; - gaia6-src.url = github:cosmos/gaia/v6.0.0-rc3; + gaia6-src.url = github:cosmos/gaia/v6.0.0; gaia5-src.flake = false; gaia5-src.url = github:cosmos/gaia/v5.0.6; @@ -116,4 +116,3 @@ }; }); } - diff --git a/resources/gaia6/default.nix b/resources/gaia6/default.nix index 45a1a1fb..d11b0c4c 100644 --- a/resources/gaia6/default.nix +++ b/resources/gaia6/default.nix @@ -1,7 +1,7 @@ { pkgs, gaia6-src, ledgerSupport ? false }: let pname = "gaia"; - version = "v6.0.0-rc3"; + version = "v6.0.0"; tendermint-version = (fromTOML (builtins.readFile ./go-modules.toml))."github.com/tendermint/tendermint".sumVersion; in pkgs.buildGoApplication { @@ -21,4 +21,3 @@ pkgs.buildGoApplication { -X github.com/tendermint/tendermint/version.TMCoreSemVer=${tendermint-version} ''; } - diff --git a/resources/gaia6/last-synced.narHash b/resources/gaia6/last-synced.narHash index ad65f740..b90acab3 100644 --- a/resources/gaia6/last-synced.narHash +++ b/resources/gaia6/last-synced.narHash @@ -1 +1 @@ -sha256-VOS2hKK2K4Ys2WBWMlb22G1NAyqvr40i8yBUHQiejpw= +sha256-3MKw6jdb8bpUK9zW2BZKXpxfLlEY4sGtNRSgM1w/bIY= From ad23836ff99a50f65b6cd376b1be64cec64d5d7b Mon Sep 17 00:00:00 2001 From: Jonathan Lorimer Date: Wed, 22 Dec 2021 10:58:34 -0500 Subject: [PATCH 2/3] revert gomod2nix to fork --- flake.lock | 11 ++++++----- flake.nix | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 16d4e27b..c6aaa751 100644 --- a/flake.lock +++ b/flake.lock @@ -119,15 +119,16 @@ "utils": "utils" }, "locked": { - "lastModified": 1639197850, - "narHash": "sha256-Qknxy+YjVA39v/LwiUNsAcMAg9Df8aYAuqkH+EiAHRA=", - "owner": "tweag", + "lastModified": 1632617337, + "narHash": "sha256-8e7I7oUlK3doJTE839cL1rmONrultLCEWGh3vuNHRM0=", + "owner": "JonathanLorimer", "repo": "gomod2nix", - "rev": "596d01fd55ed8521853807df1f4e9d858cf75d7e", + "rev": "c2e45e19dad38922e84da1abe03f72913fa3f0b5", "type": "github" }, "original": { - "owner": "tweag", + "owner": "JonathanLorimer", + "ref": "allow-custom-vendors", "repo": "gomod2nix", "type": "github" } diff --git a/flake.nix b/flake.nix index 9ea41378..d6b3863e 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ naersk.url = github:nmattia/naersk; # Go Inputs - gomod2nix.url = github:tweag/gomod2nix; + gomod2nix.url = github:JonathanLorimer/gomod2nix/allow-custom-vendors; # Freshautomations inputs stoml-src.url = github:freshautomations/stoml; From 8a08eac7f884652fbafa7045ad7c17a35cba0fed Mon Sep 17 00:00:00 2001 From: Jonathan Lorimer Date: Wed, 22 Dec 2021 12:18:39 -0500 Subject: [PATCH 3/3] update gomod2nix dep --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c6aaa751..d14d17e0 100644 --- a/flake.lock +++ b/flake.lock @@ -119,11 +119,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1632617337, - "narHash": "sha256-8e7I7oUlK3doJTE839cL1rmONrultLCEWGh3vuNHRM0=", + "lastModified": 1640193266, + "narHash": "sha256-J7RhQsfxiv6+W6xrRPagmFB4+Ywa7rY1wrr7e064ml0=", "owner": "JonathanLorimer", "repo": "gomod2nix", - "rev": "c2e45e19dad38922e84da1abe03f72913fa3f0b5", + "rev": "a318f455732365c586cdabb80daf9e25e054e507", "type": "github" }, "original": {