9 commits

Author	SHA1	Message	Date
Charles Strahan	034488ec80	ruby: fixup mpdcron	2015-01-21 22:38:29 -05:00
Charles Strahan	dfc225d143	Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby ... Conflicts: pkgs/applications/version-management/git-and-tools/default.nix pkgs/applications/version-management/git-and-tools/hub/default.nix pkgs/tools/audio/mpdcron/default.nix	2015-01-20 20:21:03 -05:00
Peter Simons	8235e8c544	Switch users of 'pandoc' to the lean version.	2015-01-02 14:56:24 +01:00
Charles Strahan	94dd4b9721	ruby: WIP	2014-12-30 21:05:00 -05:00
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
Pascal Wittmann	8df0e0b151	Fixed many descriptions	2014-11-11 14:36:34 +01:00
Charles Strahan	cf8f4963a7	rename rubyLibs to rubyPackages	2014-11-09 22:16:58 +00:00
Domen Kožar	d704fb3b36	fix mpdcron	2014-10-16 11:03:10 +02:00
Jason "Don" O'Conal	1ab31c05e7	mpdcron: add expression	2014-05-23 08:39:28 +10:00