github-actions[bot]
9c190d28df
Merge master into staging-next
2021-04-15 12:06:13 +00:00
sternenseemann
62ec3db017
stdenv/freebsd/cc: make overrideable fixing nixpkgs eval
...
stdenv.cc didn't have an override attribute on FreeBSD previously,
breaking evaluation of all-packages.nix consequently.
Resolves #119075 .
2021-04-15 12:49:41 +02:00
Vladimír Čunát
d2eb7a7887
Merge branch 'staging' into staging-next
...
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
sternenseemann
851c0f1cb7
stdenv/make-derivation: add -static to name if building statically
2021-04-13 12:33:00 +02:00
sternenseemann
fe0524cd7d
stdenv/make-derivation: unify logic for name modifications
...
Unify the logic for constructing the name from pname and version and
modifying the name in case a host suffix needs to appended. This allows
us to modify the construction of name from pname and version without
having to duplicate it in two places.
2021-04-13 12:31:26 +02:00
Luke Granger-Brown
08b22e605b
Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging
2021-04-12 18:49:01 +00:00
Sandro
9f198c1423
Merge pull request #116495 from r-burns/ppc64
...
lib/systems: remove powerpc64 elfv1 support
2021-04-12 16:44:14 +02:00
Andrew Childs
44f09ccabf
darwin: move deployment target and sdk version to platform config
2021-03-26 15:10:22 +09:00
github-actions[bot]
2417360191
Merge master into staging-next
2021-03-24 00:41:10 +00:00
Samuel Dionne-Riel
76552e95cc
stdenv: Fix regression on ARM+static when enabling hardening ( #115363 )
...
4e9dc46dea
re-enabled hardening for Musl,
which is good.
Though static builds for ARM fail in various ways
- cross armv7l static does not build
- cross aarch64 static produces segfaulting dynamically linked binaries
- native aarch64 static also produces segfaulting dynamically linked binaries
It seems that for native x86_64-linux, static builds are fine though.
This works around the issue by removing PIE from the hardening flags,
keeping all other hardening flags. This is an improvement (I think) from
before 4e9dc46d
.
Fixes #114953
2021-03-23 18:45:48 -04:00
github-actions[bot]
8c03075f07
Merge staging-next into staging
2021-03-19 00:41:08 +00:00
Ryan Burns
bcd7b0dd5d
darwin/make-bootstrap-tools: avoid brotli dependency
...
Needed as of e3d19670a0
2021-03-18 12:30:16 -07:00
Ryan Burns
68823d6d65
stdenv/bootstrap-tools: remove powerpc64 special case
...
Now that powerpc64 is always ELFv2, we can unconditionally use musl
tools here.
2021-03-15 19:27:41 -07:00
Vincenzo Mantova
6ba632c2a4
stdenv: ignore duplicates in addToSearchPath ( #113800 )
2021-03-13 13:58:21 -05:00
Andrew Childs
21e3a8abe7
stdenv/darwin: allow brotli reference from curl
...
Brotli is recently a default dependency of curl in nixpkgs.
See e3d19670a0
in #112947
2021-03-09 18:24:01 +09:00
Andrew Childs
d16a8753d9
stdenv: set CMAKE_OSX_ARCHITECTURES appropriately
2021-03-02 17:21:07 +09:00
WORLDofPEACE
4b10920ed1
stdenv/check-meta: change to allowlist and blocklist ( #114127 )
...
* stdenv/check-meta: change to allowlist and blocklist
* Update pkgs/stdenv/generic/check-meta.nix
Co-authored-by: Graham Christensen <graham@grahamc.com>
2021-02-23 10:25:18 -05:00
github-actions[bot]
402b752521
Merge master into staging-next
2021-02-11 18:16:48 +00:00
Ben Siraphob
4da3c5ab1e
stdenv/generic: recommend lib instead of pkgs.lib in place of stdenv.lib
2021-02-11 11:34:06 +07:00
github-actions[bot]
30dddce5e8
Merge master into staging-next
2021-02-09 06:16:02 +00:00
Bernardo Meurer
129ec8a4a5
stdenv: remove mention of flashplayer (in comments)
2021-02-08 09:38:43 -08:00
github-actions[bot]
2226996f6c
Merge master into staging-next
2021-02-07 18:16:08 +00:00
Ashish SHUKLA
1c39662e63
stdenv: Improve/fix FreeBSD support
...
Able to bootstrap stdenv on FreeBSD by compiling various dependencies
using built-in FreeBSD tools so mostly works now
Closes: https://github.com/NixOS/nixpkgs/pull/81459
2021-02-07 15:24:16 +00:00
github-actions[bot]
194e4e6f80
Merge master into staging-next
2021-02-07 06:16:10 +00:00
Cole Helbling
c7942b0f8b
stdenv/generic: allowAliases should default to true if unset
...
Since the deprecation is fairly recent, we should warn by default.
Also fix the wording of the comment: stdenv.lib will be removed for the 21.11
release, not just deprecated (as it already is deprecated).
2021-02-06 21:30:34 -08:00
Cole Helbling
afbeed62bb
stdenv/generic: allowAliases should default to false if unset
...
Mostly because config.allowAliases doesn't exist unless it's set.
2021-02-06 19:44:30 -08:00
Edmund Wu
5b278c2f48
stdenv/generic: allowAlises -> allowAliases
2021-02-06 22:15:00 -05:00
Ben Siraphob
66e92385b9
stdenv/generic: throw when using stdenv.lib and disallowing aliases
2021-01-31 18:40:19 +07:00
github-actions[bot]
f92395cf3c
Merge staging-next into staging
2021-01-31 06:19:43 +00:00
John Ericson
6717246373
Merge pull request #111284 from siraben/remove-new-stdenv-lib
...
stdenv: warn about use of inherited lib
2021-01-30 22:28:05 -05:00
Ben Siraphob
227693ed69
Update pkgs/stdenv/generic/default.nix
...
Co-authored-by: John Ericson <git@JohnEricson.me>
2021-01-31 03:03:11 +00:00
github-actions[bot]
81337921f5
Merge staging-next into staging
2021-01-31 00:46:33 +00:00
Matthew Bauer
048e0d3f87
Merge pull request #108518 from 4z3/env-vars
...
stdenv: mute errors when failing to write env-vars
2021-01-30 18:37:10 -06:00
John Ericson
5fc5e83808
Merge pull request #111345 from r-burns/ppc64-big-endian
...
Enable PPC64 (big-endian)
2021-01-30 16:26:06 -05:00
Ryan Burns
76fc6d2870
bootstrap-tools-cross: add powerpc64-linux
...
Also check for powerpc64-linux-elfv1, which does not support musl.
2021-01-30 12:34:30 -08:00
Ryan Burns
c17abf8111
stdenv: add powerpc64-linux
2021-01-30 12:34:30 -08:00
Guillaume Girol
a6840c55c2
Merge pull request #101606 from utsl42/master
...
Fix hardening default for pkgsMusl to reenable -pie
2021-01-30 15:19:12 +00:00
Ben Siraphob
32e8cec5d9
stdenv: warn about use of inherited lib
2021-01-30 18:42:48 +07:00
Sandro
2ee93d61ad
Merge pull request #110913 from siraben/other-stdenv-lib
2021-01-27 10:13:05 +01:00
Ben Siraphob
36c91cea1d
treewide: stdenv.lib -> lib
2021-01-27 13:08:40 +07:00
Vladimír Čunát
a648a07c19
Merge #104742 : linux bootstrap tools: fix tests on ppc64
2021-01-26 08:09:59 +01:00
Ben Siraphob
aa8868c7cc
pkgs/build-support: stdenv.lib -> lib
2021-01-24 19:07:54 -08:00
John Ericson
fa204a97d8
stdenv: Remove stdenv.platform
...
This was not working after #110544 as caught by @r-burns in
https://github.com/NixOS/nixpkgs/pull/110544#issuecomment-766444647 .
Thankfully it isn't used anymore and I believe wasn't documented either.
(I at least did not remember it existed.)
2021-01-24 22:51:12 +00:00
volth
bc0d605cf1
treewide: fix double quoted strings in meta.description
...
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
John Ericson
9c213398b3
lib: Clean up how linux and gcc config is specified
...
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that
commit for details.
This reverts commit 0bc275e634
.
2021-01-23 10:01:28 -05:00
Jonathan Ringer
0bc275e634
Revert "lib: Clean up how linux and gcc config is specified"
...
This is a stdenv-rebuild, and should not be merged
into master
This reverts commit 8929989614
.
2021-01-22 14:07:06 -08:00
John Ericson
8929989614
lib: Clean up how linux and gcc config is specified
...
The `platform` field is pointless nesting: it's just stuff that happens
to be defined together, and that should be an implementation detail.
This instead makes `linux-kernel` and `gcc` top level fields in platform
configs. They join `rustc` there [all are optional], which was put there
and not in `platform` in anticipation of a change like this.
`linux-kernel.arch` in particular also becomes `linuxArch`, to match the
other `*Arch`es.
The next step after is this to combine the *specific* machines from
`lib.systems.platforms` with `lib.systems.examples`, keeping just the
"multiplatform" ones for defaulting.
2021-01-21 22:44:09 -05:00
Monson Shao
2467f5e4d2
darwin.apple-sdk: drop appleSdkVersion
...
In fact no one is using appleSdkVersion, and stdenv is decoupled with sdk.
2021-01-21 00:26:16 +08:00
Ben Siraphob
0e49ba1b64
make-bootstrap-tools: stdenv.lib -> lib
2021-01-15 14:24:03 +07:00
Emery Hemingway
843daa841d
llvmPackages: select version by targetPlatform
2021-01-11 11:10:53 +01:00