Problem: go 1.20.3 not used (#946)

* Problem: go 1.20.3 not used Solution: - update nixpkgs to release-22.11 - manually update go src to 1.20.3 - prepare for v4.2.4 release * Update CHANGELOG.md Signed-off-by: yihuang <[email protected]> --------- Signed-off-by: yihuang <[email protected]>
crypto-org-chain · Apr 27, 2023 · 4a12c4b · 4a12c4b
1 parent 0b65621
commit 4a12c4b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,12 @@
 # Changelog
 
-## UNRELEASED
+*April 27, 2023*
+
+## v4.2.4
 
 - [#927](https://github.com/crypto-org-chain/chain-main/pull/927) Integrate versiondb.
 - [#942](https://github.com/crypto-org-chain/chain-main/pull/942) Update cosmos-sdk to `v0.46.12` to support `iavl-lazy-loading`.
+- [#946](https://github.com/crypto-org-chain/chain-main/pull/946) Update nixpkgs to release-22.11 and go version to 1.20.3.
 
 *February 20, 2023*
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/master";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
     flake-utils.url = "github:numtide/flake-utils";
     nix-bundle-exe = {
       url = "github:3noch/nix-bundle-exe";
@@ -72,6 +72,13 @@
         '';
         bundle-win-exe = drv: final.callPackage ./nix/bundle-win-exe.nix { cronosd = drv; };
         rocksdb = final.callPackage ./nix/rocksdb.nix { };
+        go_1_20 = prev.go_1_20.overrideAttrs (prev: rec {
+          version = "1.20.3";
+          src = final.fetchurl {
+            url = "https://go.dev/dl/go${version}.src.tar.gz";
+            hash = "sha256-5Ee0mM3lAhXE92GeUSSw/E4l+10W6kcnHEfyeOeqdjo=";
+          };
+        });
       } // (with final;
         let
           matrix = lib.cartesianProductOfSets {

diff --git a/nix/default.nix b/nix/default.nix
@@ -13,6 +13,13 @@ import sources.nixpkgs {
     })
     (import "${sources.gomod2nix}/overlay.nix")
     (pkgs: prev: {
+      go_1_20 = prev.go_1_20.overrideAttrs (prev: rec {
+        version = "1.20.3";
+        src = pkgs.fetchurl {
+          url = "https://go.dev/dl/go${version}.src.tar.gz";
+          hash = "sha256-5Ee0mM3lAhXE92GeUSSw/E4l+10W6kcnHEfyeOeqdjo=";
+        };
+      });
       go = pkgs.go_1_20;
       test-env = pkgs.callPackage ./testenv.nix { };
       lint-ci = pkgs.writeShellScriptBin "lint-ci" ''

diff --git a/nix/sources.json b/nix/sources.json
@@ -36,15 +36,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "master",
+        "branch": "release-22.11",
         "description": "Nix Packages collection",
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4f16b8f48ea836282c81c915d6a16b0663a89d2d",
-        "sha256": "0p8i2cghw2b9la45gw02c4kaa7zd0kx3fydd3lmjcl0znfxkdxhv",
+        "rev": "15b75800dce80225b44f067c9012b09de37dfad2",
+        "sha256": "0xmza136qf0hssh2a4dq62w7w1xs6rdfxs314pqxqjvvqibf1qb2",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/4f16b8f48ea836282c81c915d6a16b0663a89d2d.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/15b75800dce80225b44f067c9012b09de37dfad2.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }