mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 16:42:09 +00:00
bf414c9d4f
- there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now. |
||
|---|---|---|
| .. | ||
| default.nix | ||
| setup-hook.sh | ||