Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/libav/default.nix pkgs/shells/bash/bash-4.2-patches.nix pkgs/stdenv/generic/default.nix		2014-10-07 00:09:37 +02:00
..
default.nix	kde: Allow kde_next as a desktop environment	2014-09-24 23:50:23 +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
e19.nix	Add package: Enlightenment E19!	2014-09-15 23:34:28 +02:00
gnome3.nix	Fix nixos-rebuild evaluation	2014-09-23 14:01:25 +02:00
kde4_next.nix	kde: Allow kde_next as a desktop environment	2014-09-24 23:50:23 +02:00
kde4.nix	nixos/manual: Use literalExample when feasible.	2014-08-27 23:41:15 +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	nixos/xfce: don't set a bloated GST_PLUGIN_PATH	2014-08-19 09:32:07 +08:00
xterm.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00