Skip to content

Commit

Permalink
use nixpkgs 23.05
Browse files Browse the repository at this point in the history
  • Loading branch information
yihuang committed Feb 16, 2024
1 parent fc632b0 commit 0b2f622
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 24 deletions.
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ in
buildGoApplication rec {
pname = "chain-maind";
version = "4.2.8";
go = buildPackages.go_1_21;
go = buildPackages.go_1_20;
src = lib.cleanSourceWith {
name = "src";
src = lib.sourceByRegex ./. src_regexes;
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
flake-utils.url = "github:numtide/flake-utils";
nix-bundle-exe = {
url = "github:3noch/nix-bundle-exe";
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/crypto-org-chain/chain-main/v4

go 1.21
go 1.20

require (
cosmossdk.io/errors v1.0.0-beta.7
Expand Down
12 changes: 5 additions & 7 deletions integration_tests/poetry.lock

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

1 change: 0 additions & 1 deletion nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import sources.nixpkgs {
};
hermes = pkgs.callPackage ./hermes.nix { src = sources.ibc-rs; };
})
(import "${sources.poetry2nix}/overlay.nix")
(import "${sources.gomod2nix}/overlay.nix")
(import ./build_overlay.nix)
(pkgs: prev: {
Expand Down
6 changes: 3 additions & 3 deletions nix/hermes.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
, lib
, stdenv
, darwin
, rustPlatform
, rustPackages_1_70
, symlinkJoin
, openssl
}:
rustPlatform.buildRustPackage rec {
rustPackages_1_70.rustPlatform.buildRustPackage rec {
name = "hermes";
inherit src;
cargoSha256 = "sha256-Pkdc1XrhMFjuUcMsMfvltOynCIJtfeWmwEBTPz8Exok=";
cargoSha256 = "sha256-jqmIBmvY3PXpLFfv6XrnXJ0RmR6amFFMNfgK8qDFHb8=";
cargoBuildFlags = "-p ibc-relayer-cli";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
Expand Down
16 changes: 8 additions & 8 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"ibc-rs": {
"branch": "v1.4.0",
"branch": "v1.6.0",
"description": "IBC modules and relayer - Formal specifications and Rust implementation",
"homepage": "",
"owner": "informalsystems",
"repo": "ibc-rs",
"rev": "daad02843a091bbdb3dd608e5f4ce790895c8845",
"sha256": "1n90sl5mcw4q6xri9k6rlhavxl43nxaza4ma9qwbhz2sh63sbh1l",
"rev": "1c1cf02988db67507de7d484e1a7f317fe494d6c",
"sha256": "08a92qw7mbag51lphxj3515i17qwsqhlam2q0g6fhldhfisa7bya",
"type": "tarball",
"url": "https://github.com/informalsystems/ibc-rs/archive/daad02843a091bbdb3dd608e5f4ce790895c8845.tar.gz",
"url": "https://github.com/informalsystems/ibc-rs/archive/1c1cf02988db67507de7d484e1a7f317fe494d6c.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
"branch": "release-23.11",
"branch": "release-23.05",
"description": "Nix Packages collection",
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0ed7136921ea094c771db674c9d2566b14852a01",
"sha256": "0bhi67drgldn1hj464k9l749dyncgpq9j5a997rwsf0wksxh5a9b",
"rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
"sha256": "0xhqjli4m9wkzv7xhs6fr1iajdjbv7xnj0bwvwldq9s6arlwkhj3",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/0ed7136921ea094c771db674c9d2566b14852a01.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/9a333eaa80901efe01df07eade2c16d183761fa3.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"poetry2nix": {
Expand Down
4 changes: 2 additions & 2 deletions nix/testenv.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ poetry2nix, python39, lib }:
{ poetry2nix, python310, lib }:
poetry2nix.mkPoetryEnv {
python = python39;
python = python310;
projectDir = ../integration_tests;
overrides = poetry2nix.overrides.withDefaults (lib.composeManyExtensions [
(self: super:
Expand Down

0 comments on commit 0b2f622

Please sign in to comment.