From 3c776ae2d385393916ea3985bc9602e8c2f50df3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 14:34:55 +0000
Subject: [PATCH 1/4] Bump nix from 0.30.1 to 0.31.1

Bumps [nix](https://github.com/nix-rust/nix) from 0.30.1 to 0.31.1.
- [Changelog](https://github.com/nix-rust/nix/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nix-rust/nix/compare/v0.30.1...v0.31.1)

---
updated-dependencies:
- dependency-name: nix
  dependency-version: 0.31.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock | 18 +++++++++++++++---
 Cargo.toml |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 727c6f64941..5c3ead7369c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1999,6 +1999,18 @@ name = "nix"
 version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
+dependencies = [
+ "bitflags 2.10.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "nix"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225e7cfe711e0ba79a68baeddb2982723e4235247aefce1482f2f16c27865b66"
 dependencies = [
  "bitflags 2.10.0",
  "cfg-if",
@@ -3050,7 +3062,7 @@ dependencies = [
  "malachite-base",
  "malachite-bigint",
  "malachite-q",
- "nix 0.30.1",
+ "nix 0.31.1",
  "num-complex",
  "num-traits",
  "once_cell",
@@ -3215,7 +3227,7 @@ dependencies = [
  "memchr",
  "memmap2",
  "mt19937",
- "nix 0.30.1",
+ "nix 0.31.1",
  "num-complex",
  "num-integer",
  "num-traits",
@@ -3307,7 +3319,7 @@ dependencies = [
  "log",
  "malachite-bigint",
  "memchr",
- "nix 0.30.1",
+ "nix 0.31.1",
  "num-complex",
  "num-integer",
  "num-traits",
diff --git a/Cargo.toml b/Cargo.toml
index b4a4800248a..e4a8c13b866 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -172,7 +172,7 @@ junction = "1.4.1"
 libc = "0.2.180"
 libffi = "5"
 log = "0.4.29"
-nix = { version = "0.30", features = ["fs", "user", "process", "term", "time", "signal", "ioctl", "socket", "sched", "zerocopy", "dir", "hostname", "net", "poll"] }
+nix = { version = "0.31", features = ["fs", "user", "process", "term", "time", "signal", "ioctl", "socket", "sched", "zerocopy", "dir", "hostname", "net", "poll"] }
 malachite-bigint = "0.9"
 malachite-q = "0.9"
 malachite-base = "0.9"

From d681e1373a51eb59e3a1a34494c983a11be004c7 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 26 Jan 2026 17:43:49 +0000
Subject: [PATCH 2/4] Initial plan


From a141d73ceb949bb00c95dfa802a1de8b4b32e29a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 26 Jan 2026 17:55:26 +0000
Subject: [PATCH 3/4] Update rustyline to use nix 0.31.1

Co-authored-by: youknowone <69878+youknowone@users.noreply.github.com>
---
 Cargo.lock | 41 ++++++++---------------------------------
 Cargo.toml |  2 +-
 2 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5c3ead7369c..55fdde76ebc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1109,9 +1109,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
 
 [[package]]
 name = "endian-type"
-version = "0.1.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+checksum = "869b0adbda23651a9c5c0c3d270aac9fcb52e8622a8f2b17e57802d7791962f2"
 
 [[package]]
 name = "env_filter"
@@ -1182,17 +1182,6 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
-[[package]]
-name = "fd-lock"
-version = "4.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78"
-dependencies = [
- "cfg-if",
- "rustix",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "find-msvc-tools"
 version = "0.1.6"
@@ -1994,18 +1983,6 @@ dependencies = [
  "memoffset",
 ]
 
-[[package]]
-name = "nix"
-version = "0.30.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
-dependencies = [
- "bitflags 2.10.0",
- "cfg-if",
- "cfg_aliases",
- "libc",
-]
-
 [[package]]
 name = "nix"
 version = "0.31.1"
@@ -2621,9 +2598,9 @@ dependencies = [
 
 [[package]]
 name = "radix_trie"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+checksum = "3b4431027dcd37fc2a73ef740b5f233aa805897935b8bce0195e41bbf9a3289a"
 dependencies = [
  "endian-type",
  "nibble_vec",
@@ -3400,24 +3377,22 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "rustyline"
-version = "17.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e902948a25149d50edc1a8e0141aad50f54e22ba83ff988cf8f7c9ef07f50564"
+version = "17.0.1"
+source = "git+https://github.com/kkawakam/rustyline?rev=7bbd27991a641586a7c8599437ca207b33bcc823#7bbd27991a641586a7c8599437ca207b33bcc823"
 dependencies = [
  "bitflags 2.10.0",
  "cfg-if",
  "clipboard-win",
- "fd-lock",
  "home",
  "libc",
  "log",
  "memchr",
- "nix 0.30.1",
+ "nix 0.31.1",
  "radix_trie",
  "unicode-segmentation",
  "unicode-width",
  "utf8parse",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index e4a8c13b866..d7a8564ac62 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -192,7 +192,7 @@ radium = "1.1.1"
 rand = "0.9"
 rand_core = { version = "0.9", features = ["os_rng"] }
 rustix = { version = "1.1", features = ["event"] }
-rustyline = "17.0.1"
+rustyline = { git = "https://github.com/kkawakam/rustyline", rev = "7bbd27991a641586a7c8599437ca207b33bcc823" }
 serde = { package = "serde_core", version = "1.0.225", default-features = false, features = ["alloc"] }
 schannel = "0.1.28"
 scoped-tls = "1"

From ac6bdb305bb745fda898f3201b298e40fba84e0e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 26 Jan 2026 18:03:11 +0000
Subject: [PATCH 4/4] Add documentation for temporary rustyline git dependency

Co-authored-by: youknowone <69878+youknowone@users.noreply.github.com>
---
 Cargo.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index d7a8564ac62..48e205a2189 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -192,6 +192,8 @@ radium = "1.1.1"
 rand = "0.9"
 rand_core = { version = "0.9", features = ["os_rng"] }
 rustix = { version = "1.1", features = ["event"] }
+# TODO: Replace with published version once rustyline releases with nix 0.31.1 support
+# Temporary git dependency to resolve nix version conflict (rustyline v17.0.2 uses nix 0.30.1)
 rustyline = { git = "https://github.com/kkawakam/rustyline", rev = "7bbd27991a641586a7c8599437ca207b33bcc823" }
 serde = { package = "serde_core", version = "1.0.225", default-features = false, features = ["alloc"] }
 schannel = "0.1.28"