Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ...

Conflicts:
	pkgs/desktops/e18/enlightenment.nix

2014-08-04 16:51:47 +02:00

..

builder.sh

…

common.nix

Merge remote-tracking branch 'origin/master' into staging.

2014-08-04 16:51:47 +02:00

cve-2014-0475.patch

glibc: fix CVE-2014-0475 by upstream patches

2014-08-04 16:49:57 +02:00

default.nix

…

dont-use-system-ld-so-cache.patch

…

dont-use-system-ld-so-preload.patch

glibc: do not use system ld.so.preload (close #1788)

2014-02-28 16:39:12 +01:00

fix_path_attribute_in_getconf.patch

…

fix-math.patch

glibc: fix a math problem by upstream patch

2014-03-08 10:23:38 +01:00

glibc-crypt-blowfish.patch

…

info.nix

…

locales-builder.sh

…

locales.nix

…

nix-locale-archive.patch

…

rpcgen-path.patch

…