From 6f861517a99ef18c3367104919061f6c69abc278 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 15 Jul 2025 12:40:27 +0200
Subject: [PATCH 1/2] oxidized: fix ssh support

---
 pkgs/by-name/ox/oxidized/.bundle/config |  1 -
 pkgs/by-name/ox/oxidized/package.nix    | 58 ++++++++++++++++++++++---
 2 files changed, 53 insertions(+), 6 deletions(-)
 delete mode 100644 pkgs/by-name/ox/oxidized/.bundle/config

diff --git a/pkgs/by-name/ox/oxidized/.bundle/config b/pkgs/by-name/ox/oxidized/.bundle/config
deleted file mode 100644
index ccff7eafdc14..000000000000
--- a/pkgs/by-name/ox/oxidized/.bundle/config
+++ /dev/null
@@ -1 +0,0 @@
-BUNDLE_BUILD__RUGGED: --with-ssh
diff --git a/pkgs/by-name/ox/oxidized/package.nix b/pkgs/by-name/ox/oxidized/package.nix
index 9dbfd3502fa9..eb86fece73cc 100644
--- a/pkgs/by-name/ox/oxidized/package.nix
+++ b/pkgs/by-name/ox/oxidized/package.nix
@@ -4,6 +4,16 @@
   bundlerApp,
   bundlerUpdateScript,
   nixosTests,
+  libssh2,
+  pkg-config,
+  openssl,
+  cmake,
+  libgit2,
+  icu,
+  which,
+  file,
+  zlib,
+  libyaml,
 }:
 
 bundlerApp {
@@ -17,17 +27,55 @@ bundlerApp {
     "oxs"
   ];
 
+  gemConfig = {
+    rugged = attrs: {
+      buildInputs = [
+        pkg-config
+        cmake
+      ];
+      nativeBuildInputs = [
+        pkg-config
+        cmake
+      ];
+      propagatedBuildInputs = [
+        libssh2
+        openssl
+        libgit2
+      ];
+
+      dontUseCmakeConfigure = true;
+      buildFlags = [ "--with-ssh" ];
+    };
+
+    charlock_holmes = attrs: {
+      buildInputs = [
+        icu
+        zlib
+      ];
+      nativeBuildInputs = [
+        which
+        pkg-config
+        file
+      ];
+    };
+
+    psych = attrs: {
+      buildInputs = [ libyaml ];
+      nativeBuildInputs = [ pkg-config ];
+    };
+  };
+
   passthru = {
     tests = nixosTests.oxidized;
     updateScript = bundlerUpdateScript "oxidized";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Network device configuration backup tool. It's a RANCID replacement";
     homepage = "https://github.com/ytti/oxidized";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ nicknovitski ];
-    teams = [ teams.wdz ];
-    platforms = platforms.linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nicknovitski ];
+    teams = with lib.teams; [ wdz ];
+    platforms = lib.platforms.linux;
   };
 }

From 5e6b052fc149d3c0e99aa68adf82a50b43eb6229 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sun, 7 Sep 2025 12:41:21 +0200
Subject: [PATCH 2/2] oxidized: add liberodark to maintainers

---
 pkgs/by-name/ox/oxidized/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ox/oxidized/package.nix b/pkgs/by-name/ox/oxidized/package.nix
index eb86fece73cc..046add730c65 100644
--- a/pkgs/by-name/ox/oxidized/package.nix
+++ b/pkgs/by-name/ox/oxidized/package.nix
@@ -74,7 +74,10 @@ bundlerApp {
     description = "Network device configuration backup tool. It's a RANCID replacement";
     homepage = "https://github.com/ytti/oxidized";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ nicknovitski ];
+    maintainers = with lib.maintainers; [
+      nicknovitski
+      liberodark
+    ];
     teams = with lib.teams; [ wdz ];
     platforms = lib.platforms.linux;
   };