05/06: pack, vm: Fix incorrect use of 'package-transitive-propagated-inputs'.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 910d0121a8b6515febf0a02e4d23c249f98c0da2
Author: Ludovic Courtès <address@hidden>
Date:   Mon Feb 11 22:52:28 2019 +0100

    pack, vm: Fix incorrect use of 'package-transitive-propagated-inputs'.
    
    In practice the error was not triggered because
    'package-transitive-propagated-inputs' currently returns the empty list
    for these two packages.
    
    * guix/scripts/pack.scm (gcrypt-sqlite3&co): Remove labels from the
    result.
    * gnu/system/vm.scm (gcrypt-sqlite3&co): Likewise.
---
 gnu/system/vm.scm     | 6 ++++--
 guix/scripts/pack.scm | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 088b582..e09c687 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 
<address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2016 Christopher Allan Webber <address@hidden>
 ;;; Copyright © 2016, 2017 Leo Famulari <address@hidden>
 ;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
@@ -134,7 +134,9 @@
   ;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs.
   (append-map (lambda (package)
                 (cons package
-                      (package-transitive-propagated-inputs package)))
+                      (match (package-transitive-propagated-inputs package)
+                        (((labels packages) ...)
+                         packages))))
               (list guile-gcrypt guile-sqlite3)))
 
 (define* (expression->derivation-in-linux-vm name exp
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index b19a4ae..8fce99a 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -104,7 +104,9 @@ found."
   ;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs.
   (append-map (lambda (package)
                 (cons package
-                      (package-transitive-propagated-inputs package)))
+                      (match (package-transitive-propagated-inputs package)
+                        (((labels packages) ...)
+                         packages))))
               (list guile-gcrypt guile-sqlite3)))
 
 (define (store-database items)