nixpkgs/pkgs/misc
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
..
apulse apulse: update from 0.1.2 to 0.1.4 2014-11-18 20:36:46 +01:00
beep
cups Change occurrences of gcc to the more general cc 2014-12-26 11:06:21 -06:00
drivers Change occurrences of gcc to the more general cc 2014-12-26 11:06:21 -06:00
emulators Change occurrences of gcc to the more general cc 2014-12-26 11:06:21 -06:00
foldingathome Change occurrences of gcc to the more general cc 2014-12-26 11:06:21 -06:00
freestyle
frescobaldi
ghostscript ghostscript: drop GNU fork and update 2014-11-14 13:51:26 +03:00
gxemul Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
jackaudio
lilypond
my-env Change occurrences of gcc to the more general cc 2014-12-26 11:06:21 -06:00
phabricator
sails
screensavers xscreensaver: 5.30 → 5.32 2014-12-21 11:14:25 +03:00
seafile-shared
solfege
sound-of-sorting
source-and-tags
themes clearlooks-phenix: Fix the Meta Description 2014-12-07 18:16:11 -05:00
uboot
vim-plugins Revert "vim-plugins: update" 2014-12-18 02:41:47 +03:00
xosd
misc.nix rename rubyLibs to rubyPackages 2014-11-09 22:16:58 +00:00