Commit graph

14 commits

Author SHA1 Message Date
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Nikolay Amiantov
6fef00260a folly: 0.57.0 -> 2016-04-29 2016-04-30 03:12:32 +03:00
Tuomas Tynkkynen
b465dc202f boost: Kill unnecessary 'lib' output
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Nikolay Amiantov
f2ce7bb0a5 folly: 2015-09-17 -> 0.57.0 2015-10-15 17:07:38 +03:00
William A. Kennington III
f8e7cee32e folly: 0.57.0 -> 2015-09-17 2015-09-17 15:39:21 -07:00
William A. Kennington III
3df7b15932 folly: 0.52.0 -> 0.57.0 2015-09-03 14:31:10 -07:00
Nikolay Amiantov
4b9d22db08 folly: update package 2015-07-28 12:33:30 +03:00
Nikolay Amiantov
2120cdec76 folly: update 2015-05-18 17:21:08 +03:00
Pascal Wittmann
bb9e9cc3f8 Turned some meta.maintainers into lists 2015-05-14 19:09:43 +02:00
Nikolay Amiantov
731a4019d0 folly: update 2015-03-29 13:05:27 +03:00
Nikolay Amiantov
7e48fc4c8f folly: update package 2015-02-03 14:27:50 +03:00
Domen Kožar
776d796221 folly: disable on 32bit (unsupported) 2014-12-11 10:38:52 +01:00
Domen Kožar
f058618019 folly: 12 -> 17, fix build 2014-12-03 23:12:32 +01:00
Nikolay Amiantov
761fdd440d folly: add package 2014-11-08 03:48:54 +03:00