Commit graph

59 commits

Author SHA1 Message Date
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
William A. Kennington III
0fdbc44411 grub: Fix typo 2014-08-28 13:36:41 -07:00
William A. Kennington III
dd18e67cfb grub: Cleanup efi support 2014-08-28 13:35:37 -07:00
William A. Kennington III
2ea1433b77 grub: Fetch from alpha.gnu.org instead of git 2014-08-28 13:35:36 -07:00
William A. Kennington III
1f460e00ef grub: Build grub2 from git instead of using the unpredictable generated tarball 2014-08-28 13:35:35 -07:00
William A. Kennington III
f2bef62716 Update grub 2.00 to 2.02-beta2 2014-08-28 13:35:34 -07:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Ricardo M. Correia
667008d56f grub: Add support for grsecurity 2014-05-15 13:25:48 +02:00
Shea Levy
ca116f76f9 Unmaintain a bunch of packages
Trying to take maintainership more seriously...

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 22:34:41 -05:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons
938486848e grub: fix download URL for grub-0.97-once.patch 2013-04-07 23:33:20 +02:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Peter Simons
f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Peter Simons
3fafdb362b bison: update to version 2.6.5
This update fixes the grub-2.0 warning issue that was worked around in commit
4f5e655b36. Consequently, that patch is no longer
needed.
2012-11-09 18:00:49 +01:00
Peter Simons
4f5e655b36 grub-2.0x: avoid pragma warnings triggered by bison-2.6.4-generated parsers 2012-10-24 17:26:55 +02:00
Peter Simons
347b5800b2 grub-2.0: strip trailing whitespace 2012-10-16 19:10:16 +02:00
Peter Simons
06bdd77d3d grub-2.0: fix bash completion script 2012-10-16 19:10:11 +02:00
Eelco Dolstra
c4041d9c39 grub: Fix build on Glibc 2.16
http://hydra.nixos.org/build/3046836
2012-09-21 10:36:40 -04:00
Eelco Dolstra
f4847262ae grub2: Add dependency on devicemapper (needed for LVM support) 2012-08-01 21:30:47 +02:00
Eelco Dolstra
6262db94a9 grub: Update to 2.00 2012-07-24 22:33:39 -04:00
Yury G. Kudryashov
0210e20b5a svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Lluís Batlle i Rossell
f00e2914e3 Removing grub 1.98. It was useful only when we only had 1.99rc1 to boot from raid md
devices. In 1.99, all worked.


svn path=/nixpkgs/trunk/; revision=32602
2012-02-26 21:06:55 +00:00
Eelco Dolstra
bafc4ff59d * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
2012-01-20 15:29:04 +00:00
Eelco Dolstra
2ebf8df601 * Apply the latest Gentoo patches to Grub 1.
svn path=/nixpkgs/trunk/; revision=31720
2012-01-19 21:08:33 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Shea Levy
83acc83fb7 Reenable grub2_efi
svn path=/nixpkgs/trunk/; revision=30262
2011-11-06 17:08:05 +00:00
Ludovic Courtès
2943c2eb78 GNU GRUB 1.99.
svn path=/nixpkgs/trunk/; revision=27440
2011-06-13 20:52:32 +00:00
Shea Levy
cc87dee3d8 Bump grub 1.9x to 1.99~rc2
svn path=/nixpkgs/trunk/; revision=27150
2011-05-04 18:27:26 +00:00
Lluís Batlle i Rossell
240801542a Restoring grub 1.98 from svn, and adding it as a package apart. This allows
easy using package overrides in nixos to use grub 1.98.

I found 1.98 can boot from /dev/md* devices, while 1.99rc1 cannot due to some
upstream problem. Once it works, we can remove this 1.98 again.


svn path=/nixpkgs/trunk/; revision=26761
2011-04-09 09:25:06 +00:00
Karn Kallio
400a5b054a Remove unnecessary postInstall added to grub expression in r26239,
as pointed out by Shea Levy.

svn path=/nixpkgs/trunk/; revision=26240
2011-03-09 19:41:51 +00:00
Karn Kallio
f5eba6cc5d Fix grub error "cp cannot stat .... unicode.pf2
-- change postPatch hook to prePatch (postPatch is not run with empty patchset)
-- make the share/grub directory and copy unicode.pf2 there

svn path=/nixpkgs/trunk/; revision=26239
2011-03-09 18:58:09 +00:00
Ludovic Courtès
430228c30f GRUB-EFI: Use throw' instead of abort'.
svn path=/nixpkgs/trunk/; revision=26219
2011-03-09 10:30:56 +00:00
Ludovic Courtès
6e69b4dbd0 GNU GRUB 1.9 for UEFI.
Based on a patch by Shea Levy <shea@shealevy.com>.

svn path=/nixpkgs/trunk/; revision=26216
2011-03-08 23:26:41 +00:00
Ludovic Courtès
499b5ca40a GNU GRUB 1.99~rc1.
svn path=/nixpkgs/trunk/; revision=26215
2011-03-08 23:26:35 +00:00
Eelco Dolstra
6021bcf0dc * Updated the GRUB 0.97 patchset from Gentoo to 1.10.
svn path=/nixpkgs/trunk/; revision=23715
2010-09-10 12:21:43 +00:00
Eelco Dolstra
37f6612875 * Disable GRUB 2's `make check' by default, because it requires QEMU.
It's not so desirable to have GRUB 2 depend on X11, Mesa, SDL,
  PulseAudio, ... (I became very confused when changing Mesa triggered
  a rebuild of GRUB.)

svn path=/nixpkgs/branches/x-updates/; revision=22680
2010-07-20 19:22:02 +00:00
Ludovic Courtès
c3484e59e9 GNU GRUB 1.98.
svn path=/nixpkgs/trunk/; revision=22465
2010-07-04 21:11:13 +00:00
Ludovic Courtès
cf3b87d747 GNU GRUB 1.97.2.
svn path=/nixpkgs/trunk/; revision=19656
2010-01-25 22:04:03 +00:00
Eelco Dolstra
8df82e27b5 * Work around an incompatibility between LVM's udev rules and GRUB 2
(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550704).

svn path=/nixpkgs/trunk/; revision=19304
2010-01-07 23:45:29 +00:00
Eelco Dolstra
9d15a2ed67 * Grub 1.97.1.
svn path=/nixpkgs/trunk/; revision=18332
2009-11-12 08:58:16 +00:00
Ludovic Courtès
26d2ee22e2 GNU GRUB 1.97.
svn path=/nixpkgs/trunk/; revision=17965
2009-10-26 13:58:58 +00:00
Ludovic Courtès
40495327c5 GRUB 2: Add GNU Unifont BDF font.
svn path=/nixpkgs/trunk/; revision=17791
2009-10-13 21:34:54 +00:00
Ludovic Courtès
4ba5d3dc6d Add GNU GRUB 1.97~beta3 (aka. "GRUB 2").
svn path=/nixpkgs/trunk/; revision=17636
2009-10-04 21:39:34 +00:00
Eelco Dolstra
808027219d * Provide support for the "savedefault --once" command in the Grub
shell.  KDE uses this to allow rebooting into a non-default
  entry.  To enable, do "nixos-rebuild switch --install-grub".

svn path=/nixpkgs/trunk/; revision=17341
2009-09-21 19:06:48 +00:00
Lluís Batlle i Rossell
b510addf20 Enabling by default the grub support for buggy BIOSes on CD boot.
Two of two, raskin and me, voted for this change.

svn path=/nixpkgs/trunk/; revision=16361
2009-07-14 18:23:53 +00:00
Lluís Batlle i Rossell
3a8a3c91f7 Adding a patch for grub, so livecds with grub can still boot with buggy bioses,
as those of Acer 292LMi or Airis N990. This allows booting the NixOS ISO releases.
I made it optional, not included by default. I don't think it would harm at all enabling
it always - let it be decided on forum.

svn path=/nixpkgs/trunk/; revision=16341
2009-07-13 16:57:33 +00:00
Eelco Dolstra
dda1e103fc * Latest Grub patches from Gentoo. In particular adds support for
booting from ext4.

svn path=/nixpkgs/trunk/; revision=13741
2009-01-12 12:39:16 +00:00
Eelco Dolstra
35cc272d07 * Handle symlinks such as /dev/disk/by-label/bla. Previously
Grub installation barfed.

svn path=/nixpkgs/trunk/; revision=12877
2008-09-18 09:43:31 +00:00