Commit Graph

54 Commits

Author SHA1 Message Date
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
Massimo Zaniboni
32f9644943 redmine: use libc libciconv implementation on Linux. 2014-12-12 01:20:53 +01:00
Charles Strahan
cf8f4963a7 rename rubyLibs to rubyPackages 2014-11-09 22:16:58 +00:00
Domen Kožar
8f27aedb46 add redmine package 2014-10-07 10:54:22 +02:00