3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

45 commits

Author SHA1 Message Date
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 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 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
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
William A. Kennington III f2d3b5ead9 grub2: 2015-07-05 -> 2015-07-27 2015-08-03 14:12:14 -07:00
William A. Kennington III 48f44bfa69 grub2: 2015-05-14 -> 2015-07-05 2015-07-09 22:17:54 -07: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
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
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
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
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
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
Renamed from pkgs/tools/misc/grub/1.9x.nix (Browse further)