nixpkgs/pkgs
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
..
applications Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2014-12-28 14:29:52 -05:00
build-support Missed gcc refs 2014-12-26 12:28:15 -05:00
data include version number in name 2014-12-20 14:45:26 +00:00
desktops e19: enableParallelBuilding of some larger components 2014-12-28 11:40:01 +01:00
development Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2014-12-28 14:29:52 -05:00
games Missed gcc refs 2014-12-26 12:28:15 -05:00
misc Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2014-12-28 14:29:52 -05:00
os-specific Typo 2014-12-28 19:41:06 +01:00
servers Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2014-12-28 14:29:52 -05:00
shells nixpkgs: remove redundant attribute sip 2014-12-23 19:37:21 +01:00
stdenv I think this should fix the evaluation errors in hydra 2014-12-27 12:02:58 -05:00
test
tools Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2014-12-28 14:29:52 -05:00
top-level Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby 2014-12-28 14:29:52 -05:00