Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Problem: go 1.20.3 not used #946

Merged
merged 2 commits into from
Apr 27, 2023
Merged

Problem: go 1.20.3 not used #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6150ae7
Problem: go 1.20.3 not used
yihuang Apr 27, 2023
3f28db9
Update CHANGELOG.md
yihuang Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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*

Expand Down
8 changes: 4 additions & 4 deletions flake.lock
View file
Open in desktop

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

9 changes: 8 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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 {
Expand Down
7 changes: 7 additions & 0 deletions nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ''
Expand Down
8 changes: 4 additions & 4 deletions nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}