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
..
cabal-install	cabal-install-1.20.0.4: patch the build manually instead of relying on jailbreak	2014-12-19 07:45:11 +01:00
checkinstall	checkinstall: Fix RPM builds	2014-11-13 13:57:33 +01:00
disnix	disnix: Bump to latest development releases	2014-09-25 16:35:58 +02:00
dpkg	transformed meta.maintainers of some packages into lists	2014-09-13 13:52:02 +02:00
gem-nix	rename rubyLibs to rubyPackages	2014-11-09 22:16:58 +00:00
guix	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
koji	koji: factor python module into an standalone app	2014-08-30 21:08:49 +02:00
nix	nix: Update to 1.8	2014-12-14 05:29:24 +01:00
nix-prefetch-scripts	require gnused for all prefetch scripts	2014-06-23 01:25:40 -04:00
nix-repl	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
nix-serve	Add nix-serve	2014-12-14 02:19:54 +01:00
nixops	nixopsUnstable: Initial version 1.3pre1362_2a616f8	2014-12-12 16:30:54 +01:00
nox	nox: use pypi for distribution	2014-10-31 14:19:33 +01:00
opkg	opkg: update from 0.2.3 to 0.2.4	2014-11-15 12:19:54 +01:00
opkg-utils	opkg-utils: new package	2014-11-05 21:58:12 +01:00
python2nix	python2nix: update to latest	2014-09-27 20:09:08 +02:00
rpm	rpm: Upgrade from 4.7.2 -> 4.11.2	2014-02-15 14:53:13 -06:00