From f3bb96644deacb4fec7c4c3380ff582703824cfe Mon Sep 17 00:00:00 2001 From: mmsqe Date: Tue, 31 Dec 2024 17:50:43 +0800 Subject: [PATCH 1/2] Problem: latest sdk requires a minimum version of go 1.23.3 --- flake.lock | 24 ++++++++++++------------ go.mod | 2 +- nix/default.nix | 4 ++-- nix/sources.json | 16 ++++++++-------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 4acaa41ddf..e3ab64d42d 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1725226629, - "narHash": "sha256-0l5gtNAf3408INFPbvbMvHghd44LgKhMuqUcY6vH5N8=", + "lastModified": 1733764984, + "narHash": "sha256-4pHRrZ6bvk4+2XrM4MNaqkcoO+DecjZtFoJcJm9Fab0=", "owner": "obreitwi", "repo": "gomod2nix", - "rev": "983228366edc1bed1be6e6f7a45e285b4707b9ba", + "rev": "9048c4bd5c1c1a48f55760d920617cc3ce6c685b", "type": "github" }, "original": { @@ -65,11 +65,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730272153, - "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", + "lastModified": 1735617354, + "narHash": "sha256-5zJyv66q68QZJZsXtmjDBazGnF0id593VSy+8eSckoo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", + "rev": "69b9a8c860bdbb977adfa9c5e817ccb717884182", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1730284601, - "narHash": "sha256-eHYcKVLIRRv3J1vjmxurS6HVdGphB53qxUeAkylYrZY=", + "lastModified": 1735164664, + "narHash": "sha256-DaWy+vo3c4TQ93tfLjUgcpPaSoDw4qV4t76Y3Mhu84I=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "43a898b4d76f7f3f70df77a2cc2d40096bc9d75e", + "rev": "1fb01e90771f762655be7e0e805516cd7fa4d58e", "type": "github" }, "original": { diff --git a/go.mod b/go.mod index 2ebed1fa16..85f54bb948 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/evmos/ethermint -go 1.23.1 +go 1.23.3 require ( cosmossdk.io/api v0.7.6 diff --git a/nix/default.nix b/nix/default.nix index ddee5400b1..52ee3c4684 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -8,7 +8,7 @@ import sources.nixpkgs { go-ethereum = pkgs.callPackage ./go-ethereum.nix { inherit (pkgs.darwin) libobjc; inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; - buildGoModule = pkgs.buildGo121Module; + buildGoModule = pkgs.buildGo122Module; }; }) # update to a version that supports eip-1559 (import "${sources.poetry2nix}/overlay.nix") @@ -24,7 +24,7 @@ import sources.nixpkgs { }) (_: pkgs: { test-env = pkgs.callPackage ./testenv.nix { }; }) (_: pkgs: { - cosmovisor = pkgs.buildGo121Module rec { + cosmovisor = pkgs.buildGo122Module rec { name = "cosmovisor"; src = sources.cosmos-sdk + "/cosmovisor"; subPackages = [ "./cmd/cosmovisor" ]; diff --git a/nix/sources.json b/nix/sources.json index 28ac2a7c7d..8c7a833181 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -36,27 +36,27 @@ "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "release-24.05", + "branch": "release-25.05", "description": "Nix Packages collection", "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "911e6111c71bc861769597f66aadcdc080c2db1e", - "sha256": "09zdp4av5kycq6pvi9ixd0vpx5wx3m5cw0gak87svgkzw9r85152", + "rev": "c46290747b2aaf090f48a478270feb858837bf11", + "sha256": "0b96wqvk3hs98dhfrmdhqmx9ibac4kjpanpd1pig19jaglanqnxr", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/911e6111c71bc861769597f66aadcdc080c2db1e.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/c46290747b2aaf090f48a478270feb858837bf11.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "poetry2nix": { "branch": "master", "description": "Convert poetry projects to nix automagically [maintainer=@adisbladis] ", "homepage": "", - "owner": "nix-community", + "owner": "mmsqe", "repo": "poetry2nix", - "rev": "4eb2ac54029af42a001c9901194e9ce19cbd8a40", - "sha256": "16fi71fpywiqsya1z99kkb14dansyrmkkrb2clzs3b5qqx673wf4", + "rev": "7b3eed7d8355fb0404da03964cb6c680912a9e4f", + "sha256": "03c0r1riw8zmc7m485vdsn91r8bgvhh41l7ci72zgpwlpk7dq546", "type": "tarball", - "url": "https://github.com/nix-community/poetry2nix/archive/4eb2ac54029af42a001c9901194e9ce19cbd8a40.tar.gz", + "url": "https://github.com/mmsqe/poetry2nix/archive/7b3eed7d8355fb0404da03964cb6c680912a9e4f.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "flake-compat": { From f82be8029204acfcdaaa1e0370ba7b378fb26f50 Mon Sep 17 00:00:00 2001 From: HuangYi Date: Thu, 2 Jan 2025 15:31:08 +0800 Subject: [PATCH 2/2] align flake lock --- flake.lock | 4 ++-- flake.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e3ab64d42d..33e5b48efe 100644 --- a/flake.lock +++ b/flake.lock @@ -69,12 +69,12 @@ "narHash": "sha256-5zJyv66q68QZJZsXtmjDBazGnF0id593VSy+8eSckoo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "69b9a8c860bdbb977adfa9c5e817ccb717884182", + "rev": "c46290747b2aaf090f48a478270feb858837bf11", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "release-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 34082f2d8e..ab6922dbb0 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/release-25.05"; flake-utils.url = "github:numtide/flake-utils"; gomod2nix = { url = "github:obreitwi/gomod2nix/fix/go_mod_vendor";