Commit Graph

59 Commits

Author SHA1 Message Date
John Ericson
f110a182a6 stdenv: Fix overriding + overrideAttrs
The old stdenv adapters were subtly wrong in two ways:

 - `overrideAttrs` leaked the original, unoverridden `mkDerivation`.

 - `stdenv.override` would throw away any manually-set `mkDerivation`
   from a stdenv reverting to the original.

Now, `mkDerivation` is controlled (nearly directly) via an argument, and
always correctly closes over the final ("self") stdenv. This means the
adapters can work entirely via `.override` without any manual `stdenv //
...`, and both those issues are fixed.

Note hashes are changed, because stdenvs no previously overridden like
`stdenvNoCC` and `crossLibcStdenv` now are. I had to add some
`dontDisableStatic = true` accordingly. The flip side however is that
since the overrides compose, we no longer need to override anything but
the default `stdenv` from which all the others are created.
2021-08-18 17:22:50 +00:00
TredwellGit
5e2311d2fb musl: 1.2.1 -> 1.2.2
https://git.musl-libc.org/cgit/musl/tree/WHATSNEW?h=v1.2.2#n2242
2021-03-23 15:45:23 +00:00
Walter Franzini
733d24b50b add stackprotector support on musl32
In order to support stackprotector on musl32, this change import a
couple of patches from alpinelinux:
1. libssp_nonshared.a is built alongside musl's libc
2. the above library is automatically linked when compiling with gcc6
   or gcc7
2021-02-12 21:11:16 +01:00
Sandro
6a20b4323d
Merge pull request #104039 from kampka/musl
musl: 1.2.0 -> 1.2.1
2021-01-03 10:08:02 +01:00
Martin Weinelt
138abad757
musl: patch CVE-2020-28928
Destination buffer overflow in wcsnrtombs.

Fixes: CVE-2020-28928
2020-11-21 00:40:40 +01:00
Christian Kampka
94d31024af
musl: 1.2.0 -> 1.2.1 2020-11-17 10:28:09 +01:00
Niklas Hambüchen
0e3c8a95da musl: 1.1.24 -> 1.2.0
The libdrm `musl-ioctl.patch` is no longer necessary, see:
015e631cd1
2020-08-16 13:10:50 +00:00
Edmund Wu
107f7ba026
musl: include libc.musl-$arch 2020-06-12 14:01:43 -04:00
Lila
7517299146
treewide: fix broken AlpineLinux repo links (#87892) 2020-05-15 16:58:27 +01:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Will Dietz
1e746cae1e
musl: touchup meta, add myself (@dtzWill) to maintainers list 2019-10-14 18:51:51 -05:00
Will Dietz
1263a712ff
musl: 1.1.2x -> 1.1.24
https://www.openwall.com/lists/musl/2019/10/13/5

Apparently 1.1.23 never made it to nixpkgs proper (?!), see:
https://git.musl-libc.org/cgit/musl/commit/?id=b07d45eb01e900f0176894fdedab62285f5cb8be

(sorry I apparently dropped the ball here)
2019-10-14 18:50:04 -05:00
Will Dietz
9c085078f7 musl: 1.1.21 -> 1.1.22
https://www.openwall.com/lists/musl/2019/04/10/1
2019-04-13 13:23:30 -05:00
Will Dietz
0450d28a1e musl: 1.1.20 -> 1.1.21
https://www.openwall.com/lists/musl/2019/01/21/8

\o/
2019-01-21 16:10:36 -06:00
Will Dietz
d3a0aa22da musl: reduce stacksize patch series to just the bump
The others rely on some of the recent restructuring+cleanup in musl,
which hopefully reaches us soon :).

For now just bump the default sizes.
2018-09-24 23:59:02 -05:00
Will Dietz
f38218a756 musl: pick stacksize-related improvements, increase default size
Also supports setting default thread stack size via linker,
making it possible to fix programs without modifying source.
2018-09-24 23:59:02 -05:00
Will Dietz
dcd5e4558f musl: pick getaddrinfo fix (containers) 2018-09-24 23:59:02 -05:00
Will Dietz
5c217591fd musl: pick upstream patches for name_to_handle_at support 2018-09-24 23:59:02 -05:00
Will Dietz
ed5347278f musl: whitespace, NFC 2018-09-24 23:59:02 -05:00
Will Dietz
697859fdc5 musl: apply other upstream fixes, selected for relevance to NixOS usage 2018-09-18 17:41:58 -05:00
Will Dietz
4305e7d5ec musl: apply upstream fix for file locking race 2018-09-18 17:13:54 -05:00
Will Dietz
ea326dd4b5 musl: convert CFLAGS to array 2018-09-18 17:13:53 -05:00
Will Dietz
e37c21ce95 musl: 1.1.19 -> 1.1.20 2018-09-04 14:55:05 -05: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
CrystalGamma
72d161f548 [RFC] ppc64le enablement (#45340)
* ppc64le enablement

* gcc, glibc: properly handle __float128

* lib/systems, stdenv: syntax cleanup

* gcc7: remove ugly hack

* gcc: add/update __float128 flags

* stdenv: add another pair of quotes for consistency

* gcc: move __float128 flag for ppc64le-glibc into common/platform-flags.nix
2018-08-21 15:31:34 -04:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Matthew Bauer
e99322507e treewide: get rid of musl stuff 2018-05-31 12:36:45 -04:00
John Ericson
2110c0bd30 treewide: Use pkgs/build-support/roles.bash to remove copy pasta
Also fix some setup hooks that unnecessarily used environment hooks,
which revolted in the same variable being modified too many times.
2018-05-07 15:10:37 -04:00
Will Dietz
558f7424f2 musl: make libc -> {ldso,ldd} symlinks relative
Minor touchup while rebuilding things anyway.
2018-04-25 08:22:16 -05:00
Will Dietz
2d54f8f915 musl: build iconv using just-built pieces
This is a bit unusual for a package,
but not libc's as they should stand alone.
2018-04-25 08:18:07 -05:00
Will Dietz
de00c0d7fb musl/iconv: use copy from Alpine for minor touchups to error messages 2018-04-24 20:07:17 -05:00
Will Dietz
3e0a443203 musl: provide 'iconv' utility occasionally expected as part of libiconv 2018-04-24 20:07:17 -05:00
Frederik Rietdijk
6023849ba1 Merge master into staging 2018-04-10 19:23:42 +02:00
Jörg Thalheim
654ce4ba29 musl: enable musl-gcc, ld.musl-clang, musl-clang
These are convenient for projects with mixed musl/glibc build targets.
For pure musl builds in nixpkgs, we probably want a musl stdenv.
2018-04-09 16:12:47 +01:00
Will Dietz
ebf04d83c0 musl-fts: add setup-hook to add -lfts 2018-03-26 13:59:59 -05:00
Will Dietz
7b44560aa1 musl: provide debug info, separately, don't disable unwind tables
Also by setting --enable-debug, asm is preprocessed with CFI directives.

Keep unwind tables does not increase size by much,
and helps debuggers and similar make sense of things.
2018-03-23 12:59:15 -05:00
Will Dietz
381ace583c musl: 1.1.18 -> 1.1.19
Remove patch, no longer needed.
2018-02-22 13:57:36 -06:00
Will Dietz
f29bbd779c musl: add patch to make full use of new guards in kernel headers 2018-02-13 09:44:53 -06:00
Will Dietz
b12a7c9225 add getconf, getent from Alpine for use w/musl 2018-02-13 09:44:34 -06:00
Will Dietz
9df72c0290 Add musl-fts for bits that need it. 2018-02-13 09:44:34 -06:00
Will Dietz
af6b756d98 muslCross: init 2018-02-13 09:44:34 -06:00
Will Dietz
1d538d51c3 musl: linux headers, bsd compat headers, and ldd 2018-02-13 09:44:33 -06:00
Will Dietz
290c62e749 musl: multiple outputs 2018-02-13 09:44:33 -06:00
Will Dietz
399020d2f5 musl: 1.1.17 -> 1.1.18
Use this as an opportunity to remove
empty patches array.
2017-10-31 15:45:24 -05:00
Will Dietz
4eb090efc8 musl: 1.1.16 -> 1.1.17, build with stack protector 2017-10-19 15:57:19 -05:00
Cray Elliott
6bdebf252c musl: 1.1.15 -> 1.1.16 2017-06-10 15:37:40 -07:00
Alexey Shmalko
e799e7b5d6
musl: build musl-gcc
The build of the wrapper was disabled in 93e44be (#21023) and is not
related to the CVE itself. (See comments in the mentioned PR.)
2017-01-27 21:54:27 +02:00
Will Dietz
be24f1d364 musl: 1.1.11 -> 1.1.15, add security patch. (#21023) 2016-12-16 11:32:28 +01:00
obadz
0e9d355397 musl: disable stackprotector hardening
Prevents busybox segfault
2016-08-29 13:04:29 +01:00