JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ad35019501
nixpkgs/pkgs
History
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
..
applications Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
build-support Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
common-updater common-updater: support updating source URL 2018-03-16 23:17:07 +09:00
data Merge pull request #41009 from matthewbauer/normalize-names 2018-05-25 16:32:48 -05:00
desktops Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
development Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
games Merge pull request #41009 from matthewbauer/normalize-names 2018-05-25 16:32:48 -05:00
misc Merge pull request #41009 from matthewbauer/normalize-names 2018-05-25 16:32:48 -05:00
os-specific Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
servers Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
shells Merge remote-tracking branch 'upstream/master' into staging 2018-05-23 09:40:37 -04:00
stdenv Merge pull request #40933 from obsidiansystems/linux-to-darwin 2018-05-23 11:37:43 -04:00
test tests.cc-wrapper: verify building with sanitizers 2018-05-24 02:57:44 -04:00
tools Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00
top-level Merge branch 'master' into staging 2018-05-26 00:20:17 +00:00