From 8102eebe9bd8d0f9aa26576d995658934d3deeb0 Mon Sep 17 00:00:00 2001
From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com>
Date: Wed, 25 Jan 2023 06:58:33 +0100
Subject: [PATCH] nix upgrade to 0.26.1 (#6622)
---
polkadot/Cargo.lock | 34 ++++++++++++++++++++++++++------
polkadot/Cargo.toml | 2 +-
polkadot/node/metrics/Cargo.toml | 1 -
3 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index cad29e3b3f9..f999b9c61e6 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1322,7 +1322,7 @@ dependencies = [
"cfg-if",
"crossbeam-utils",
"lazy_static",
- "memoffset",
+ "memoffset 0.6.4",
"scopeguard",
]
@@ -4421,6 +4421,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"
@@ -4783,7 +4792,7 @@ dependencies = [
"cc",
"cfg-if",
"libc",
- "memoffset",
+ "memoffset 0.6.4",
]
[[package]]
@@ -4795,7 +4804,21 @@ dependencies = [
"bitflags",
"cfg-if",
"libc",
- "memoffset",
+ "memoffset 0.6.4",
+]
+
+[[package]]
+name = "nix"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+ "memoffset 0.7.1",
+ "pin-utils",
+ "static_assertions",
]
[[package]]
@@ -6345,7 +6368,7 @@ version = "0.9.37"
dependencies = [
"assert_cmd",
"color-eyre",
- "nix 0.24.1",
+ "nix 0.26.2",
"polkadot-cli",
"polkadot-core-primitives",
"substrate-rpc-client",
@@ -7038,7 +7061,6 @@ dependencies = [
"futures-timer",
"hyper",
"log",
- "nix 0.24.1",
"parity-scale-codec",
"polkadot-primitives",
"polkadot-test-service",
@@ -12880,7 +12902,7 @@ dependencies = [
"log",
"mach",
"memfd",
- "memoffset",
+ "memoffset 0.6.4",
"paste",
"rand 0.8.5",
"rustix",
diff --git a/polkadot/Cargo.toml b/polkadot/Cargo.toml
index 35333e78ec8..c49db3d3a80 100644
--- a/polkadot/Cargo.toml
+++ b/polkadot/Cargo.toml
@@ -25,7 +25,7 @@ tikv-jemallocator = "0.5.0"
[dev-dependencies]
assert_cmd = "2.0.4"
-nix = "0.24.1"
+nix = { version = "0.26.1", features = ["signal"] }
tempfile = "3.2.0"
tokio = "1.24.1"
substrate-rpc-client = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/polkadot/node/metrics/Cargo.toml b/polkadot/node/metrics/Cargo.toml
index 815df94a848..d2ea19c9949 100644
--- a/polkadot/node/metrics/Cargo.toml
+++ b/polkadot/node/metrics/Cargo.toml
@@ -25,7 +25,6 @@ log = "0.4.17"
[dev-dependencies]
assert_cmd = "2.0.4"
-nix = "0.24.1"
tempfile = "3.2.0"
hyper = { version = "0.14.20", default-features = false, features = ["http1", "tcp"] }
tokio = "1.24.1"
--
GitLab