From 7a71789499c8dbbc26e3e7a54ebe11811c111717 Mon Sep 17 00:00:00 2001
From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com>
Date: Tue, 24 Jan 2023 14:22:12 +0100
Subject: [PATCH] nix upgrade to 0.26.1

---
 Cargo.lock              | 38 ++++++++++++++++++++++++++++++--------
 Cargo.toml              |  2 +-
 node/metrics/Cargo.toml |  1 -
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8686b226943e..f16d92060177 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1322,7 +1322,7 @@ dependencies = [
  "cfg-if",
  "crossbeam-utils",
  "lazy_static",
- "memoffset",
+ "memoffset 0.6.4",
  "scopeguard",
 ]
 
@@ -3705,9 +3705,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.126"
+version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 
 [[package]]
 name = "libgit2-sys"
@@ -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/Cargo.toml b/Cargo.toml
index 35333e78ec80..c49db3d3a804 100644
--- a/Cargo.toml
+++ b/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/node/metrics/Cargo.toml b/node/metrics/Cargo.toml
index 815df94a8488..d2ea19c99490 100644
--- a/node/metrics/Cargo.toml
+++ b/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"