From a4d7fd7506f6ba06258a91a5827197a736ef3a00 Mon Sep 17 00:00:00 2001
From: Leonard Steppy <leonard.steppy@outlook.de>
Date: Mon, 31 Aug 2026 15:40:44 +0200
Subject: [PATCH] Fix nix build by updating dependencies

---
 Cargo.toml             | 10 +++++-----
 flake.lock             | 14 +++++++-------
 flake.nix              |  2 +-
 src/environment.rs     | 11 +++++++----
 src/shell_interface.rs |  2 +-
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a9bc08b..f3fb68f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "multi-ssh"
 version = "0.2.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
-clap = { version = "4.5.23", features = ["derive"] }
-lazy-regex = "3.3.0"
-shell-words = "1.1.0"
-homedir = "0.3.4"
\ No newline at end of file
+clap = { version = "4.6.6", features = ["derive"] }
+lazy-regex = "3.6.1"
+shell-words = "1.1.1"
+homedir = "0.3.6"
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index fd92169..8655acd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1759580034,
-        "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=",
+        "lastModified": 1787962033,
+        "narHash": "sha256-u6z9VTZA4Kf3RkHQo9sQI7NI4Ei/uiU9vrMqOiwWP1Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318",
+        "rev": "c5c4a43b0e8056328ec4529f735cabdb8f1942bb",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -43,11 +43,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1759631821,
-        "narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=",
+        "lastModified": 1788165049,
+        "narHash": "sha256-en4IoUeCqvq9F66YhwOrUFw1nc70OBhrJwrzfalezvY=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe",
+        "rev": "d03cd474bd97389dcc2e8cd3b3bb6b8c6e346b1a",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 637c382..2d612de 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Flake of https://dev.stupstech.de/Mr_Steppy/multi-ssh";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
     rust-overlay.url = "github:oxalica/rust-overlay";
   };
 
diff --git a/src/environment.rs b/src/environment.rs
index 1a95971..a8646e1 100644
--- a/src/environment.rs
+++ b/src/environment.rs
@@ -1,6 +1,6 @@
-use crate::shell_interface::{
-  build_command_from_shell_command, CommandOutput, CommandResult, ExitStatus, ShellCommand,
-  ShellInterface, StartError,
+use crate::shell_interface::{CommandOutput, CommandResult, ExitStatus, ShellCommand,
+                             ShellInterface, StartError,
+                             build_command_from_shell_command,
 };
 use std::env::VarError;
 use std::ffi::{OsStr, OsString};
@@ -60,7 +60,10 @@ impl Environment for Prod {
     K: AsRef<OsStr>,
     V: AsRef<OsStr>,
   {
-    env::set_var(key, value);
+    unsafe {
+      //multi-ssh is single threaded
+      env::set_var(key, value);
+    }
   }
 
   fn get_home_directory(&self) -> Option<PathBuf> {
diff --git a/src/shell_interface.rs b/src/shell_interface.rs
index 1bf318d..7407a69 100644
--- a/src/shell_interface.rs
+++ b/src/shell_interface.rs
@@ -70,7 +70,7 @@ pub enum ShellCommand {
 }
 
 impl ShellCommand {
-  pub fn in_env<E>(self, environment: &mut E) -> EnvCommand<E> {
+  pub fn in_env<E>(self, environment: &mut E) -> EnvCommand<'_, E> {
     EnvCommand {
       command: self,
       environment,