From 6d0ecc1967dccfbfb192f9294c66c6fb97cdcefd Mon Sep 17 00:00:00 2001 From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com> Date: Thu, 26 Jan 2023 13:47:17 +0100 Subject: [PATCH] nix upgrade to 0.26.1 (#2135) --- cumulus/Cargo.lock | 25 +++++++++++++++++-------- cumulus/polkadot-parachain/Cargo.toml | 2 +- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock index 6c098013f0..b884b94339 100644 --- a/cumulus/Cargo.lock +++ b/cumulus/Cargo.lock @@ -1593,7 +1593,7 @@ dependencies = [ "cfg-if", "crossbeam-utils", "lazy_static", - "memoffset", + "memoffset 0.6.5", "scopeguard", ] @@ -5201,6 +5201,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "memory-db" version = "0.31.0" @@ -5538,21 +5547,21 @@ dependencies = [ "bitflags", "cfg-if", "libc", - "memoffset", + "memoffset 0.6.5", ] [[package]] name = "nix" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "autocfg", "bitflags", "cfg-if", "libc", - "memoffset", + "memoffset 0.7.1", "pin-utils", + "static_assertions", ] [[package]] @@ -8210,7 +8219,7 @@ dependencies = [ "hex-literal", "jsonrpsee", "log", - "nix 0.25.0", + "nix 0.26.2", "pallet-transaction-payment-rpc", "parachains-common", "parity-scale-codec", @@ -13764,7 +13773,7 @@ dependencies = [ "log", "mach", "memfd", - "memoffset", + "memoffset 0.6.5", "paste", "rand 0.8.5", "rustix 0.35.9", diff --git a/cumulus/polkadot-parachain/Cargo.toml b/cumulus/polkadot-parachain/Cargo.toml index 32f15ca161..58cdb24bc7 100644 --- a/cumulus/polkadot-parachain/Cargo.toml +++ b/cumulus/polkadot-parachain/Cargo.toml @@ -94,7 +94,7 @@ substrate-build-script-utils = { git = "https://github.com/paritytech/substrate" [dev-dependencies] assert_cmd = "2.0" -nix = "0.25" +nix = { version = "0.26.1", features = ["signal"] } tempfile = "3.3.0" tokio = { version = "1.24.2", features = ["macros", "time", "parking_lot"] } wait-timeout = "0.2"