From c5d1279a4d0149326f139b26d9ac7b79e5d4e9a8 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft@gmail.com>
Date: Thu, 27 Nov 2025 17:58:09 +0300
Subject: [PATCH 1/3] cargo-bundle: add progrm-jarvis to maintainers

---
 pkgs/by-name/ca/cargo-bundle/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cargo-bundle/package.nix b/pkgs/by-name/ca/cargo-bundle/package.nix
index 02a620561354..d1f0ff50d118 100644
--- a/pkgs/by-name/ca/cargo-bundle/package.nix
+++ b/pkgs/by-name/ca/cargo-bundle/package.nix
@@ -39,6 +39,6 @@ rustPlatform.buildRustPackage {
       asl20
       mit
     ];
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.progrm_jarvis ];
   };
 }

From 7a6dab87e68048516587f9ed033524ea9df8ab2f Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft@gmail.com>
Date: Thu, 27 Nov 2025 17:59:22 +0300
Subject: [PATCH 2/3] cargo-bundle: unstable-2023-08-18 -> 0.9.0

---
 pkgs/by-name/ca/cargo-bundle/package.nix | 32 +++++++++++++++++-------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-bundle/package.nix b/pkgs/by-name/ca/cargo-bundle/package.nix
index d1f0ff50d118..bd4c9a5f2753 100644
--- a/pkgs/by-name/ca/cargo-bundle/package.nix
+++ b/pkgs/by-name/ca/cargo-bundle/package.nix
@@ -6,39 +6,53 @@
   stdenv,
   libxkbcommon,
   wayland,
+  openssl,
+  squashfsTools,
+  makeWrapper,
+  versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-bundle";
-  # the latest stable release fails to build on darwin
-  version = "unstable-2023-08-18";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "burtonageo";
     repo = "cargo-bundle";
-    rev = "c9f7a182d233f0dc4ad84e10b1ffa0d44522ea43";
-    hash = "sha256-n+c83pmCvFdNRAlcadmcZvYj+IRqUYeE8CJVWWYbWDQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-8Ulah5NtjQh5dIB/nhTrDstnaub4LS9iH33E1iv1JpY=";
   };
 
-  cargoHash = "sha256-g898Oelrk/ok52raTEDhgtQ9psc0PFHd/uNnk1QeXCs=";
+  cargoHash = "sha256-qE0ZDq0UJHfsivvI1W44u/pVjKMDGrghSl7sfau/pIY=";
 
   nativeBuildInputs = [
     pkg-config
+    makeWrapper
   ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libxkbcommon
     wayland
+    openssl
   ];
 
-  meta = with lib; {
+  postFixup = ''
+    wrapProgram $out/bin/cargo-bundle \
+      --prefix PATH : ${lib.makeBinPath [ squashfsTools ]}
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
     description = "Wrap rust executables in OS-specific app bundles";
     mainProgram = "cargo-bundle";
     homepage = "https://github.com/burtonageo/cargo-bundle";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
     maintainers = [ lib.maintainers.progrm_jarvis ];
   };
-}
+})

From fc1e10e42d4d5cdebd1282578109ba2b1a0d0b47 Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft@gmail.com>
Date: Fri, 28 Nov 2025 02:43:35 +0300
Subject: [PATCH 3/3] cargo-bundle: add nix-update-script

---
 pkgs/by-name/ca/cargo-bundle/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-bundle/package.nix b/pkgs/by-name/ca/cargo-bundle/package.nix
index bd4c9a5f2753..54eb345f941b 100644
--- a/pkgs/by-name/ca/cargo-bundle/package.nix
+++ b/pkgs/by-name/ca/cargo-bundle/package.nix
@@ -10,6 +10,7 @@
   squashfsTools,
   makeWrapper,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -45,6 +46,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Wrap rust executables in OS-specific app bundles";
     mainProgram = "cargo-bundle";