Domen Kožar bb4d658f64 Merge branch 'master' into staging ... Conflicts: nixos/doc/manual/release-notes/rl-unstable.xml nixos/modules/services/printing/cupsd.nix pkgs/applications/misc/calibre/default.nix pkgs/development/haskell-modules/hackage-packages.nix pkgs/development/libraries/libsodium/default.nix pkgs/misc/emulators/wine/unstable.nix pkgs/top-level/all-packages.nix		2015-05-11 10:05:23 +02:00
..
apulse	apulse: fix sha	2015-03-31 15:11:47 +03:00
beep
cups	cups: Use systemd files provided by CUPS	2015-05-10 13:46:32 +02:00
drivers
emulators	Merge pull request #7604 from bendlas/wine64	2015-05-10 19:13:37 +03:00
foldingathome
freestyle
frescobaldi
ghostscript
gnuk	gnuk: Add derivation for fst-01	2015-05-02 15:54:42 -07:00
jackaudio	jack2: depend on libsndfile	2015-05-03 12:46:10 -05:00
lilypond
my-env	myEnvFun: use stderr instead of stdout for messages	2015-03-22 18:24:35 +01:00
phabricator
sails
screensavers	slock: 1.1 -> 1.2	2015-05-10 13:46:01 +02:00
seafile-shared
solfege
sound-of-sorting
source-and-tags
themes	numix-gtk-theme: Install to $out/share/themes.	2015-03-05 15:13:04 +08:00
uboot
vim-plugins	vim-plugins: wakatime 3.0.9 -> 4.0.0	2015-05-03 22:29:14 +02:00
xosd
misc.nix