GNU bug report logs - #71937
[PATCH 0/2] gnu: distrobox: Update to 1.7.2.1.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 71937 in the body.
You can then email your comments to 71937 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
To: guix-patches <at> gnu.org
Cc: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
Subject: [PATCH 0/2] gnu: distrobox: Update to 1.7.2.1. 
Date: Thu,  4 Jul 2024 12:09:44 +0200

Updates distrobox to latest release and also fixes an existing problem
with the package as when creating a distrobox container it generates a
desktop file, but quickly breaks if the store path of distrobox changes.

So this patchset fixes that by only using `distrobox' command as
available on the environment.

Jean-Pierre De Jesus DIAZ (2):
  gnu: distrobox: Update to 1.7.2.1.
  gnu: distrobox: Patch distrobox-generate-entry.

 gnu/packages/containers.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)


base-commit: 3979812d4923e980f0069ad99332e2df7c033769
-- 
2.45.2

Message #8 received at 71937 <at> debbugs.gnu.org (full text, mbox):

From: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
To: 71937 <at> debbugs.gnu.org
Cc: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
Subject: [PATCH 1/2] gnu: distrobox: Update to 1.7.2.1.
Date: Thu,  4 Jul 2024 12:11:57 +0200

* gnu/packages/containers.scm (distrobox): Update to 1.7.2.1.

Change-Id: If0d644b013ddc4f63bf6b6e549f19845626ba60d
---
 gnu/packages/containers.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index 72acfaba45..9b17f6601e 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -160,7 +160,7 @@ (define-public conmon
 (define-public distrobox
   (package
     (name "distrobox")
-    (version "1.7.0")
+    (version "1.7.2.1")
     (source
      (origin
        (method git-fetch)
@@ -168,7 +168,7 @@ (define-public distrobox
              (url "https://github.com/89luca89/distrobox")
              (commit version)))
        (sha256
-        (base32 "1g14q1sm3026h9n85v1gc3m2v9sgrac2mr9yrkh98qg5yahzmpc3"))
+        (base32 "0q0m3x1984kc5g7pihlwmnmrnnxnx6c0givx7wf91q91rlmdws0z"))
        (file-name (git-file-name name version))))
     (build-system copy-build-system)
     (arguments
-- 
2.45.2

Message #11 received at 71937 <at> debbugs.gnu.org (full text, mbox):

From: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
To: 71937 <at> debbugs.gnu.org
Cc: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
Subject: [PATCH 2/2] gnu: distrobox: Patch distrobox-generate-entry.
Date: Thu,  4 Jul 2024 12:11:58 +0200

Avoids keeping store references in generated desktop files.

* gnu/packages/containers.scm (distrobox)<arguments>: add
'patch-distrobox-generate-entry phase.

Change-Id: Ib1bffaefa1805accb5227c289c9fc985853bc675
---
 gnu/packages/containers.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index 9b17f6601e..1bfa18b4b9 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -174,6 +174,14 @@ (define-public distrobox
     (arguments
      (list #:phases
            #~(modify-phases %standard-phases
+               ;; This script creates desktop files but when the store path for
+               ;; distrobox changes it leaves the stale path on the desktop
+               ;; file, so remove the path to use the profile's current
+               ;; distrobox.
+               (add-after 'unpack 'patch-distrobox-generate-entry
+                 (lambda _
+                   (substitute* "distrobox-generate-entry"
+                     (("\\$\\{distrobox_path\\}/distrobox") "distrobox"))))
                ;; Use WRAP-SCRIPT to wrap all of the scripts of distrobox,
                ;; excluding the host side ones.
                (add-after 'install 'wrap-scripts
-- 
2.45.2

Message #16 received at 71937-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
Cc: 71937-done <at> debbugs.gnu.org
Subject: Re: [bug#71937] [PATCH 0/2] gnu: distrobox: Update to 1.7.2.1.
Date: Sat, 20 Jul 2024 12:16:57 +0200

Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz> skribis:

> Updates distrobox to latest release and also fixes an existing problem
> with the package as when creating a distrobox container it generates a
> desktop file, but quickly breaks if the store path of distrobox changes.
>
> So this patchset fixes that by only using `distrobox' command as
> available on the environment.
>
> Jean-Pierre De Jesus DIAZ (2):
>   gnu: distrobox: Update to 1.7.2.1.
>   gnu: distrobox: Patch distrobox-generate-entry.

Applied, thanks!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.