Skip to content

Commit 09d9ae9

Browse files
author
yihuang
authored
Problem: nixpkgs not up to date (#1129)
* Problem: nixpkgs not up to date Solution: - update nixpkgs to 24.11, it'll update default rust to 1.82 * fix warning * fix grpc
1 parent 690a878 commit 09d9ae9

File tree

7 files changed

+17
-35
lines changed

7 files changed

+17
-35
lines changed

flake.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
inputs = {
3-
nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
3+
nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
44
flake-utils.url = "github:numtide/flake-utils";
55
nix-bundle-exe = {
66
url = "github:3noch/nix-bundle-exe";
@@ -95,7 +95,7 @@
9595
// (
9696
with final;
9797
let
98-
matrix = lib.cartesianProductOfSets {
98+
matrix = lib.cartesianProduct {
9999
network = [
100100
"mainnet"
101101
"testnet"

integration_tests/shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pkgs.mkShell {
1010

1111
# lint tools
1212
test-env
13-
nixfmt
13+
nixfmt-rfc-style
1414
lint-ci
1515

1616
# tools

nix/build_overlay.nix

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,5 @@
11
# some basic overlays necessary for the build
2-
final: super:
3-
let
4-
replaceLast =
5-
newVal: l:
6-
let
7-
len = builtins.length l;
8-
in
9-
if len == 0 then [ ] else final.lib.lists.take (len - 1) l ++ [ newVal ];
10-
in
11-
{
12-
go_1_23 = super.go_1_23.overrideAttrs (old: rec {
13-
version = "1.23.4";
14-
src = final.fetchurl {
15-
url = "https://go.dev/dl/go${version}.src.tar.gz";
16-
hash = "sha256-rTRaxCHpCBQpOpaZzKGd1SOCUcP2h5gLvK4oSVsmNTE=";
17-
};
18-
# https://github.com/NixOS/nixpkgs/pull/372367
19-
patches = replaceLast ./go_no_vendor_checks-1.23.patch old.patches;
20-
});
2+
final: super: {
213
rocksdb = final.callPackage ./rocksdb.nix { };
224
golangci-lint = final.callPackage ./golangci-lint.nix { };
235
}

nix/solomachine.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec {
1515
owner = "crypto-com";
1616
repo = pname;
1717
rev = "v${version}";
18-
sha256 = "sha256-9eUyljX0Sh/jbM7uiNo78vUevnTBP/MxvpDiiJLZ8Hk=";
18+
hash = "sha256-9eUyljX0Sh/jbM7uiNo78vUevnTBP/MxvpDiiJLZ8Hk=";
1919
};
2020

21-
cargoSha256 = "sha256-cuDc8h0Hb6fiizvhMKe3v2nPXkaIXx+1mgCH68KsB4g=";
21+
cargoHash = "sha256-cuDc8h0Hb6fiizvhMKe3v2nPXkaIXx+1mgCH68KsB4g=";
2222
cargoBuildFlags = "-p solo-machine -p mnemonic-signer";
2323
nativeBuildInputs = [
2424
protobuf

nix/sources.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@
4848
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
4949
},
5050
"nixpkgs": {
51-
"branch": "release-24.05",
51+
"branch": "release-24.11",
5252
"description": "Nix Packages collection",
5353
"homepage": "",
5454
"owner": "NixOS",
5555
"repo": "nixpkgs",
56-
"rev": "0da3c44a9460a26d2025ec3ed2ec60a895eb1114",
57-
"sha256": "1n435wya14pbl04g6n4zrqaslpik4xq0fv1i2g2mz8sq3dqg7dk0",
56+
"rev": "3362e63a72db60d2f89903d502fc19d5a3f0c87c",
57+
"sha256": "1m2nra3b72shagaby3qb34ayvcgc7pibmjhvrx0cdjlr04rpmyz5",
5858
"type": "tarball",
59-
"url": "https://github.com/NixOS/nixpkgs/archive/0da3c44a9460a26d2025ec3ed2ec60a895eb1114.tar.gz",
59+
"url": "https://github.com/NixOS/nixpkgs/archive/3362e63a72db60d2f89903d502fc19d5a3f0c87c.tar.gz",
6060
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
6161
},
6262
"poetry2nix": {

pystarport/new-convert.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ OUTPUT=./proto_python
33

44
mkdir $OUTPUT
55

6-
git clone --branch v0.34.22 https://github.com/tendermint/tendermint.git
6+
git clone --branch v0.34.x https://github.com/cometbft/cometbft.git
77

88
buf generate ../third_party/cosmos-sdk/proto
9-
buf generate ./tendermint/proto
9+
buf generate ./cometbft/proto
1010
buf generate buf.build/cosmos/cosmos-proto
1111
buf generate buf.build/cosmos/gogo-proto
1212
buf generate buf.build/googleapis/googleapis
1313

14-
rm -rf ./tendermint
14+
rm -rf ./cometbft

0 commit comments

Comments
 (0)