Vladimír Čunát 710df5bb78 Merge master into staging ...

It contains some mass-rebuild stuff as well,
so best push the changes to staging, too.

2015-05-27 20:47:23 +02:00

..

applications

Merge master into staging

2015-05-27 20:47:23 +02:00

build-support

Merge pull request #7823 from ericbmerritt/ocaml-enhancements

2015-05-26 23:52:32 +02:00

data

geolite-legacy -> 2015-05-20

2015-05-20 16:42:38 +02:00

desktops

Merge master into staging

2015-05-27 20:47:23 +02:00

development

Merge master into staging

2015-05-27 20:47:23 +02:00

games

xbomb: add version 2.2b

2015-05-24 14:24:33 +00:00

misc

Update alock to version 20150418

2015-05-25 23:45:53 +02:00

os-specific

grsecurity: Update stable and test patches

2015-05-27 20:27:43 +02:00

servers

Merge master into staging

2015-05-27 20:47:23 +02:00

shells

Merge pull request #7903 from joelmo/patch-3

2015-05-26 11:00:36 +01:00

stdenv

Refactor mkFlag / shouldUsePkg into the nixpkgs libraries

2015-05-22 13:26:55 -07:00

test

…

tools

Add lolcat, a rainbow version of cat

2015-05-27 17:02:36 +02:00

top-level

Merge master into staging

2015-05-27 20:47:23 +02:00