Commit graph

178 commits

Author SHA1 Message Date
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát 4bd836b381
Merge branch 'master' into staging-next 2020-10-25 09:46:04 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Vladimír Čunát 803ca85c20
coreutils: fix aarch64 build by upstream patch
https://hydra.nixos.org/build/128781441
We can't use fetchpatch here, unfortunately.
2020-10-25 08:07:15 +01:00
Tim Steinbach d14a910029
coreutils: 8.31 -> 8.32 2020-10-17 17:03:05 -04:00
Matthew Bauer d0677e6d45 treewide: add warning comment to “boot” packages
This adds a warning to the top of each “boot” package that reads:

  Note: this package is used for bootstrapping fetchurl, and thus cannot
  use fetchpatch! All mutable patches (generated by GitHub or cgit) that
  are needed here should be included directly in Nixpkgs as files.

This makes it clear to maintainer that they may need to treat this
package a little differently than others. Importantly, we can’t use
fetchpatch here due to using <nix/fetchurl.nix>. To avoid having stale
hashes, we need to include patches that are subject to changing
overtime (for instance, gitweb’s patches contain a version number at
the bottom).
2020-07-31 08:56:53 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Rickard Nilsson 28f2dcc8b7 pkgs/coreutils: Disable the df skip-rootfs test
In the sandbox built for https://nixbuild.net, the coreutils build fails
because a failure in the df skip-rootfs test. The test failure is triggered by
the existance of a rootfs file system. However, I think that the test is faulty,
and I have reported it upstream in
https://lists.gnu.org/archive/html/bug-coreutils/2019-12/msg00000.html.

Disabling the test makes the coreutils build work in the nixbuild.net sandbox,
and I can't think of any negative impact disabling it can have. In normal nix
setups and in the normal nix sandbox, this test is not exercised anyway, since
there is no rootfs visible.
2020-01-29 09:05:03 +01:00
Bastian Köcher 320a4c1526 coreutils: Fix cross compilation for Android 2020-01-15 09:44:10 +01:00
Niklas Hambüchen 19b043fe84 coreutils: Patch benign test case failing with musl.
See https://github.com/NixOS/nixpkgs/pull/61250#issuecomment-491642024

Using upstream patch.
2019-08-14 19:16:43 +02:00
Niklas Hambüchen 5524dac2fe coreutils: Refactor test patching.
So that more patches can easily be added and commented.
2019-08-14 19:16:43 +02:00
Sascha Grunert bb6c2a0c25 coreutils: Skip inotify dir-recreate test
Some target platforms, especially when building inside a container
have issues with the inotify test. I also saw issues related to that
test under macOS so I would suggest in skipping that for now.
2019-06-18 11:19:54 +02:00
Tobias Mayer 66cf1c68a6 Avoid changing of derivation for non-musl platform 2019-05-12 22:25:01 +02:00
Tobias Mayer 17c2884c70 coreutils: fix musl cross compilation 2019-05-12 22:25:01 +02:00
Will Dietz 2f7bf95f51 coreutils: 8.30 -> 8.31, touchups
Release notes:

https://savannah.gnu.org/forum/forum.php?forum_id=9394

Touchups:
* enable tests w/musl (disable 2 gnulib tests)
* improve tests we modify: use exit code 77 to
  indicate test skipped (causing it to be reportd as SKIP)

Note: Not yet on mirrors, but can be (manually) fetched from primary
2019-03-11 00:38:45 -05:00
Matthew Bauer 8a08d7e7cc
Merge pull request #56031 from matthewbauer/priorities
Add some more priorities
2019-03-09 18:02:55 -05:00
Matthew Bauer fce294caab coreutils: set low priority 2019-02-18 21:11:33 -05:00
Voob of Doom 2bcd611b7e
coreutils: fix tests failing on f2fs 2019-01-21 11:06:31 +01:00
Frederik Rietdijk e45ca47f14 Merge staging-next into staging 2018-12-26 09:30:32 +01:00
Craig Younkins 8b12b17df3
treewide: Fix broken Gmane URLs 2018-12-25 22:34:55 -05:00
Jörg Thalheim 0a35c5cc8c coreutils: fix unprivileged sandbox build
In usernamespaces some POSIX assumptions break, which
make some coreutils fail when running with sandbox but without a nix-deamon.
With this pull request it is possible to bootstrap stdenv without root-permission,
which is quiet useful in HPC environments.
2018-12-23 09:43:43 +00:00
Frederik Rietdijk a510aa2672 Merge master into staging-next 2018-12-03 12:18:43 +01:00
c0bw3b 0498ccd076 Treewide: use HTTPS on GNU domains
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
2018-12-02 15:51:59 +01:00
Jörg Thalheim 3681fa5456
direnv: make cross-compile on windows 2018-11-24 10:43:47 +00:00
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