Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby ... Conflicts: pkgs/applications/version-management/redmine/default.nix pkgs/development/interpreters/ruby/gem.nix pkgs/development/interpreters/ruby/generated.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/tools/vagrant/default.nix pkgs/servers/consul/default.nix		2014-12-28 14:29:52 -05:00
..
audio	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
backup/crashplan	crashplan: install desktop file	2014-12-19 23:26:35 +01:00
display-managers	fix sha for a slim's theme	2014-11-08 22:40:36 +03:00
editors	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
gis	nixpkgs: remove redundant attribute sip	2014-12-23 19:37:21 +01:00
graphics	Add photoqt-1.1.0.1	2014-12-27 22:13:41 +01:00
inferno	Add missing 's' in remaining meta.maintainer(s) attrs	2014-07-22 23:49:21 +02:00
misc	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
networking	Missed gcc refs	2014-12-26 12:28:15 -05:00
office	Missed gcc refs	2014-12-26 12:28:15 -05:00
science	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
search	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
taxes	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
version-management	Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby	2014-12-28 14:29:52 -05:00
video	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
virtualization	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
window-managers	Merge #5061: add xwayland	2014-12-25 09:25:05 +01:00