From patchwork Tue Dec 21 18:39:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 35522 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 A6B1F27BBEA; Tue, 21 Dec 2021 18:42:00 +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_H3,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 6A29127BBE9 for ; Tue, 21 Dec 2021 18:42:00 +0000 (GMT) Received: from localhost ([::1]:49512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzk5H-0005hI-C4 for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 13:41:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzk4Q-0005dn-Vk for guix-patches@gnu.org; Tue, 21 Dec 2021 13:41:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44091) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzk4L-0005EG-Ol for guix-patches@gnu.org; Tue, 21 Dec 2021 13:41:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzk4L-0003VV-Ih for guix-patches@gnu.org; Tue, 21 Dec 2021 13:41:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52710] [PATCH 1/2] gnu: Add guile-lzma. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 18:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52710 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52710@debbugs.gnu.org Cc: Timothy Sample Received: via spool by 52710-submit@debbugs.gnu.org id=B52710.164011201713403 (code B ref 52710); Tue, 21 Dec 2021 18:41:01 +0000 Received: (at 52710) by debbugs.gnu.org; 21 Dec 2021 18:40:17 +0000 Received: from localhost ([127.0.0.1]:55633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzk3d-0003U7-0X for submit@debbugs.gnu.org; Tue, 21 Dec 2021 13:40:17 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:50345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzk3a-0003Tm-73 for 52710@debbugs.gnu.org; Tue, 21 Dec 2021 13:40:14 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 152045C00D3; Tue, 21 Dec 2021 13:40:07 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Tue, 21 Dec 2021 13:40:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=wk3v66ZI7A53FZ79xP/zdgT2Hf594yjBG4f+yuC6r QQ=; b=EC8SBOzEs8NmInPgAHbSB+7zgxqR7aTw4L/7u3urRKOibF2AGlMXjIBfC Of0Xi25NKqdtFSx2HdM2mV2o1Tl2n59kvt7b5g4kVXUwoqV7bJ33+ZslY0vCFfl0 EAFY7/sdgpcyHUroIU21n/Y5PkWyL4ZuTYEVSkC1pLlTHCvxraLrJmCuf2vsX8xE ZbZdXE4uF4X/D0taVwRqyWIHJUyyXnQpy8y7vkiwfrASvAlnDSA9AzTOATYcxxLJ ktKY3njoJmGrVB2necJ6Pq2pVIFlGUlhwO4sKGtMnOZvff+2YGePTnIfUAVDeCoK aojQ93C6IO8izjG+xzRqOHJuV7Isw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddtgedguddujecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgv thesnhhghihrohdrtghomheqnecuggftrfgrthhtvghrnhephedtueetjeekvefhfedtle dtteejjefhteetgfelieegtdfggedutdffgfdtveegnecuffhomhgrihhnpehnghihrhho rdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epshgrmhhplhgvthesnhhghihrohdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 21 Dec 2021 13:40:06 -0500 (EST) From: Timothy Sample Date: Tue, 21 Dec 2021 13:39:47 -0500 Message-Id: <20211221183948.2314-1-samplet@ngyro.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <87bl19es5h.fsf@ngyro.com> References: <87bl19es5h.fsf@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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile.scm (guile-lzma): New variable. --- gnu/packages/guile.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 28887dd69f..25c2029dfc 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2019 Taylan Kammer ;;; Copyright © 2020, 2021 Efraim Flashner ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021 Timothy Sample ;;; ;;; This file is part of GNU Guix. ;;; @@ -904,4 +905,34 @@ (define-public guile-zstd compression library.") (license license:gpl3+))) +(define-public guile-lzma + (package + (name "guile-lzma") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://files.ngyro.com/guile-lzma/guile-lzma-" + version ".tar.gz")) + (sha256 + (base32 "1f7pd3frckpwsi5p0bln4wf8xy41x0szlpy273phjdmjacw69hzb")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("guile" ,guile-3.0) + ("guile-bytestructures" ,guile-bytestructures) + ("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-3.0) + ("xz" ,xz))) + (propagated-inputs + `(("guile-bytestructures" ,guile-bytestructures))) + (home-page "https://ngyro.com/software/guile-lzma.html") + (synopsis "Guile bindings for liblzma (XZ)") + (description "Guile-LZMA is a Guile wrapper for the liblzma (XZ) +library. It exposes an interface similar to other Guile compression +libraries, like Guile-zlib.") + (license license:gpl3+))) + ;;; guile.scm ends here From patchwork Tue Dec 21 18:39:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 35523 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 A77D127BBEA; Tue, 21 Dec 2021 18:43:02 +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_H3,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 33F3027BBE9 for ; Tue, 21 Dec 2021 18:43:02 +0000 (GMT) Received: from localhost ([::1]:50842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzk6H-0006eS-Cd for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 13:43:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzk4Q-0005dm-Vh for guix-patches@gnu.org; Tue, 21 Dec 2021 13:41:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzk4M-0005EH-28 for guix-patches@gnu.org; Tue, 21 Dec 2021 13:41:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzk4M-0003Vc-0u for guix-patches@gnu.org; Tue, 21 Dec 2021 13:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52710] [PATCH 2/2] gnu: disarchive: Update to 0.4.0. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 18:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52710 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52710@debbugs.gnu.org Cc: Timothy Sample Received: via spool by 52710-submit@debbugs.gnu.org id=B52710.164011205213457 (code B ref 52710); Tue, 21 Dec 2021 18:41:01 +0000 Received: (at 52710) by debbugs.gnu.org; 21 Dec 2021 18:40:52 +0000 Received: from localhost ([127.0.0.1]:55637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzk3x-0003Ul-Cx for submit@debbugs.gnu.org; Tue, 21 Dec 2021 13:40:52 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:46039) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzk3p-0003UM-6g for 52710@debbugs.gnu.org; Tue, 21 Dec 2021 13:40:36 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 1A1975C00B0; Tue, 21 Dec 2021 13:40:24 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Tue, 21 Dec 2021 13:40:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=hEB8WDE7rttrULQbeyLpek3dDfuhbt4GpHb1lSSGobA=; b=lk5C00uK 1Q9GNrDmn9aHXAQarHxGTHXrj2vfh9oD8bCrcH11Ij6Awjy6vLbZ5i1JEXunVMBC yoSF4pUUGkNmqH/1skYp/qaYFhmvdqSZEiZbMt3qojUpcnVlDBuUfGA3FNhJRut3 YlrDu/N8dLOBm635uGm2kC3F2AM5++MC2/w2P7F0Su+Hn2KQ9MI1ndwj5hX/wuk3 lqxH+OZhkhKG1YP7NEKJDEqDA+KBzDy4oBnZ5ulwdZfgPVOlr8KOLxWIEhaRxKSV TQr541WFbCbo9cBHTxNwifi0t6hFgYRl/rjNuMRl2ATX6wlEX9axvORILIyl1cv2 xucVq2ktpSI82w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddtgedguddujecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvihhmohhthhihucfurghmphhlvgcuoehsrghmphhlvght sehnghihrhhordgtohhmqeenucggtffrrghtthgvrhhnpeekfefhieeguefflefhhfehge evkeetgeekgeekhfejteejvefggfdutdejveegfeenucffohhmrghinhepnhhghihrohdr tghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hsrghmphhlvghtsehnghihrhhordgtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 21 Dec 2021 13:40:23 -0500 (EST) From: Timothy Sample Date: Tue, 21 Dec 2021 13:39:48 -0500 Message-Id: <20211221183948.2314-2-samplet@ngyro.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211221183948.2314-1-samplet@ngyro.com> References: <87bl19es5h.fsf@ngyro.com> <20211221183948.2314-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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/backup.scm (disarchive)[source]: Update to 0.4.0. [native-inputs, inputs]: Add guile-lzma. * gnu/packages/package-management.scm (guix)[arguments]: Include guile-lzma in the 'wrap-program' phase. [inputs]: Add guile-lzma. --- gnu/packages/backup.scm | 7 ++++--- gnu/packages/package-management.scm | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index fdb84898bb..32e0532c46 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1109,14 +1109,14 @@ (define-public burp (define-public disarchive (package (name "disarchive") - (version "0.3.0") + (version "0.4.0") (source (origin (method url-fetch) (uri (string-append "https://files.ngyro.com/disarchive/" "disarchive-" version ".tar.gz")) (sha256 (base32 - "0jgc53rrbas8i4z13l2ii99cpav1ma73spsjg70ygihf0635r3dh")))) + "1pql8cspsxyx8cpw3xyhirnisv6rb4vj5mxr1d7w9la72q740n8s")))) (build-system gnu-build-system) (native-inputs (list autoconf @@ -1124,11 +1124,12 @@ (define-public disarchive pkg-config guile-3.0 ;for cross-compilation guile-gcrypt + guile-lzma guile-quickcheck)) (inputs (list guile-3.0 zlib)) (propagated-inputs - (list guile-gcrypt)) + (list 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 12736c6caf..cdf0c17598 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -328,10 +328,11 @@ (define-public guix (ssh (assoc-ref inputs "guile-ssh")) (gnutls (assoc-ref inputs "gnutls")) (disarchive (assoc-ref inputs "disarchive")) + (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)) + disarchive lzma)) (deps* (if avahi (cons avahi deps) deps)) (effective (read-line @@ -434,6 +435,7 @@ (define-public guix ("bootstrap/xz" ,(bootstrap-executable "xz" (%current-system))) ("disarchive" ,disarchive) ;for 'guix perform-download' + ("guile-lzma" ,guile-lzma) ;for Disarchive ("glibc-utf8-locales" ,glibc-utf8-locales))) (propagated-inputs