Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2018-03-08 21:21:05 +01:00
commit d8fa1890c7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
50 changed files with 939 additions and 347 deletions

View file

@ -844,7 +844,6 @@ GLIBC/HURD for a Hurd host"
(define glibc-2.26-patched
(package
(inherit glibc)
(replacement #f)
(source (origin
(inherit (package-source glibc))
(patches (cons (search-patch "glibc-allow-kernel-2.6.32.patch")