Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' ...

Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix

2015-02-02 21:14:28 -05:00

..

applications

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00

build-support

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00

data

zeal: new package

2015-01-28 00:02:50 +01:00

desktops

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00

development

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00

games

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00

misc

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00

os-specific

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00

servers

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00

shells

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00

stdenv

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00

test

…

tools

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00

top-level

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00