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 |
|
Charles Strahan
|
44cdf4eac7
|
bundixify consul-ui
|
2014-11-18 03:06:56 +00:00 |
|
William A. Kennington III
|
583ab7512d
|
consul: 0.4.0 -> 0.4.1
|
2014-11-17 13:19:30 -08:00 |
|
Charles Strahan
|
cf8f4963a7
|
rename rubyLibs to rubyPackages
|
2014-11-09 22:16:58 +00:00 |
|
William A. Kennington III
|
65f103175e
|
consul: 0.3.0 -> 0.4.0
|
2014-09-11 15:40:41 -07:00 |
|
Vladimír Čunát
|
b2a7b213be
|
consul*: fix evaluation
CC #2955.
|
2014-08-14 14:36:34 +02:00 |
|
Charles Strahan
|
749e73afc7
|
consul: new package
|
2014-06-25 14:40:26 -04:00 |
|