From patchwork Sun Jan 28 06:12:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 59494 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 E91E727BBE2; Sun, 28 Jan 2024 06:13:17 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,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 C8D4227BBE9 for ; Sun, 28 Jan 2024 06:13:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTyPZ-0002dm-Q9; Sun, 28 Jan 2024 01:12:57 -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 1rTyPX-0002dS-Ae for guix-patches@gnu.org; Sun, 28 Jan 2024 01:12:55 -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 1rTyPX-0002AA-2A for guix-patches@gnu.org; Sun, 28 Jan 2024 01:12:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTyPe-0003mn-HN for guix-patches@gnu.org; Sun, 28 Jan 2024 01:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68769] [PATCH 2/2] gnu: disarchive: Update to 0.6.0. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Jan 2024 06:13: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: 68769@debbugs.gnu.org Received: via spool by 68769-submit@debbugs.gnu.org id=B68769.170642236114512 (code B ref 68769); Sun, 28 Jan 2024 06:13:02 +0000 Received: (at 68769) by debbugs.gnu.org; 28 Jan 2024 06:12:41 +0000 Received: from localhost ([127.0.0.1]:56311 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTyPI-0003lu-Vf for submit@debbugs.gnu.org; Sun, 28 Jan 2024 01:12:41 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:50995) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTyPG-0003lP-GL for 68769@debbugs.gnu.org; Sun, 28 Jan 2024 01:12:39 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id D3A155C009A for <68769@debbugs.gnu.org>; Sun, 28 Jan 2024 01:12:25 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Sun, 28 Jan 2024 01:12:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ngyro.com; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1706422345; x= 1706508745; bh=2ar5NIreZURm1adk++DiCoDY5Y84rUlfbBB7cVcvrk4=; b=H OBpn56wOLw4zRdEB+/0fTjlGG3DaBkRdHrLqLvxXckfUM8KOY3tMWZj7zt4KuOH/ wgy1+UcNIWMEU/91ZpPr6YFAH5AdfSWaQjr3twg8PL/gwKl1dnaxpekH0pjv3Z3G Xvkzqr+hLKPi6rcKs5VGxqOTBjeMlQXmYZ2FuF4chRDC9EnbA/PhaRtesach2B5+ Y8r9C/yE7yaLXQXSCPvWSNGIL6p9aluz2bV9NpysaS3KX745PN779hjCuY83ASfR 793nDlLhfhklMRnk/DwBbo55sFbxoEydpMofTdQ/KbEDDCUVTJ+kyEftrL1MGB3Q T7N0bwUOa8Z5PFaCLwB+A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1706422345; x=1706508745; bh=2ar5NIreZURm1 adk++DiCoDY5Y84rUlfbBB7cVcvrk4=; b=kqOJ/qF4ZlrShhoRy/tlJ8E29/QE7 LW4Lxu5F5GJ7292y5gn4btWwS4naTG3tsQo8j/gdkNZL+O4RM4ymX3aXvcOjyiNP ExsDO/JlrMHRRqxyQv/hjK3TGSkImtBIjw3g2HFzZpRWYJhtyTJvItRA6U6Z0OF5 nnO/Qu114kqBOT63kCHzc8RJNTLKvV0OlOAMV+MkxchYqGB0KgtV9GhTcz8+HGYe IkNAkU+66hptKRcoBWOTrZ4umroL7ULzYtSEixRsXOAYnsAijaWxJh9Rztz2wjeK LylUaduowSHocrnG20sUsioGy8djCSs7iZLEfRNgIpbU6MblXaINzAq8A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrfedttddgkeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthes nhhghihrohdrtghomheqnecuggftrfgrthhtvghrnhepkeefhfeigeeuffelhffhheegve ekteegkeegkefhjeetjeevgffguddtjeevgeefnecuffhomhgrihhnpehnghihrhhordgt ohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepsh grmhhplhgvthesnhhghihrohdrtghomh X-ME-Proxy: Feedback-ID: i4721425c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <68769@debbugs.gnu.org>; Sun, 28 Jan 2024 01:12:25 -0500 (EST) From: Timothy Sample Date: Sun, 28 Jan 2024 00:12:17 -0600 Message-ID: <20240128061223.1317-2-samplet@ngyro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240128061223.1317-1-samplet@ngyro.com> References: <20240128061223.1317-1-samplet@ngyro.com> 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 * gnu/packages/backup.scm (disarchive): Update to 0.6.0; add 'guile-bzip2' as an input. * gnu/packages/package-management.scm (guix): Add 'guile-bzip2' as an input to enable bzip2 support when using Disarchive. * guix/self.scm (%packages): Add 'guile-bzip2'. (compiled-guix): Include 'guile-bzip2' as a dependency when building the 'guix' command. --- gnu/packages/backup.scm | 7 ++++--- gnu/packages/package-management.scm | 4 +++- guix/self.scm | 5 +++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 3126464347..60ce18cc2e 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1270,27 +1270,28 @@ (define-public burp (define-public disarchive (package (name "disarchive") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append "https://files.ngyro.com/disarchive/" "disarchive-" version ".tar.gz")) (sha256 (base32 - "16sjplkn9nr7zhfrqll7l1m2b2j4hg8k29p6bqjap9fkj6zpn2q2")))) + "1s4lyhhh1zsaxgn11hy2b1kdvnvpipii68wba0hwr471rd43m08k")))) (build-system gnu-build-system) (native-inputs (list autoconf automake pkg-config guile-3.0 ;for cross-compilation + guile-bzip2 guile-gcrypt guile-lzma guile-quickcheck)) (inputs (list guile-3.0 zlib)) (propagated-inputs - (list guile-gcrypt guile-lzma)) + (list guile-bzip2 guile-gcrypt guile-lzma)) (home-page "https://ngyro.com/software/disarchive.html") (synopsis "Software archive disassembler") (description "Disarchive can disassemble software archives into data diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2f6957e9d8..b9870588a7 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -411,11 +411,12 @@ (define-public guix (ssh (assoc-ref inputs "guile-ssh")) (gnutls (assoc-ref inputs "guile-gnutls")) (disarchive (assoc-ref inputs "disarchive")) + (bzip2 (assoc-ref inputs "guile-bzip2")) (lzma (assoc-ref inputs "guile-lzma")) (locales (assoc-ref inputs "glibc-utf8-locales")) (deps (list gcrypt json sqlite gnutls git bs ssh zlib lzlib zstd guile-lib - disarchive lzma)) + disarchive bzip2 lzma)) (deps* (if avahi (cons avahi deps) deps)) (effective (read-line @@ -520,6 +521,7 @@ (define-public guix ("bootstrap/xz" ,(bootstrap-executable "xz" (%current-system))) ("disarchive" ,disarchive) ;for 'guix perform-download' + ("guile-bzip2" ,guile-bzip2) ;for Disarchive ("guile-lzma" ,guile-lzma) ;for Disarchive ("git-minimal" ,git-minimal) ;for 'guix perform-download' diff --git a/guix/self.scm b/guix/self.scm index f378548959..19c6d08e01 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -65,6 +65,7 @@ (define %packages ("guile-gnutls" . ,(ref 'tls 'guile-gnutls)) ("guix-daemon" . ,(ref 'package-management 'guix-daemon)) ("disarchive" . ,(ref 'backup 'disarchive)) + ("guile-bzip2" . ,(ref 'guile 'guile-bzip2)) ("guile-lzma" . ,(ref 'guile 'guile-lzma)) ("gzip" . ,(ref 'compression 'gzip)) ("bzip2" . ,(ref 'compression 'bzip2)) @@ -827,6 +828,9 @@ (define* (compiled-guix source #:key (define disarchive (specification->package "disarchive")) + (define guile-bzip2 + (specification->package "guile-bzip2")) + (define guile-lzma (specification->package "guile-lzma")) @@ -1058,6 +1062,7 @@ (define* (compiled-guix source #:key #:source source #:dependencies (cons* disarchive + guile-bzip2 guile-lzma dependencies) #:guile guile-for-build