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 |
|
Tim Steinbach
|
1142b402a8
|
vivaldi: Clean up
|
2016-04-29 01:19:15 +00:00 |
|
Tim Steinbach
|
25290a9f15
|
vivaldi: 1.0 -> 1.1
|
2016-04-28 23:54:05 +00:00 |
|
Nikolay Amiantov
|
ab0a0c004e
|
makeSearchPathOutputs: refactor to makeSearchPathOutput
|
2016-04-25 13:24:39 +03:00 |
|
Nikolay Amiantov
|
8b7ebaffeb
|
replace makeSearchPath tree-wise to take care of possible multiple outputs
|
2016-04-13 22:09:41 +03:00 |
|
Nikolay Amiantov
|
5e025bc9ee
|
vivaldi: fix evaluation
|
2016-04-13 14:03:41 +03:00 |
|
Slawomir Gonet
|
c6345de9f9
|
vivaldi: init at 1.0
|
2016-04-07 08:05:53 +02:00 |
|