all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#52742] [PATCH] self: Add guile-lzma as a dependency.
@ 2021-12-22 23:16 Timothy Sample
  2021-12-23 14:15 ` bug#52742: " Timothy Sample
  0 siblings, 1 reply; 2+ messages in thread
From: Timothy Sample @ 2021-12-22 23:16 UTC (permalink / raw)
  To: 52742

[-- Attachment #1: Type: text/plain, Size: 80 bytes --]

Hello,

This patch fixes an omission in my previous Disarchive patch.


-- Tim


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-self-Add-guile-lzma-as-a-dependency.patch --]
[-- Type: text/x-patch, Size: 2207 bytes --]

From 47053d6250a7fb3fa0f33b2df308200cf5f1e4a6 Mon Sep 17 00:00:00 2001
From: Timothy Sample <samplet@ngyro.com>
Date: Wed, 22 Dec 2021 17:35:56 -0500
Subject: [PATCH] self: Add guile-lzma as a dependency.

This is a follow-up to 35ce3e5de6d39d4959ecae31e8f8ce2bbb645e0a, fixing
Disarchive recovery when the download script is run from a 'guix pull'
profile.

* guix/self.scm (specification->package): Add "guile-lzma".
(compiled-guix): Add GUILE-LZMA to DEPENDENCIES in
the #:dependencies argument to 'guix-command'.
---
 guix/self.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/guix/self.scm b/guix/self.scm
index bd9a71de45..943bb0b498 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -64,6 +64,7 @@ (define specification->package
       ("guile-gcrypt"  (ref '(gnu packages gnupg) 'guile-gcrypt))
       ("gnutls"     (ref '(gnu packages tls) 'gnutls))
       ("disarchive" (ref '(gnu packages backup) 'disarchive))
+      ("guile-lzma" (ref '(gnu packages guile) 'guile-lzma))
       ("gzip"       (ref '(gnu packages compression) 'gzip))
       ("bzip2"      (ref '(gnu packages compression) 'bzip2))
       ("xz"         (ref '(gnu packages compression) 'xz))
@@ -789,6 +790,9 @@ (define* (compiled-guix source #:key
   (define disarchive
     (specification->package "disarchive"))
 
+  (define guile-lzma
+    (specification->package "guile-lzma"))
+
   (define dependencies
     (append-map transitive-package-dependencies
                 (list guile-gcrypt gnutls guile-git guile-avahi
@@ -1009,7 +1013,9 @@ (define* (compiled-guix source #:key
                 (command  (guix-command modules
                                         #:source source
                                         #:dependencies
-                                        (cons disarchive dependencies)
+                                        (cons* disarchive
+                                               guile-lzma
+                                               dependencies)
                                         #:guile guile-for-build
                                         #:guile-version guile-version)))
            (whole-package name modules dependencies
-- 
2.34.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#52742: [PATCH] self: Add guile-lzma as a dependency.
  2021-12-22 23:16 [bug#52742] [PATCH] self: Add guile-lzma as a dependency Timothy Sample
@ 2021-12-23 14:15 ` Timothy Sample
  0 siblings, 0 replies; 2+ messages in thread
From: Timothy Sample @ 2021-12-23 14:15 UTC (permalink / raw)
  To: 52742-done

Timothy Sample <samplet@ngyro.com> writes:

> This patch fixes an omission in my previous Disarchive patch.
>
> From 47053d6250a7fb3fa0f33b2df308200cf5f1e4a6 Mon Sep 17 00:00:00 2001
> From: Timothy Sample <samplet@ngyro.com>
> Date: Wed, 22 Dec 2021 17:35:56 -0500
> Subject: [PATCH] self: Add guile-lzma as a dependency.

Pushed after some IRC review.


-- Tim




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-12-23 14:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-22 23:16 [bug#52742] [PATCH] self: Add guile-lzma as a dependency Timothy Sample
2021-12-23 14:15 ` bug#52742: " Timothy Sample

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.