Vladimír Čunát 1575bc652e Merge branch 'master' into staging ...

Conflicts (simple):
	pkgs/os-specific/linux/util-linux/default.nix

It seems this merge creates a new stdenv hash,
because we had changes on both branches :-/

2015-01-13 18:07:11 +01:00

..

applications

merge #5521: give fetchgit outputs nicer names

2015-01-13 17:46:44 +01:00

build-support

merge #5521: give fetchgit outputs nicer names

2015-01-13 17:46:44 +01:00

data

Revert "Introduce patchShebangsPhase ran in preConfigurePhases"

2015-01-08 10:26:49 +01:00

desktops

rage: fix video for gstreamer engine

2015-01-13 14:59:53 +01:00

development

Merge branch 'master' into staging

2015-01-13 18:07:11 +01:00

games

merge #5521: give fetchgit outputs nicer names

2015-01-13 17:46:44 +01:00

misc

Wine unstable: 1.7.33 -> 1.7.34

2015-01-11 16:43:29 +03:00

os-specific

Merge branch 'master' into staging

2015-01-13 18:07:11 +01:00

servers

lighttpd: Fix building with magnet support.

2015-01-13 08:37:56 +01:00

shells

nixpkgs: remove redundant attribute sip

2014-12-23 19:37:21 +01:00

stdenv

Merge branch 'master' into staging

2015-01-13 18:07:11 +01:00

test

…

tools

merge #5521: give fetchgit outputs nicer names

2015-01-13 17:46:44 +01:00

top-level

Merge branch 'master' into staging

2015-01-13 18:07:11 +01:00