GNU bug report logs - #67874
[PATCH] gnu: distrobox: Update to 1.6.0.1.

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 18 Dec 2023 01:49:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Dec 17 20:49:12 2023
Received: from localhost ([127.0.0.1]:59213 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rF2kq-00082t-7M
	for submit <at> debbugs.gnu.org; Sun, 17 Dec 2023 20:49:12 -0500
Received: from lists.gnu.org ([2001:470:142::17]:38298)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raingloom@HIDDEN>) id 1rF2ko-00082h-8t
 for submit <at> debbugs.gnu.org; Sun, 17 Dec 2023 20:49:11 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <raingloom@HIDDEN>)
 id 1rF2kh-0003kF-7F
 for guix-patches@HIDDEN; Sun, 17 Dec 2023 20:49:03 -0500
Received: from mx1.riseup.net ([198.252.153.129])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <raingloom@HIDDEN>)
 id 1rF2ka-0003xi-Gv
 for guix-patches@HIDDEN; Sun, 17 Dec 2023 20:49:01 -0500
Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
 (No client certificate requested)
 by mx1.riseup.net (Postfix) with ESMTPS id 4StjR86k0PzDqNf
 for <guix-patches@HIDDEN>; Mon, 18 Dec 2023 01:48:52 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak;
 t=1702864133; bh=lUM91QQ8RzelPRPbgCk2ii35vXjQv2RhMKo5Tz9EL3A=;
 h=From:To:Cc:Subject:Date:From;
 b=L0V+oPtJVA2uJ+NXSOhusty/ZhNuzcN2LglBIlDnVA86We9TvbtiuYu05p3+WTXF+
 e03GWsxhqktaUgCKzPW1xpoNWAYCwEWJubqrF+jDbmV0+iNfwuda1l0Otj4yJkuARt
 ePbZlrc1vumElPDDZaEdI/WimkgSg0GgEBok8zSc=
X-Riseup-User-ID: A8D6CABA767E898DFEBE5172EA54C0FBA61EC8C67D4788058E770252C7BF3928
Received: from [127.0.0.1] (localhost [127.0.0.1])
 by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4StjR80RByzJmyC;
 Mon, 18 Dec 2023 01:48:51 +0000 (UTC)
From: Csepp <raingloom@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: distrobox: Update to 1.6.0.1.
Date: Mon, 18 Dec 2023 02:46:15 +0100
Message-ID: <eb8bd481e47aecea043907488a573692c6371b55.1702863974.git.raingloom@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=198.252.153.129;
 envelope-from=raingloom@HIDDEN; helo=mx1.riseup.net
X-Spam_score_int: -27
X-Spam_score: -2.8
X-Spam_bar: --
X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01,
 SPF_HELO_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01,
 T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: submit
Cc: raingloom@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

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

Change-Id: I9f0e5f6bc3ba29918b10e8790a5a9da098c73285
---
Also the package actually works now.

gnu/packages/containers.scm | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index a3aa9ac1db..ac9de070de 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -42,6 +42,7 @@ (define-module (gnu packages containers)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
+  #:use-module (gnu packages guile)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages python)
   #:use-module (gnu packages networking)
@@ -160,7 +161,7 @@ (define-public conmon
 (define-public distrobox
   (package
     (name "distrobox")
-    (version "1.5.0.2")
+    (version "1.6.0.1")
     (source
      (origin
        (method git-fetch)
@@ -168,23 +169,31 @@ (define-public distrobox
              (url "https://github.com/89luca89/distrobox")
              (commit version)))
        (sha256
-        (base32 "0h6rpgbcmg33vriyzh9nkdxj8yhfn0y35i1wh1zmb7zss3ik9kxj"))
+        (base32 "0kj02phzikz9rddcx2apq3a8zwwfaawc3sfkd4q7f85lpnjxfsji"))
        (file-name (git-file-name name version))))
     (build-system copy-build-system)
     (inputs
      (list podman wget))
     (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (add-before 'install 'refer-to-inputs
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   (substitute* (find-files "." "^distrobox[^.]*[^1]$")
-                     (("podman") (search-input-file inputs "/bin/podman"))
-                     (("wget") (search-input-file inputs "/bin/wget"))
-                     (("command -v") "test -x"))))
-               (replace 'install
-                 (lambda _
-                   (invoke "./install" "--prefix" #$output))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'wrap-scripts
+              (lambda _
+                (let ((path (search-path-as-list
+                             '("bin")
+                             (map cadr
+                                  '#$(package-inputs this-package))))
+                      (guile #$(file-append guile-3.0 "/bin/guile")))
+                  (for-each
+                   (lambda (file)
+                     (wrap-script file
+                       #:guile guile
+                       `("PATH" ":" prefix
+                         ,path)))
+                   (find-files (string-append #$output "/bin")))))))
+       #:install-plan ''(("./" "bin/" #:include-regexp ("\\./distrobox[^/]*$"))
+                         ("completions/" "share/bash-completion/completions/"))))
     (home-page "https://distrobox.privatedns.org/")
     (synopsis "Create and start containers highly integrated with the hosts")
     (description

base-commit: fe86819d8bde674766659c22b215d3a689a8026e
-- 
2.41.0