c45372f038
Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix |
||
---|---|---|
.. | ||
apparmor-patches | ||
bridge-stp-helper.patch | ||
common-config.nix | ||
generate-config.pl | ||
generic.nix | ||
grsec-path.patch | ||
linux-3.2.nix | ||
linux-3.4.nix | ||
linux-3.10.nix | ||
linux-3.12.nix | ||
linux-3.14.nix | ||
linux-3.17.nix | ||
linux-3.18.nix | ||
linux-rpi-3.6.nix | ||
linux-testing.nix | ||
linux.upstream.template | ||
manual-config.nix | ||
mips-ext3-n32.patch | ||
mips-fpu-sigill.patch | ||
mips-fpureg-emulation.patch | ||
no-xsave.patch | ||
patches.nix | ||
perf.diff | ||
perf.nix | ||
update.sh |