diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:20:28 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-02-14 00:20:28 +0100 |
commit | 6901878894e9c6405fa811c512a32f448e8b9fa2 (patch) | |
tree | 5b04c4234f4022533692c36a83047ec9801aada9 /gnu/system/vm.scm | |
parent | baf766a7ff9db45c707b4539176f2143fbd90efd (diff) | |
parent | 58c6a93d9d60660d8425d8c52d4b73a42d4a5b55 (diff) | |
download | guix-6901878894e9c6405fa811c512a32f448e8b9fa2.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system/vm.scm')
-rw-r--r-- | gnu/system/vm.scm | 6 |
1 files changed, 4 insertions, 2 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 |