1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Commit graph

162 commits

Author SHA1 Message Date
Frederik Rietdijk 6f5142e48e Merge master into staging 2018-10-13 09:48:20 +02:00
volth 432c44f6f0
coreutils-full: fix cross build (@matthewbauer's version) 2018-10-12 10:02:34 +00:00
volth 544051b0b0
coreutils-full: fix cross build 2018-10-11 19:09:22 +00:00
Matthew Bauer ff0568380b coreutils: remove optionalString in postPatch
no reason to make this part conditional
2018-10-02 15:25:47 -05:00
Will Dietz 095ef623d9 Revert "Revert "Merge #42880: coreutils: 8.29 -> 8.30""
This reverts commit e3ee9c098a.
2018-09-23 14:32:25 -05:00
Vladimír Čunát e3ee9c098a
Revert "Merge #42880: coreutils: 8.29 -> 8.30"
This reverts commit edc13bae54, reversing
changes made to 90464f6049.
Bootstrap tools generation is broken, and I don't know why yet.
2018-09-03 08:31:01 +02:00
Vladimír Čunát 2d6179d1e8
Merge branch 'master' into staging
A few trivial conflicts due to *Platforms mass replace.
2018-09-01 17:38:18 +02:00
Vladimír Čunát 2e7cb61cfb
Merge #45720: coreutils: split a coreutils-full version 2018-09-01 17:03:49 +02:00
Vladimír Čunát edc13bae54
Merge #42880: coreutils: 8.29 -> 8.30 2018-09-01 16:50:46 +02:00
Vladimír Čunát cbd9262281
coreutils: disable a new test for now
As discussed in #42880, this test and functionality is new,
and apparently noone will look deeper for now.
2018-09-01 16:49:38 +02:00
John Ericson 0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
Vladimír Čunát fd3927ac29
coreutils: split a coreutils-full version
- default coreutils is stripped of /share/ (11 -> 2 MiB)
- coreutils-full retains /share/ and adds openssl for faster *sum tools
- NixOS systemPackages contains coreutils-full
- *Support parameter defaults are moved inside
  (it seemed confusing to have `? false` and "at once" with `? isLinux`)

Closure considerations:
+ typical build-time closure will get lighter by ~9 MiB
- typical closure of NixOS installation will grow by ~2 MiB,
  due to referring to both versions.  I think it would be possible to
  re-use most of the utils between the two versions, but the expression
  would get much more complex.

I considered having stdenv with minimal coreutils and the default
`coreutils` attribute being full, but it turned out there were too many
trivial references in nixpkgs, so it didn't seem easy to keep rebuild
impact of openssl from growing significantly.
2018-08-28 22:17:07 +02:00
Vladimír Čunát 85facc4a70
coreutils nitpick: add --with-packager
`tool --version` now gets additional line:
Packaged by https://NixOS.org
2018-08-28 22:15:57 +02:00
Moritz Angermann acaa6c92fb coreutils: unix-only
Windows is not supported & we currently define "all" to be "unix" + "windows".
2018-08-01 21:18:41 -04:00
Will Dietz 0eb13162f1 Revert "Merge pull request #43983 from viric/coreutils_ssl_master"
coreutils is part of stdenv, which doesn't allow openssl currently.

It's unclear that adding openssl to stdenv was intended,
but if it was it was not discussed or mentioned.

To unbreak "all the things", reverting until this
has been discussed and a proper fix has been put together.

This reverts commit df9f76c62d, reversing
changes made to 585ded7329.
2018-07-28 19:20:26 -05:00
Lluís Batlle i Rossell 8f5bfc6901 coreutils: fix unwanted change in prev merge
I didn't mean to change the enableParallelBuilding.
2018-07-29 00:20:18 +02:00
Lluís Batlle i Rossell 322b2043f9 Remove default for openssl
Suggested by matthewbauer review.
2018-07-28 19:30:54 +02:00
Lluís Batlle i Rossell 36701d4af7 Openssl in coreutils makes *sum programs much faster.
sha256sum, md5sum, etc.
2018-07-22 22:02:13 +02:00
Will Dietz 7f308aa7b1 coreutils: 8.29 -> 8.30
http://savannah.gnu.org/forum/forum.php?forum_id=9187
2018-07-02 13:11:31 -05:00
Lancelot SIX 8cd2ee91ef coreutils: 8.28 -> 8.29
See http://lists.gnu.org/archive/html/info-gnu/2017-12/msg00016.html
for release announcement
2017-12-29 02:18:23 +01:00
Dmitry Kalinkin 5ae7445530
coreutils: remove conflicting _FORTIFY_SOURCE definition
Originally this was introduced in 055e646b ('coreutils: Guard against compiler not supporting __builtin_stpncpy_chk') four years ago. Right now this doesn't seem to serve any purpose and it conflicts with the hardening flags:

    <command line>:2:9: warning: '_FORTIFY_SOURCE' macro redefined [-Wmacro-redefined]
    #define _FORTIFY_SOURCE 2
            ^
    <command line>:1:9: note: previous definition is here
    #define _FORTIFY_SOURCE 0
            ^
    1 warning generated.
2017-09-19 04:59:40 -04:00
John Ericson e5567bae2d treewide: Do not limit hardenging because gcc 4.9 in bootstrap
Bootstrap tools has since been bumped
2017-09-14 10:27:13 -04:00
Dan Peebles 550c5c9b3f coreutils: fix on Darwin
This patch doesn't apply because it's already applied upstream
2017-09-04 12:04:12 -04:00
Tim Steinbach 1c45fd01aa
coreutils: 8.27 -> 8.28 2017-09-02 11:11:19 -04:00
Robin Gloster 7e5ebed971
coreutils: use autoreconfHook 2017-08-12 20:21:39 +02:00
Dan Peebles 0419452113 Fix Darwin stdenv to work on 10.13
The main changes are in libSystem, which lost the coretls component in 10.13
and some hardening changes that quietly crash any program that uses %n in
a non-constant format string, so we've needed to patch a lot of programs that
use gnulib.
2017-07-11 21:56:38 -04:00
John Ericson 95c8277701 misc pkgs: Remove unneeded *Platform == *Platform comparisons
PR #26007 used these to avoid causing a mass rebuild. Now that we know
things work, we do that to clean up.
2017-06-30 10:09:31 -04:00
John Ericson 87fab3d6a5 Merge some merged cross-compilation PRs into into staging 2017-06-23 20:24:27 -04:00
John Ericson 167b80ba76 coreutils: Modernize and fix for cross
"--host=..." needs to be passed but crossAttrs overrides that.
2017-06-22 17:53:52 -04:00
Franz Pletz 6a850d2b11
coreutils: fix tests depending on setuid/setgid bits 2017-06-22 00:41:53 +02:00
Eric Litak 980ced505f coreutils: fixing ccCross.libc lookup 2017-04-14 02:00:08 -07:00
ndowens d94acf8519 coreutils: 8.26 -> 8.27 2017-03-09 14:42:26 -06:00
David Grayson 5b88f09ec4 coreutils: Fix indentation after removing self in buildPackages commit 2017-01-24 11:37:56 -05:00
John Ericson eee7cafaf7 coreutils: Use buildPackages instead of self hack for native version 2017-01-24 11:37:56 -05:00
Tuomas Tynkkynen bde8632106 coreutils: Build with libattr to support xattrs
Fixes #21649
2017-01-05 00:55:35 +02:00
Tuomas Tynkkynen 30074ddfea coreutils: Fix cross build
`make install` was failing presumably due to an upstream cross-compilation bug:

Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually).  Stop.

While at it, remove the old ugly cross buildPhase. It was seemingly
trying to work around the fact that the man pages are generated by
piping each command's --help output to help2man. That obviously doesn't
work while cross-compiling.

Instead, set PERL=missing in the environment to make the build system
think there's no perl available to run help2man. (This approach was
stolen from buildroot.)
2016-12-24 22:33:05 +02:00
Vladimír Čunát 3a0f1975b0
Revert "Revert "Merge pull request #21234 from l2dy/coreutils-up""
This reverts commit ffb90e8c4f.
This moves the coreutils update from master.
2016-12-17 20:30:09 +01:00
Tuomas Tynkkynen 659f75bfcd coreutils-prefixed: Fix build since the single-binary changes
With the symlinked build it's only renaming 'coreutils' to
'gcoreutils' and leaving all the actual command symlinks alone.

Instead of custom renaming scripts, let's use --program-prefix
from the autotools kitchen sink. This has the nice(?) bonus that
the manpages also get prefixed with 'g' now.

The build system refuses to enable both single-binary build and
--program-prefix - but the symlink-based single-binary build couldn't
possibly work either (as it will be looking at "$0" for which command
to execute).
2016-12-04 18:21:02 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Daiderd Jordan b7c134358d coreutils: use symlinks instead of shell wrapper 2016-07-09 16:47:54 +02:00
Vladimír Čunát f4792cdc0c make-bootstrap-tools*: fixup after #16406
Our coreutils now uses single-binary-build mode where, by default,
simple shebang scripts are used for all the binaries. That doesn't work
e.g. with the Linux unpacker which only handles standard binaries and
symlinks. Let's use the symlinked mode instead for boostrapping.
This does NOT change any stdenv hashes.

I only tested the case most important to me:
$ nix-build pkgs/top-level/release.nix -A stdenvBootstrapTools.x86_64-linux.test
2016-06-28 09:54:22 +02:00
Wout Mertens c26bbf0b87 coreutils: single binary build 2016-06-21 22:14:10 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Vladimír Čunát bb73e25cdc coreutils: disable checks when using non-standard storeDir
That should help with https://github.com/NixOS/nix/issues/512
2016-05-13 11:41:17 +02:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01: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
Franz Pletz a2e449e43e coreutils: Skip some tests (filenames too long) 2016-03-05 18:55:26 +01:00
Robin Gloster 3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Robin Gloster 402d57ee8e bootstrap env: disable stackprotector hardening until gcc >=4.9 2016-02-22 18:32:53 +00:00