nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2019-02-11 22:52:28 +01:00
parent 1d8b10d00f
commit 910d0121a8
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/system/vm.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@ -134,7 +134,9 @@
;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs. ;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs.
(append-map (lambda (package) (append-map (lambda (package)
(cons package (cons package
(package-transitive-propagated-inputs package))) (match (package-transitive-propagated-inputs package)
(((labels packages) ...)
packages))))
(list guile-gcrypt guile-sqlite3))) (list guile-gcrypt guile-sqlite3)))
(define* (expression->derivation-in-linux-vm name exp (define* (expression->derivation-in-linux-vm name exp

4
guix/scripts/pack.scm
View File

@ -104,7 +104,9 @@ found."
;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs. ;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs.
(append-map (lambda (package) (append-map (lambda (package)
(cons package (cons package
(package-transitive-propagated-inputs package))) (match (package-transitive-propagated-inputs package)
(((labels packages) ...)
packages))))
(list guile-gcrypt guile-sqlite3))) (list guile-gcrypt guile-sqlite3)))
(define (store-database items) (define (store-database items)