Vladimír Čunát 6295a3ca36 Merge recent master into x-updates ...

Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix

2014-08-02 05:08:07 +02:00

..

default.nix

Revert "Merge #3054: add kde 4.13.2"

2014-07-22 17:48:14 +02:00

e17.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

e18.nix

Fix lib functions taken from pkgs.lib instead of lib in nixos

2014-08-01 16:23:56 -04:00

gnome3.nix

nautilus-sendto: new package

2014-05-28 17:27:48 +02:00

kde4.nix

Remove KDE 4.11

2014-04-21 18:13:17 +02:00

none.nix

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

xbmc.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

xfce.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

xterm.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00