Vladimír Čunát dbae4f109f Merge branch 'master' into staging ... Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-01-31 19:34:57 +01: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	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
emulators	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
foldingathome	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
freestyle
frescobaldi	frescobaldi: add pygame dependency for midi support	2015-01-22 23:34:10 -06: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
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	orion: add GTK3 theme	2015-01-26 20:59:51 -06:00
uboot
vim-plugins	Revert "vim-plugins: update"	2014-12-18 02:41:47 +03:00
xosd
misc.nix