Tuomas Tynkkynen 747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging ...

Conflicts:
	pkgs/top-level/all-packages.nix

2018-04-03 02:22:54 +03:00

..

applications

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

2018-04-03 02:22:54 +03:00

build-support

Merge pull request #37928 from VShell/patch-2

2018-03-28 09:34:41 +01:00

common-updater

…

data

stdman: 2017.04.02 -> 2018.03.11

2018-03-30 19:57:10 +01:00

desktops

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

2018-04-03 02:22:54 +03:00

development

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

2018-04-03 02:22:54 +03:00

games

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

2018-04-03 02:22:54 +03:00

misc

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

2018-04-03 02:22:54 +03:00

os-specific

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

2018-04-03 02:22:54 +03:00

servers

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

2018-04-03 02:22:54 +03:00

shells

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

2018-04-03 02:22:54 +03:00

stdenv

meta: Simplify platform check logic

2018-03-27 11:59:59 -04:00

test

…

tools

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

2018-04-03 02:22:54 +03:00

top-level

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

2018-04-03 02:22:54 +03:00