nixpkgs

History

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

old

Change occurrences of gcc to the more general cc

2014-12-26 11:06:21 -06:00

coding-conventions.xml

doc: document current conventions on package naming

2014-02-23 08:00:59 +01:00

contributing.xml

doc/contributing.xml: remove lies

2014-11-08 21:56:23 +01:00

default.nix

Nixpkgs manual: Add a Nix expression to build