diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-09-26 09:49:09 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-09-26 09:49:09 +0200 |
| commit | b5c5d763ca872fc3a3a500af9230ce2ac2def5c0 (patch) | |
| tree | 12acdc9f653676fea8e6b726df641fa9d6dcf45b /gnu/packages/bootstrap.scm | |
| parent | 223ecaba7f17f59cdca8dc6531478d7cf30f29d3 (diff) | |
| parent | c1fe82d5866b9271d92266517b2941850e6bbbd0 (diff) | |
Merge branch 'bash-cve-2014-6271'
Diffstat (limited to 'gnu/packages/bootstrap.scm')
| -rw-r--r-- | gnu/packages/bootstrap.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 981cde9f2b..71ccb19597 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -78,7 +78,14 @@ (boot url-fetch)) (else orig-method))) (patch-guile %bootstrap-guile) - (patch-inputs %bootstrap-patch-inputs)))) + (patch-inputs %bootstrap-patch-inputs) + + ;; Patches can be origins as well, so process them. + (patches (map (match-lambda + ((? origin? patch) + (bootstrap-origin patch)) + (patch patch)) + (origin-patches source)))))) (define (package-from-tarball name source program-to-test description) "Return a package that correspond to the extraction of SOURCE. |