nixos/nixpkgs.git/pkgs/tools/compression, branch staging.patchShebangs

Fix user-facing typos (mainly in descriptions)

2014-12-30T02:31:03+00:00

Merge remote-tracking branch 'origin/glibc-2.20' into staging

2014-11-16T21:17:36+00:00

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

2014-11-06T09:16:39+00:00

Conflicts:
	pkgs/stdenv/generic/default.nix

Turn more licenses into lib.licenses style

2014-11-06T00:48:16+00:00

Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739

Merge recent master into staging

2014-11-05T14:00:44+00:00

Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f82be3

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix

Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging

2014-11-04T13:30:43+00:00

Conflicts:
	pkgs/applications/editors/vim/macvim.nix

Merge pull request #4772 from abbradar/lbzip2

2014-11-02T19:38:39+00:00

lbzip2: add package

Merge remote-tracking branch 'origin/master' into staging.

2014-11-02T15:15:53+00:00

Merge pull request #4771 from abbradar/pbzip2-update

2014-11-01T23:52:28+00:00

pbzip2: update package

lbzip2: add package

2014-11-01T23:05:54+00:00