From 7a5334bc3e835c9884c97729602cbfb1b049644e Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Tue, 18 Nov 2025 13:58:36 -0800
Subject: [PATCH 1/2] distrobox: ensure grep is in the PATH

---
 pkgs/by-name/di/distrobox/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/di/distrobox/package.nix b/pkgs/by-name/di/distrobox/package.nix
index 8946a7355b9c..e92fb1692d51 100644
--- a/pkgs/by-name/di/distrobox/package.nix
+++ b/pkgs/by-name/di/distrobox/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   wget,
+  gnugrep,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -40,6 +41,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     wrapProgram "$out/bin/distrobox-generate-entry" \
       --prefix PATH ":" ${lib.makeBinPath [ wget ]}
 
+    wrapProgram "$out/bin/${finalAttrs.meta.mainProgram}" \
+      --prefix PATH ":" ${lib.makeBinPath [ gnugrep ]}
+
     mkdir -p $out/share/distrobox
     echo 'container_additional_volumes="/nix:/nix"' > $out/share/distrobox/distrobox.conf
   '';
@@ -55,5 +59,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = licenses.gpl3Only;
     platforms = platforms.linux;
     maintainers = with maintainers; [ atila ];
+    mainProgram = "distrobox";
   };
 })

From 7db9bcded434b40fcec59e034a821fd25385eba1 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Tue, 18 Nov 2025 16:29:53 -0800
Subject: [PATCH 2/2] distrobox: cleanup

---
 pkgs/by-name/di/distrobox/package.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/di/distrobox/package.nix b/pkgs/by-name/di/distrobox/package.nix
index e92fb1692d51..dfa17aef48a3 100644
--- a/pkgs/by-name/di/distrobox/package.nix
+++ b/pkgs/by-name/di/distrobox/package.nix
@@ -5,6 +5,8 @@
   makeWrapper,
   wget,
   gnugrep,
+  nix-update-script,
+  testers,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -14,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "89luca89";
     repo = "distrobox";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-uwJD7HsWoQ/LxYL0mSSxMni676qqEnMHndpL01M5ySE=";
   };
 
@@ -48,7 +50,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     echo 'container_additional_volumes="/nix:/nix"' > $out/share/distrobox/distrobox.conf
   '';
 
-  meta = with lib; {
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+    };
+  };
+
+  meta = {
     description = "Wrapper around podman or docker to create and start containers";
     longDescription = ''
       Use any linux distribution inside your terminal. Enable both backward and
@@ -56,9 +65,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       you’re more comfortable with
     '';
     homepage = "https://distrobox.it/";
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ atila ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ atila ];
     mainProgram = "distrobox";
   };
 })