nixpkgs/pkgs/os-specific
Jan Malakhovski ad35019501 Merge branch 'master' into staging
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
..
bsd treewide: Use pkgs/build-support/roles.bash to remove copy pasta 2018-05-07 15:10:37 -04:00
darwin Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
gnu Merge pull request #40530 from obsidiansystems/mingw-cleanup 2018-05-14 21:05:44 -04:00
linux Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
windows Merge pull request #40530 from obsidiansystems/mingw-cleanup 2018-05-14 21:05:44 -04:00