Frederik Rietdijk 628b6c0e9d Merge remote-tracking branch 'upstream/master' into HEAD

2017-09-11 22:52:53 +02:00

..

applications

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

2017-09-11 22:52:53 +02:00

build-support

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

2017-09-11 22:52:53 +02:00

common-updater

…

data

proggyfonts: fix output hash

2017-09-04 08:43:17 -07:00

desktops

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

2017-09-10 08:56:39 +02:00

development

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

2017-09-11 22:52:53 +02:00

games

scorched3d: fixing build with gcc6

2017-09-08 15:08:00 +02:00

misc

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

2017-09-11 22:52:53 +02:00

os-specific

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

2017-09-11 22:52:53 +02:00

servers

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

2017-09-11 22:52:53 +02:00

shells

grml-zsh-config: generalize support to unix systems

2017-09-01 11:38:38 +03:00

stdenv

stdenv bootstrap: fix evaluation

2017-09-10 11:16:47 +02:00

test

nixpkgs-tests: add basic test for buildInputs

2017-09-10 22:49:47 +02:00

tools

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

2017-09-11 22:52:53 +02:00

top-level

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

2017-09-11 22:52:53 +02:00