JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
400,977 Commits 2 Branches 0 Tags 12 GiB
d79cd22ab1
Commit Graph

161 Commits

Author SHA1 Message Date
Symphorien Gibol
3e09239882 grub2: compile grub-mount as well 
It is a dependency of os-prober >= 1.75
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=860833#23
 2018-05-26 20:44:38 +02:00
Will Dietz
855e0463ab tree-wide: platforms = platforms.gnu; -> platforms = gnu ++ linux 
"platforms.gnu" has been linux-only since at least 17.03:

$ nix eval -f channel:nixos-17.03 lib.platforms.gnu
[ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ]

Unlike platforms.linux, platforms.gnu indicates "must use glibc"
which for the most part is not intended.

Replacing platforms.gnu with platforms.linux would be the same "today"
but let's err on preserving existing behavior and be optimistic
about platforms these packages work on.
 2018-04-30 18:08:48 -05:00
Will Dietz
e78900213b grub2: extend platforms to include all linux 
This works (and is needed) on musl-based linux too!
 2018-03-26 15:53:38 -05:00
Vladimír Čunát
ae9a49a77d grub2: pkgconfig to fix finding freetype 2018-03-16 03:16:46 +03:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs 
Only acts on one-line dependency lists.
 2017-09-21 15:49:53 -04:00
Franz Pletz
3317c71c5c
grub2: 2.x-2015-11-16 -> 2.02 
Fixes #24451.
 2017-08-14 07:57:15 +02:00
Thomas Tuegel
5265d551a9
grub2: unset CPP 
Commit 093cc00cdd sets the environment variable
`CPP' by default, but this intereferes with dependency calculation.
 2017-07-21 16:49:17 -05:00
Michał Pałka
55208cc2e1 pvgrub_image: add package 
Add a package containing a pvgrub image for xen generated from grub2
 2017-07-05 12:23:30 +00:00
Tuomas Tynkkynen
a9a706770a grub2: Make EFI grub work on aarch64 2017-03-07 16:11:41 +02:00
Robin Gloster
86d9de3884
trustedGroup: fix build 2017-01-26 11:51:09 +01:00
Tuomas Tynkkynen
be2a2db0f1 grub2: Workaround flex bug 
I think the flex update in 6bded45883
causes this failure, presumably due to upstream breakage:

````
gcc -DHAVE_CONFIG_H -I.  -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 -I./include -DGRUB_FILE=\"grub_script.yy.c\" -I. -I. -I. -I. -I./include -I./include -I./grub-core/lib/libgcrypt-grub/src/  -I./grub-core/lib/minilzo -I./grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -Wcast-align  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -Werror  -fno-builtin -Wno-undef  -c -o libgrubmods_a-grub_script.yy.o `test -f 'grub_script.yy.c' || echo './'`grub_script.yy.c
./grub-core/script/yylex.l:34:0: error: "yyalloc" redefined [-Werror]
 #define yyalloc(size, scanner)   (grub_malloc((size)))
 ^
grub_script.yy.c:104:0: note: this is the location of the previous definition

 ^
./grub-core/script/yylex.l:35:0: error: "yyfree" redefined [-Werror]
 #define yyfree(ptr, scanner)   (grub_free((ptr)))
 ^
grub_script.yy.c:108:0: note: this is the location of the previous definition

 ^
./grub-core/script/yylex.l:36:0: error: "yyrealloc" redefined [-Werror]
 #define yyrealloc(ptr, size, scanner) (grub_realloc((ptr), (size)))
 ^
grub_script.yy.c:106:0: note: this is the location of the previous definition

 ^
cc1: all warnings being treated as errors
make[2]: *** [Makefile:7540: libgrubmods_a-grub_script.yy.o] Error 1
````

Work around it for now.
 2017-01-05 12:53:43 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists 
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
 2016-03-05 18:55:26 +01:00
Robin Gloster
d9b4391717 grub: disable stackprotector hardening 2016-02-24 22:54:34 +00:00
Robin Gloster
e7f9e8a26f trustedGrub: disable stackprotector/pic hardening 2016-02-24 16:54:49 +00:00
Robin Gloster
f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Robin Gloster
53b389327e refactor to use autoreconfHook where possible 
Close #12446.
 2016-01-18 10:45:31 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Thomas Strobel
d856841ba4 nixos trustedGRUB: add support for HP laptops 2015-12-22 03:12:30 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
William A. Kennington III
349e50734e grub2: 2015-10-13 -> 2015-11-16 2015-11-17 21:16:01 -08:00
Tuomas Tynkkynen
464350aa01 grub2: Patch out GCC reference from modinfo.sh 2015-10-28 10:17:08 +01:00
William A. Kennington III
82792959b4 grub2: 2015-07-27 -> 2015-10-13 2015-10-17 13:46:47 -07:00
Thomas Strobel
5b800ea05e trustedGRUB2: 1.2.0 -> 1.2.1 2015-10-06 20:12:39 +02:00
William A. Kennington III
f2d3b5ead9 grub2: 2015-07-05 -> 2015-07-27 2015-08-03 14:12:14 -07:00
Thomas Strobel
192091dc06 trustedGRUB2: git -> 1.2.0 2015-08-02 23:03:45 +02:00
William A. Kennington III
48f44bfa69 grub2: 2015-05-14 -> 2015-07-05 2015-07-09 22:17:54 -07:00
Thomas Strobel
2285ad1bfa trustedGRUB: GRUB 1 based -> GRUB 2 based 2015-07-05 11:48:36 +02:00
William A. Kennington III
484a7be844 grub2: 2015-04-24 -> 2015-05-14 2015-05-15 18:38:15 -07:00
Edward Tjörnhammar
b9b8e3acba {grub2,ceph,libs3,socket_wrapper,nss_wrapper}.src: use mirrors, https and fetchFromSavannah to enable better availability for proxied users 2015-04-28 22:50:57 +02:00
William A. Kennington III
4463bad2dd grub: Update from 2015-2-21 -> 2015-04-24 2015-04-27 18:25:56 -07:00
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms 
Also fix meta.platform -> meta.platforms in a few places.
 2015-03-20 20:04:42 +01:00
Bob van der Linden
decf15fd57 grub: make sure grub builds again (close #6774) 2015-03-12 23:05:54 +01:00
William A. Kennington III
e91d788b7c grub2: Another grub bump 2015-02-14 18:58:50 -08:00
William A. Kennington III
8e62c497ca grub2: Update git revision 2015-02-13 13:42:20 -08:00
Shea Levy
0d80ab2dd9 Fix grub1 support 2015-02-08 22:28:42 -05:00
William A. Kennington III
2a0754ccbc Merge pull request #5994 from ts468/grub 
Add 'target' parameter for GRUB installation chain
 2015-02-08 14:18:13 -08:00
William A. Kennington III
c8a4ecd91d grub: Doesn't support building bios and efi simultaneously 2015-02-07 20:32:36 -08:00
William A. Kennington III
ef80d73e6a grub: Enable zfs and efi by default since it's cheap to support 2015-02-07 15:18:37 -08:00
William A. Kennington III
15cf03a8ee Build userspace packages using the userspace zfs 2015-02-07 15:07:39 -08:00
Thomas Strobel
3767370866 Add target parameter to grub installation chain 2015-01-27 19:46:37 +01:00
Eelco Dolstra
1acfbca7df grub2: Fix building against Glibc 2.20 
http://hydra.nixos.org/build/16563301
 2014-10-30 09:28:10 +01:00
Thomas Strobel
596c9f54dc Add trustedGrub package. 2014-10-14 16:02:48 +02:00
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
William A. Kennington III
88d270f62e grub2: Add localizations 2014-09-03 01:06:07 -07:00
William A. Kennington III
c369c4afbd grub2: Fix zfs support 2014-09-02 19:38:52 -07:00
William A. Kennington III
36614ff3e2 Revert "Revert "Merge pull request #2449 from wkennington/master.grub"" 
This reverts commit 94205f5f21.

Conflicts:
	nixos/modules/system/boot/loader/grub/install-grub.pl
 2014-09-02 09:16:13 -07:00
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