Tuomas Tynkkynen 6ed0fe7e45 Merge remote-tracking branch 'upstream/master' into staging ...

Conflicts:
	pkgs/build-support/fetchbower/default.nix
	pkgs/build-support/fetchdarcs/default.nix
	pkgs/build-support/fetchgx/default.nix
	pkgs/development/python-modules/botocore/default.nix
	pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
	pkgs/tools/admin/awscli/default.nix

2018-01-14 21:18:27 +02:00

..

applications

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

build-support

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

common-updater

…

data

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

desktops

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

development

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

games

Merge pull request #33792 from paraseba/scidvspc

2018-01-13 21:16:19 -05:00

misc

Merge pull request #32822 from LumiGuide/elk6

2018-01-14 10:40:50 +01:00

os-specific

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

servers

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

shells

nix-bash-completions: 0.6.1 -> 0.6.2

2018-01-10 08:40:57 +01:00

stdenv

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

test

sierra-shared-test: fix build

2018-01-05 23:20:55 +01:00

tools

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00

top-level

Merge remote-tracking branch 'upstream/master' into staging

2018-01-14 21:18:27 +02:00