Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby ... Conflicts: pkgs/applications/version-management/git-and-tools/default.nix pkgs/applications/version-management/git-and-tools/hub/default.nix pkgs/tools/audio/mpdcron/default.nix		2015-01-20 20:21:03 -05:00
..
apulse	apulse: update from 0.1.2 to 0.1.4	2014-11-18 20:36:46 +01:00
beep	beep: set meta.platforms	2014-10-25 17:24:47 +02:00
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	Wine unstable: 1.7.33 -> 1.7.34	2015-01-11 16:43:29 +03:00
foldingathome	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
freestyle
frescobaldi	frescobaldi: Improved meta and formatting	2014-10-25 18:07:42 +02:00
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	Add simulator for autonomous sailing boats	2014-10-14 12:00:42 +01:00
screensavers	xscreensaver: 5.30 → 5.32	2014-12-21 11:14:25 +03:00
seafile-shared	seafile: update client, ccnet, libsearpc and shared	2015-01-09 13:37:44 +01:00
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