diff options
| author | Marius Bakke <[email protected]> | 2019-07-12 01:03:53 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2019-07-12 01:03:53 +0200 |
| commit | fb9a23a3f3ad3d7b5b7f03b2007baf27684d6bbd (patch) | |
| tree | afbd3f4f33771c61254b0c3d977092542fbe8009 /gnu/packages/pretty-print.scm | |
| parent | 1c4b72cb34640638e40c5190676e5c8c352d292d (diff) | |
| parent | 5a836ce38c9c29e9c2bd306007347486b90c5064 (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/python-xyz.scm
gnu/packages/xml.scm
guix/gexp.scm
po/guix/POTFILES.in
Diffstat (limited to 'gnu/packages/pretty-print.scm')
| -rw-r--r-- | gnu/packages/pretty-print.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 405ad08ba4..7a5b98c698 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Efraim Flashner <[email protected]> +;;; Copyright © 2016, 2019 Efraim Flashner <[email protected]> ;;; Copyright © 2016 Ricardo Wurmus <[email protected]> ;;; Copyright © 2017 Marius Bakke <[email protected]> ;;; Copyright © 2017 Ludovic Courtès <[email protected]> @@ -63,7 +63,8 @@ #t)) (patches (search-patches "a2ps-CVE-2001-1593.patch" - "a2ps-CVE-2014-0466.patch")))) + "a2ps-CVE-2014-0466.patch" + "a2ps-CVE-2015-8107.patch")))) (build-system gnu-build-system) (inputs `(("psutils" ,psutils) |