From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id yDX2C2mlf2VuvwAAkFu2QA (envelope-from ) for ; Mon, 18 Dec 2023 02:50:33 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id CCshBmmlf2VMeAEAqHPOHw (envelope-from ) for ; Mon, 18 Dec 2023 02:50:33 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=L0V+oPtJ; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1702864233; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=GccWKsJjPjMD9LyIJFPFupPMhlqT5pRcvGb/eqcYokQ=; b=gvYxZ359TXNk+F4fay8XycwGYEz1HUgnRHTvmoRqdge+rBHlz6jfV1LCfcHtcJTwz8iC2o y8rjZIFRzuCo+Gy2ngVpL4UGqYo2a/fl2ITCchqjWB5ALJUKepufXkEvAFwfX+36/1ePD9 hmVKWk9gPO18Sh6LrdGlYT1j+MfPKrEUhLXzZK8KzOmmMv3hR/m3f6rD2fvLmfFgdQmTZk 54MMTeN2kiCVfR8nj9vyWldMRzHIQcvWLUlASRVsLxKHyxDW7C3KVujAYGtrN3JpzBELXw kArVg/V0i7ib6qta0ATVqA3bPsjOIMUOwXF10pBj2Zmn3l0+UxszqrkcGfvQtA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1702864233; a=rsa-sha256; cv=none; b=OvvginT7H1VbyTNu8pjKEzH5w+1uQfP/AUX0keAalIYnSsMI6QgssWq6Zw4Drih7VEUYHw jI1SEuS66jDDr1+9js/Ss7V90cIvGlL0ghHZaBvqUqdPiqCQ+4IZgPrR4+h25pnEXElwaN YG6pKI/Mqo0OglXOqi9jKz7x8wjWchhhEq6nQpJ+LjTl2uUoi6cU3YocNMl7/uzdDAaQ7l XQ8kkCjwUKY/PoEczOAD6B2D6KQbsxB1b76Ei+50ykxHbNwkiZJMdjJrY3yuBdb5UbHReY L5FRFZ6Uxx+c3LGfaZVhGpTiIAagi7Fl9BZHQ+6EDERLg1hNMsqzbwv8eqWEYA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=L0V+oPtJ; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5DA7553F66 for ; Mon, 18 Dec 2023 02:50:30 +0100 (CET) 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.68 X-Spam-Score: -3.68 X-Migadu-Queue-Id: 5DA7553F66 X-Migadu-Scanner: mx11.migadu.com X-TUID: JeK1EU+Ku9Ar * 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