From 76300ee278b7d111aa47ad7495ecf1223c1da0ca Mon Sep 17 00:00:00 2001 From: mmsqe Date: Tue, 14 Jan 2025 16:39:36 +0800 Subject: [PATCH 1/4] Problem: go version is outdated --- flake.lock | 67 +++++++++++++++++++++++++++++++----------------- flake.nix | 2 +- nix/default.nix | 4 +-- nix/sources.json | 14 +++++----- 4 files changed, 53 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index ccfffcac2e..2e55001411 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -25,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": { @@ -42,11 +45,11 @@ "nix-bundle-exe": { "flake": false, "locked": { - "lastModified": 1660176694, - "narHash": "sha256-cJGZ/3CjVkoyk1W9mFVs6P/5LbJ8C+42chGYiB/wB/A=", + "lastModified": 1727401894, + "narHash": "sha256-NKdglYdwN4M7/UOZ8Ml3fuJT1MYXAb6aU4ccU920BjM=", "owner": "3noch", "repo": "nix-bundle-exe", - "rev": "91416cec283a33ae3448aacdc5cabdece9c08793", + "rev": "7f61fe91a73119e1e39d821f0d215d6186d01363", "type": "github" }, "original": { @@ -63,11 +66,11 @@ ] }, "locked": { - "lastModified": 1703863825, - "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", "type": "github" }, "original": { @@ -78,11 +81,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729805696, - "narHash": "sha256-FArm/EIAbykrhtWxWKT1QXIg+dD44joehXZWdY12WKc=", + "lastModified": 1735651292, + "narHash": "sha256-YLbzcBtYo1/FEzFsB3AnM16qFc6fWPMIoOuSoDwvg9g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50286248f2d7283682bdd47ba14af33a9233b88b", + "rev": "0da3c44a9460a26d2025ec3ed2ec60a895eb1114", "type": "github" }, "original": { @@ -101,15 +104,15 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems", + "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718745582, - "narHash": "sha256-TFlVP4YXg6n+MbP/Iv/RIwqvRKuV9KA1JAPihoFmPfo=", + "lastModified": 1736774291, + "narHash": "sha256-1rEUm7R93L8rltgyBzon2/lzIN2udC/Kd8nyvuDN6ps=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "48e7ed4ef7832efa5a5558e573986c4128fc478f", + "rev": "499221030113adc5dea05886a1d7aa1cc3a315d1", "type": "github" }, "original": { @@ -137,8 +140,24 @@ "type": "github" }, "original": { - "id": "systems", - "type": "indirect" + "owner": "nix-systems", + "repo": "default", + "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" } }, "treefmt-nix": { @@ -149,11 +168,11 @@ ] }, "locked": { - "lastModified": 1718522839, - "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", + "lastModified": 1730120726, + "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", + "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c58d275d91..1851d5dfa9 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/release-25.05"; flake-utils.url = "github:numtide/flake-utils"; nix-bundle-exe = { url = "github:3noch/nix-bundle-exe"; diff --git a/nix/default.nix b/nix/default.nix index 79ce5b8c8a..b6b375dcb6 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -15,7 +15,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; }; flake-compat = import sources.flake-compat; chain-maind = pkgs.callPackage sources.chain-main { rocksdb = null; }; @@ -65,7 +65,7 @@ import sources.nixpkgs { (_: pkgs: { test-env = pkgs.callPackage ./testenv.nix { }; }) (_: pkgs: { cosmovisor = pkgs.callPackage ./cosmovisor.nix { }; }) (_: pkgs: { - rly = pkgs.buildGo121Module rec { + rly = pkgs.buildGo122Module rec { name = "rly"; src = sources.relayer; subPackages = [ "." ]; diff --git a/nix/sources.json b/nix/sources.json index 7617df1df4..18fa188882 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -97,15 +97,15 @@ "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": "50286248f2d7283682bdd47ba14af33a9233b88b", - "sha256": "19sqfs6pamknhlg3mqpqs3wj0wj1ynj5icfmhqmjjvq08byfc2hl", + "rev": "c46290747b2aaf090f48a478270feb858837bf11", + "sha256": "0b96wqvk3hs98dhfrmdhqmx9ibac4kjpanpd1pig19jaglanqnxr", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/50286248f2d7283682bdd47ba14af33a9233b88b.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/c46290747b2aaf090f48a478270feb858837bf11.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "poetry2nix": { @@ -114,10 +114,10 @@ "homepage": "", "owner": "nix-community", "repo": "poetry2nix", - "rev": "4eb2ac54029af42a001c9901194e9ce19cbd8a40", - "sha256": "16fi71fpywiqsya1z99kkb14dansyrmkkrb2clzs3b5qqx673wf4", + "rev": "29b2641c1c6e67d836f9a9fda8a6de85be9644ac", + "sha256": "164qi61dxw3y345bkdpiwxrk7cql7pf6kay2xi9y751ypssrji4m", "type": "tarball", - "url": "https://github.com/nix-community/poetry2nix/archive/4eb2ac54029af42a001c9901194e9ce19cbd8a40.tar.gz", + "url": "https://github.com/nix-community/poetry2nix/archive/29b2641c1c6e67d836f9a9fda8a6de85be9644ac.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "relayer": { From 04dd297bcce4949d93ec130be66a8752602bc874 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Tue, 14 Jan 2025 17:07:34 +0800 Subject: [PATCH 2/4] bump nix channel --- .github/workflows/build.yml | 8 ++++---- .github/workflows/lint.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- .github/workflows/test.yml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 747ab60a00..e3286db265 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v23 with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: nixpkgs=channel:nixos-24.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - id: changed-files @@ -55,7 +55,7 @@ jobs: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v23 with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: nixpkgs=channel:nixos-24.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - id: changed-files @@ -105,7 +105,7 @@ jobs: go.sum - uses: cachix/install-nix-action@v23 with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: nixpkgs=channel:nixos-24.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} if: steps.changed-files.outputs.any_changed == 'true' @@ -139,7 +139,7 @@ jobs: contracts - uses: cachix/install-nix-action@v23 with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: nixpkgs=channel:nixos-24.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} if: steps.changed-files.outputs.any_changed == 'true' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5549333dd2..52a5d14736 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v23 with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: nixpkgs=channel:nixos-24.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - id: changed-files @@ -72,7 +72,7 @@ jobs: **/*.py - uses: cachix/install-nix-action@v23 with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: nixpkgs=channel:nixos-24.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} if: steps.changed-files.outputs.any_changed == 'true' @@ -98,7 +98,7 @@ jobs: **/*.nix - uses: cachix/install-nix-action@v23 with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: nixpkgs=channel:nixos-24.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} if: steps.changed-files.outputs.any_changed == 'true' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 017b829b74..45e8dd5db8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v23 with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: nixpkgs=channel:nixos-24.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - uses: cachix/cachix-action@v12 @@ -57,7 +57,7 @@ jobs: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v23 with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: nixpkgs=channel:nixos-24.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - uses: apple-actions/import-codesign-certs@v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 34ab2aed83..5b3ec3e6e6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,7 +37,7 @@ jobs: **/*.md - uses: cachix/install-nix-action@v23 with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: nixpkgs=channel:nixos-24.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} if: steps.changed-files.outputs.only_changed == 'false' @@ -94,7 +94,7 @@ jobs: **/*.md - uses: cachix/install-nix-action@v23 with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: nixpkgs=channel:nixos-24.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} if: steps.changed-files.outputs.only_changed == 'false' @@ -118,7 +118,7 @@ jobs: fetch-depth: 0 - uses: cachix/install-nix-action@v23 with: - nix_path: nixpkgs=channel:nixos-22.11 + nix_path: nixpkgs=channel:nixos-24.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - uses: cachix/cachix-action@v12 From b32381e0b9f51cf5c3956c6252966b908ba54c72 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Tue, 14 Jan 2025 17:09:56 +0800 Subject: [PATCH 3/4] fix GOWORK --- nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/default.nix b/nix/default.nix index b6b375dcb6..75e9b10b62 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -71,7 +71,7 @@ import sources.nixpkgs { subPackages = [ "." ]; vendorHash = "sha256-dwKZZu9wKOo2u1/8AAWFx89iC9pWZbCxAERMMAOFsts="; doCheck = false; - GOWORK = "off"; + env.GOWORK = "off"; postInstall = '' mv $out/bin/relayer $out/bin/rly ''; From cbe40f2235f6ee7372ebcf2bc486bb3a0c3c44d8 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Tue, 14 Jan 2025 18:06:22 +0800 Subject: [PATCH 4/4] revert --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 1851d5dfa9..c58d275d91 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/release-24.05"; flake-utils.url = "github:numtide/flake-utils"; nix-bundle-exe = { url = "github:3noch/nix-bundle-exe";