From 0b2f6226bfc14c42401e4cc9c7c5aaa10d68026f Mon Sep 17 00:00:00 2001 From: huangyi Date: Fri, 16 Feb 2024 22:24:09 +0800 Subject: [PATCH] use nixpkgs 23.05 --- default.nix | 2 +- flake.nix | 2 +- go.mod | 2 +- integration_tests/poetry.lock | 12 +++++------- nix/default.nix | 1 - nix/hermes.nix | 6 +++--- nix/sources.json | 16 ++++++++-------- nix/testenv.nix | 4 ++-- 8 files changed, 21 insertions(+), 24 deletions(-) diff --git a/default.nix b/default.nix index 055782984..72d04fcbb 100644 --- a/default.nix +++ b/default.nix @@ -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; diff --git a/flake.nix b/flake.nix index c2caf0a8f..e54461e2e 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; diff --git a/go.mod b/go.mod index 542a7fd62..d38f5ff43 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/integration_tests/poetry.lock b/integration_tests/poetry.lock index c0306a46c..6d3cebd6c 100644 --- a/integration_tests/poetry.lock +++ b/integration_tests/poetry.lock @@ -516,19 +516,17 @@ files = [ [[package]] name = "isort" -version = "5.8.0" +version = "5.13.2" description = "A Python utility / library to sort Python imports." optional = false -python-versions = ">=3.6,<4.0" +python-versions = ">=3.8.0" files = [ - {file = "isort-5.8.0-py3-none-any.whl", hash = "sha256:2bb1680aad211e3c9944dbce1d4ba09a989f04e238296c87fe2139faa26d655d"}, - {file = "isort-5.8.0.tar.gz", hash = "sha256:0a943902919f65c5684ac4e0154b1ad4fac6dcaa5d9f3426b732f1c8b5419be6"}, + {file = "isort-5.13.2-py3-none-any.whl", hash = "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6"}, + {file = "isort-5.13.2.tar.gz", hash = "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109"}, ] [package.extras] -colors = ["colorama (>=0.4.3,<0.5.0)"] -pipfile-deprecated-finder = ["pipreqs", "requirementslib"] -requirements-deprecated-finder = ["pip-api", "pipreqs"] +colors = ["colorama (>=0.4.6)"] [[package]] name = "jsonmerge" diff --git a/nix/default.nix b/nix/default.nix index a8529f8ed..7d34836fe 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -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: { diff --git a/nix/hermes.nix b/nix/hermes.nix index 7ce1bc900..a71979361 100644 --- a/nix/hermes.nix +++ b/nix/hermes.nix @@ -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 diff --git a/nix/sources.json b/nix/sources.json index 3464eb3e4..099fcd051 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -24,27 +24,27 @@ "url_template": "https://github.com///archive/.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///archive/.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///archive/.tar.gz" }, "poetry2nix": { diff --git a/nix/testenv.nix b/nix/testenv.nix index b76aef6b8..c1532fbdc 100644 --- a/nix/testenv.nix +++ b/nix/testenv.nix @@ -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: