Merge branch 'core-updates'

Conflicts:
	gnu/packages/bootstrap.scm
This commit is contained in:
Ludovic Courtès 2015-01-16 13:27:03 +01:00
commit 57b7e1a62d
98 changed files with 2277 additions and 987 deletions

View file

@ -696,7 +696,7 @@ accessed and migrated on modern systems.")
(inputs
`(("e2fsprogs" ,e2fsprogs)
("curl" ,curl)
("file" ,file-5.20) ;work around CVE-2014-3710
("file" ,file)
("libxml2" ,libxml2)
("zlib" ,zlib)
("gettext" ,gnu-gettext)))