From patchwork Mon Dec 18 01:46:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Csepp X-Patchwork-Id: 57667 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B23E927BBE2; Mon, 18 Dec 2023 01:50:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BE46627BBE9 for ; Mon, 18 Dec 2023 01:50:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rF2lf-0003pN-SW; Sun, 17 Dec 2023 20:50:03 -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 ) id 1rF2ld-0003oh-Gt for guix-patches@gnu.org; Sun, 17 Dec 2023 20:50:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rF2ld-0004Bg-7D for guix-patches@gnu.org; Sun, 17 Dec 2023 20:50:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rF2le-00084H-CC for guix-patches@gnu.org; Sun, 17 Dec 2023 20:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67874] [PATCH] gnu: distrobox: Update to 1.6.0.1. Resent-From: Csepp Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Dec 2023 01:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67874 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67874@debbugs.gnu.org Cc: raingloom@riseup.net X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170286415230938 (code B ref -1); Mon, 18 Dec 2023 01:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Dec 2023 01:49:12 +0000 Received: from localhost ([127.0.0.1]:59213 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rF2kq-00082t-7M for submit@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 ) id 1rF2ko-00082h-8t for submit@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 ) id 1rF2kh-0003kF-7F for guix-patches@gnu.org; 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 ) id 1rF2ka-0003xi-Gv for guix-patches@gnu.org; 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 ; 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 Date: Mon, 18 Dec 2023 02:46:15 +0100 Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.129; envelope-from=raingloom@riseup.net; 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: fe86819d8bde674766659c22b215d3a689a8026e 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