Michael Raskin 94205f5f21 Revert "Merge pull request #2449 from wkennington/master.grub" ... This reverts commit 469f22d717, reversing changes made to 0078bc5d8f. Conflicts: nixos/modules/installer/tools/nixos-generate-config.pl nixos/modules/system/boot/loader/grub/install-grub.pl nixos/release.nix nixos/tests/installer.nix I tried to keep apparently-safe code in conflicts.		2014-08-31 12:58:37 +04:00
..
applications	Fix K3D build	2014-08-31 12:53:13 +04:00
build-support	build-support: Fix nix-prefetch-* on OS X.	2014-08-27 11:22:34 +02:00
data	Merge pull request #3872 from robberer/pkgs/symbola	2014-08-30 14:45:05 +02:00
desktops	Make sure gnome-python has gnomevfs binding	2014-08-30 15:56:22 +02:00
development	lirc: add missing semicolon	2014-08-31 02:17:19 +02:00
games	super-tux-kart: update to 0.8.1	2014-08-29 12:18:21 +01:00
misc	Higan - new package (alpha stage!)	2014-08-29 18:32:07 +01:00
os-specific	lttng-modules: Mark as broken	2014-08-30 23:14:17 +02:00
servers	mariadb: Patch to compile on OS X.	2014-08-30 14:41:51 -05:00
shells	pythonPackges.ipython: 2.0.0 -> 2.2.0	2014-08-25 11:01:31 +02:00
stdenv	Merge pull request #2455 from bjornfor/helpful-messages-when-refusing-eval	2014-08-12 20:18:10 +02:00
test
tools	Revert "Merge pull request #2449 from wkennington/master.grub"	2014-08-31 12:58:37 +04:00
top-level	Revert "Merge pull request #2449 from wkennington/master.grub"	2014-08-31 12:58:37 +04:00