ad35019501
Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master |
||
---|---|---|
.. | ||
7.10.3-binary.nix | ||
7.10.3.nix | ||
8.0.2.nix | ||
8.2.1-binary.nix | ||
8.2.2.nix | ||
8.4.2.nix | ||
abi-depends-determinism.nix | ||
backport-dylib-command-size-limit.patch | ||
gcc-clang-wrapper.sh | ||
ghc-8.0.2-no-cpp-warnings.patch | ||
ghc-gold-linker.patch | ||
ghc-no-madv-free.patch | ||
head.nix | ||
relocation.patch |