Azat Bahawi
e8f0b7b782
stdenv: throw when using mold for targeting darwin
...
Mold does not support linking Mach-O, but still can be used on MacOS to
emit ELF.
Fixes: #338970
2024-09-02 13:59:59 +03:00
github-actions[bot]
b430e34392
Merge master into staging-next
2024-08-29 06:05:05 +00:00
Philip Taron
4758cfe98f
stdenv/linux: disable and drop isl
from gcc's bootstrap tools ( #336985 )
2024-08-28 19:32:54 -07:00
github-actions[bot]
42531ffc56
Merge master into staging-next
2024-08-28 12:05:25 +00:00
Jörg Thalheim
2c9d00dbed
pkgs/stdenv/linux: update s390x-unknown-linux-gnu bootstrap-files ( #334334 )
2024-08-28 09:27:19 +02:00
Sergei Trofimovich
a74147fe6a
stdenv/linux: disable and drop isl
from gcc's bootstrap tools
...
`isl` is only needed to support `gcc` transformations enabled by
`-fgraphite*` options. Packages do not usually use those flags. None of
the bootstrap packages use it.
`nixpkgs` does not use up-to-date `isl` for `gcc` either. Let's drop
`isl` dependency from the bootstrap binary seed.
2024-08-24 10:27:24 +01:00
github-actions[bot]
eb0aa91a48
Merge staging-next into staging
2024-08-23 00:13:10 +00:00
K900
5c68540f8b
Merge remote-tracking branch 'origin/staging-next' into staging
2024-08-22 13:20:38 +03:00
Audrey Dutcher
f3a104c11a
stdenv/freebsd: do not require recursive-nix
2024-08-22 00:09:55 -07:00
Audrey Dutcher
90bf0c5119
stdenv/freebsd: rsync with --safe-links
...
This discarss links with absolute paths, which are useless for the
bootstrap tools.
2024-08-22 00:06:44 -07:00
Thomas Gerbet
d00775c1d9
stdenv: create env-vars
file before writing data to it
...
This fixes the regression introduced by c47a1e701d
on Darwin. The creation of the file using `install` and process
substitution does not work on Darwin, you get the following complain:
```
install: skipping file '/dev/fd/63', as it was replaced while being copied
```
Fixes #335016
2024-08-20 19:02:41 +02:00
Philip Taron
2cf5e918df
stdenv: remove with statements
2024-08-18 06:32:22 -07:00
Philip Taron
4ef32bd71b
Merge pull request #334973 from SomeoneSerge/fix/structuredAttrs/xxxArray
...
stdenv: concatTo: fallback for non-__structuredAttrs derivations
2024-08-17 17:33:53 -07:00
github-actions[bot]
150d965bfb
Merge staging-next into staging
2024-08-17 18:01:41 +00:00
Artturin
c9270f6274
Merge pull request #329964 from Artturin/androidrenamesdk
...
treewide: Rename android `sdkVer` and `ndkVer`
2024-08-17 19:22:42 +03:00
Someone Serge
ebf6790c39
stdenv: concatTo: fall back to old behaviour for "*Array" variables
...
Fixes e.g. the `sudo` build failure
2024-08-16 12:51:51 +00:00
Someone
ccaaa9ca53
Merge pull request #318614 from wolfgangwalther/structured-attrs-setup-hooks
...
treewide: support structuredAttrs in setup hooks
2024-08-13 19:29:36 +00:00
bl0v3
f32f54b860
pkgs/stdenv/linux: update s390x-unknown-linux-gnu bootstrap-files
...
sha256sum of files to be uploaded:
$ sha256sum /nix/store/ijkl5anf7mx1p3whdkxv4qs5crf6ic35-stdenv-bootstrap-tools-s390x-unknown-linux-gnu/on-server/*
1d8a28370912b69f50d6764ec3d71e9448903d6c14ee24873f589ac68741bf58 /nix/store/ijkl5anf7mx1p3whdkxv4qs5crf6ic35-stdenv-bootstrap-tools-s390x-unknown-linux-gnu/on-server/bootstrap-tools.tar.xz
03f16d698a45ec58bd5a0dc428d64ad5122a3ea1fd4d886cc93618951e4e74eb /nix/store/ijkl5anf7mx1p3whdkxv4qs5crf6ic35-stdenv-bootstrap-tools-s390x-unknown-linux-gnu/on-server/busybox
Suggested commands to upload files to 'tarballs.nixos.org':
$ nix-store --realize /nix/store/ijkl5anf7mx1p3whdkxv4qs5crf6ic35-stdenv-bootstrap-tools-s390x-unknown-linux-gnu
$ aws s3 cp --recursive --acl public-read /nix/store/ijkl5anf7mx1p3whdkxv4qs5crf6ic35-stdenv-bootstrap-tools-s390x-unknown-linux-gnu/on-server/ s3://nixpkgs-tarballs/stdenv/s390x-unknown-linux-gnu/0a7eaa55ccaa5103f44a9a4e3e0b06e5314a6401
$ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/s390x-unknown-linux-gnu/0a7eaa55ccaa5103f44a9a4e3e0b06e5314a6401 ./
$ sha256sum bootstrap-tools.tar.xz busybox
$ sha256sum /nix/store/ijkl5anf7mx1p3whdkxv4qs5crf6ic35-stdenv-bootstrap-tools-s390x-unknown-linux-gnu/on-server/*
2024-08-13 10:18:32 +02:00
Randy Eckenrode
2c5001b1db
darwin.stdenv: format with nixfmt-rfc-style
2024-08-11 23:11:04 -04:00
Someone Serge
64eaa63181
stdenv: concatStringsSep: quote ${sep}
2024-08-10 23:38:10 +00:00
github-actions[bot]
addc823ceb
Merge master into staging-next
2024-08-07 12:01:21 +00:00
adisbladis
f4579bdf8d
stdenv: Fix args.env.NIX_CFLAGS_LINK/args.NIX_CFLAGS_LINK typo
2024-08-07 18:49:56 +12:00
K900
a74e503640
make-derivation.nix: *unfancies your quotes*
2024-08-07 09:28:39 +03:00
K900
7cd4d5d7a3
make-derivation.nix: better error reporting for conflicting env attributes
2024-08-06 18:57:51 +03:00
Philip Taron
d8fbb16219
stdenv: change the logging in _allFlags to talkative
2024-08-05 18:35:57 -07:00
Philip Taron
e844424e4f
stdenv: replace other $NIX_DEBUG log statements
2024-08-05 18:35:57 -07:00
Philip Taron
465dbd2ddf
stdenv: log hooks at nixTalkativeLog level
...
Nix filters out messages with level ≥ 4 by default as of this commit.
2024-08-05 18:35:57 -07:00
Philip Taron
624463391d
stdenv: introduce specific logging functions
2024-08-05 18:35:57 -07:00
Philip Taron
bbb9f2f1c9
stdenv: set the phase in showPhaseHeader
2024-08-05 18:35:57 -07:00
github-actions[bot]
cf88251824
Merge staging-next into staging
2024-08-05 18:01:40 +00:00
éclairevoyant
1188923cde
Revert "pkgs/top-level/config.nix: nixfmt, declare options"
2024-08-05 16:44:45 +00:00
Marcus Ramberg
8e931f3330
Merge pull request #332462 from bolives-hax/bootstrap-tools-cross-add-s390x
...
Bootstrap tools cross add s390x
2024-08-05 18:41:17 +02:00
Philip Taron
42d0012a8b
Merge pull request #330753 from eclairevoyant/nixpkgs-declare-options
...
pkgs/top-level/config.nix: nixfmt, declare options
2024-08-05 08:55:03 -07:00
bl0v3
398058603f
stdenv: add bootstrap files for s390x
2024-08-05 13:04:20 +02:00
Vladimír Čunát
d4720e9c1e
Merge branch 'staging-next' into staging
...
There was a nontrivial conflict in pkgs/stdenv/linux/bootstrap-tools*
(reorganizing code vs. modifying it) I hope I really got it right.
2024-08-05 11:05:55 +02:00
éclairevoyant
d65c92e966
pkgs/top-level/config.nix: pass nixf-tidy
2024-08-05 01:10:07 -04:00
éclairevoyant
1d47396274
pkgs/top-level/config.nix: add options.inHydra
2024-08-05 01:10:06 -04:00
éclairevoyant
139f90426b
pkgs/top-level/config.nix: add options.{permittedInsecurePackages,allowInsecurePredicate}
2024-08-05 01:10:06 -04:00
Martin Weinelt
423c64a625
Merge pull request #331576 from LeSuisse/env-vars-not-world-readable
...
stdenv: make sure the `env-vars` file created is not world readable
2024-08-05 00:33:37 +02:00
éclairevoyant
333370df4f
pkgs/top-level/config.nix: add options.allowNonSourcePredicate
2024-08-04 14:54:34 -04:00
éclairevoyant
598f2257d7
pkgs/top-level/config.nix: add options.allowUnfreePredicate
2024-08-04 14:54:33 -04:00
Philip Taron
2b8276d312
Merge pull request #331878 from philiptaron/issue-208242/stdenv/linux/make-bootstrap-tools.nix
...
freshBootstrapTools: refactor to use callPackage style for Linux
2024-08-03 09:11:27 -07:00
Marcus Ramberg
36f51bc719
Merge pull request #331964 from adisbladis/stdenv-adapters-env-cflags-link
...
stdenv: Take nested env.NIX_CFLAGS_LINK into account when making static binaries
2024-08-03 18:08:32 +02:00
adisbladis
00b9996c9a
stdenv: Take nested env.NIX_CFLAGS_LINK into account when making static binaries
...
https://github.com/NixOS/nixpkgs/pull/315998/files#diff-2828f66a476875b1160e3c241960db085c2a3933211cc187bcd1fb456fb95e7fL213-R216 moved NIX_CFLAGS_LINK from a top-level `mkDerivation` argument to the nested `env` attribute.
This doesn't play nicely with how `stdenv/adapters.nix` adds it's NIX_CFLAGS_LINK in the top-level.
This changes the stdenv adapter to check for the presence of `env.NIX_CFLAGS_LINK`, and override that one if present, and only otherwise override on the top-level drv attrset.
2024-08-03 23:26:42 +12:00
Philip Taron
e915f6b32e
freshBootstrapTools: run nixfmt
2024-08-02 17:47:52 -07:00
Philip Taron
2587d88ee8
freshBootstrapTools.bootstrapTools: extract as a sort of package
2024-08-02 17:47:40 -07:00
Philip Taron
052ecdbfae
freshBootstrapTools: unify glibc and musl into the same directory
...
CI required that I `nixfmt` them at the same time.
2024-08-02 17:47:19 -07:00
Philip Taron
0a8120ff7d
freshBootstrapTools: avoid top-level with
2024-08-02 17:31:07 -07:00
Philip Taron
fd5887f5d0
freshBootstrapTools.build: put bootstrapFiles into stdenv-bootstrap-tools.nix
2024-08-02 17:31:04 -07:00
Philip Taron
67a5dcdc41
freshBootstrapTools.test: extract a package
2024-08-02 17:31:00 -07:00