diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-02-11 22:52:28 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-02-11 23:23:28 +0100 |
| commit | 910d0121a8b6515febf0a02e4d23c249f98c0da2 (patch) | |
| tree | cd15da4172eb61dd0bccada8d04443d4f5574d71 | |
| parent | 1d8b10d00f0c242bc5ce9540737af3d3f24a05c0 (diff) | |
| download | guix-910d0121a8b6515febf0a02e4d23c249f98c0da2.tar.gz | |
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.
| -rw-r--r-- | gnu/system/vm.scm | 6 | ||||
| -rw-r--r-- | 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 088b582bcd..e09c687a04 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 <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> @@ -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 b19a4ae1b1..8fce99ad17 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) |