From patchwork Mon Feb 12 21:43:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 60254 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 6BFAF27BBE9; Mon, 12 Feb 2024 21:45:05 +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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 8A76727BBE2 for ; Mon, 12 Feb 2024 21:45:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZe6c-0004tX-50; Mon, 12 Feb 2024 16:44:50 -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 1rZe6X-0004tH-Rn for guix-patches@gnu.org; Mon, 12 Feb 2024 16:44:45 -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 1rZe6X-00047y-J2 for guix-patches@gnu.org; Mon, 12 Feb 2024 16:44:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZe6o-0001Kv-G3 for guix-patches@gnu.org; Mon, 12 Feb 2024 16:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68769] [PATCH 0/2] Update Disarchive to 0.6.0 Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Feb 2024 21:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68769 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Timothy Sample Cc: 68769@debbugs.gnu.org Received: via spool by 68769-submit@debbugs.gnu.org id=B68769.17077742674958 (code B ref 68769); Mon, 12 Feb 2024 21:45:02 +0000 Received: (at 68769) by debbugs.gnu.org; 12 Feb 2024 21:44:27 +0000 Received: from localhost ([127.0.0.1]:33637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZe6E-0001Hs-Hc for submit@debbugs.gnu.org; Mon, 12 Feb 2024 16:44:27 -0500 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:21541) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZe6B-0001H4-Gp for 68769@debbugs.gnu.org; Mon, 12 Feb 2024 16:44:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=TTyHxXjeRmZiYAY5F6SQQyv3W3gcEq4mSx/lJ+0fkWw=; b=AdaXywLVz/IiktOzSX+1kU6GCW0b3q9eFPPuNbo3P8BMIvp4OVwIt+UL h9b8I94F+5Rj4aWQLKB3LzyRCOoE/uFbtyNewRNlgozFtWx0G3AFNqip/ n2gbQnzQKnNYtgn0TP+CqLitQSgBu//dloMgaBvo/iMm2fkeLl4xWBXu+ 8=; Authentication-Results: mail3-relais-sop.national.inria.fr; dkim=none (message not signed) header.i=none; spf=SoftFail smtp.mailfrom=ludovic.courtes@inria.fr; dmarc=fail (p=none dis=none) d=inria.fr X-IronPort-AV: E=Sophos;i="6.06,155,1705359600"; d="scan'208";a="79426656" Received: from 91-160-117-201.subs.proxad.net (HELO ribbon) ([91.160.117.201]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Feb 2024 22:43:59 +0100 From: Ludovic =?utf-8?q?Court=C3=A8s?= In-Reply-To: <20240128060701.845-2-samplet@ngyro.com> (Timothy Sample's message of "Sun, 28 Jan 2024 00:05:22 -0600") References: <20240128060701.845-2-samplet@ngyro.com> Date: Mon, 12 Feb 2024 22:43:59 +0100 Message-ID: <87o7clbbog.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 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 Hi Timothy, I thought I had replied but apparently not (?). Timothy Sample skribis: > This small series updates Disarchive to 0.6.0, bringing in support for bzip2. > I would appreciate someone giving it a once over, since the Guix package > depends on the Disarchive package. Fortunately, we have the existing XZ > support, so I just followed that example. :) > > I ran tests and made sure that I could ‘guix pull’ from my checkout. I even > tested that Disarchive from the resulting profile could be used on bzip2 and > XZ files. I did a similar test of the Guix package. Everything looks pretty > good. This is excellent news! LGTM! I applied the patches and built Disarchive + guile-bzip2 on x86_64-linux. ‘make as-derivation’ also gives me a valid ‘guix’. So green lights from me. One change that’s missing is this, used for : Go for it! Ludo’. diff --git a/etc/disarchive-manifest.scm b/etc/disarchive-manifest.scm index 41f64eae4f..3dbfa356df 100644 --- a/etc/disarchive-manifest.scm +++ b/etc/disarchive-manifest.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021-2023 Ludovic Courtès +;;; Copyright © 2021-2024 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +35,8 @@ (define (tarball-origin? origin) (and (origin-hash origin) (or (string-suffix? ".tar.gz" file) (string-suffix? ".tgz" file) + (string-suffix? ".tar.bz2" file) + (string-suffix? ".tbz2" file) (string-suffix? ".tar.xz" file) (string-suffix? ".tar" file))))))