9ee0a9df9b
A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434 |
||
---|---|---|
.. | ||
cert-file-path-max.patch | ||
cert-file.patch | ||
darwin-arch.patch | ||
default.nix | ||
freebsd-x86_64-asm.patch | ||
gnu.patch | ||
hurd-target.patch |