Merge remote-tracking branch 'prism/master'

This commit is contained in:
tv 2016-10-24 14:40:59 +02:00
commit a24a7e693c

View File

@ -41,7 +41,6 @@ with import <stockholm/lib>;
environment.systemPackages = with pkgs; [
firefox
chromium
oraclejre8
maven
arandr
libreoffice