diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-02-27 08:52:23 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-02-27 08:52:23 -0500 |
| commit | 048ec1a8b092a87de08bfe410be65642522b63ed (patch) | |
| tree | 1279c4fa3fd09805dbfe06be3514879aa38d503e /gnu/packages/base.scm | |
| parent | fe5f687284889eeff3c1b73edab0aa26e58c3bc5 (diff) | |
| parent | b35461748b20d0172744974b39e7d9d033400c51 (diff) | |
| download | guix-048ec1a8b092a87de08bfe410be65642522b63ed.tar guix-048ec1a8b092a87de08bfe410be65642522b63ed.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 0b07ea196d..3c6b189120 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> -;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Alex Kost <alezost@gmail.com> ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> @@ -173,7 +173,7 @@ standard utility.") "16d2r9kpivaak948mxzc0bai45mqfw73m113wrkmbffnalv1b5gx")) (patches (list (search-patch "patch-hurd-path-max.patch"))))) (build-system gnu-build-system) - (native-inputs `(("ed", ed))) + (native-inputs `(("ed" ,ed))) (synopsis "Apply differences to originals, with optional backups") (description "Patch is a program that applies changes to files based on differences @@ -318,7 +318,7 @@ functionality beyond that which is outlined in the POSIX standard.") "19gwwhik3wdwn0r42b7xcihkbxvjl9r2bdal8nifc3k5i4rn3iqb")) (patches (list (search-patch "make-impure-dirs.patch"))))) (build-system gnu-build-system) - (native-inputs `(("pkg-config", pkg-config))) ; to detect Guile + (native-inputs `(("pkg-config" ,pkg-config))) ; to detect Guile (inputs `(("guile" ,guile-2.0))) (outputs '("out" "debug")) (arguments @@ -479,7 +479,8 @@ store.") '("glibc-ldd-x86_64.patch" "glibc-locale-incompatibility.patch" "glibc-versioned-locpath.patch" - "glibc-o-largefile.patch"))))) + "glibc-o-largefile.patch" + "glibc-CVE-2015-7547.patch"))))) (build-system gnu-build-system) ;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc |