Philip Taron
2cf5e918df
stdenv: remove with statements
2024-08-18 06:32:22 -07:00
Artturin
c9270f6274
Merge pull request #329964 from Artturin/androidrenamesdk
...
treewide: Rename android `sdkVer` and `ndkVer`
2024-08-17 19:22:42 +03:00
Randy Eckenrode
2c5001b1db
darwin.stdenv: format with nixfmt-rfc-style
2024-08-11 23:11:04 -04: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
Philip Taron
ed4cd6ab51
freshBootstrapTools.build: extract a package
2024-08-02 17:30:22 -07:00
github-actions[bot]
81cddc1677
Merge staging-next into staging
2024-08-03 00:02:50 +00:00
Philip Taron
1441f48d99
freshBootstrapTools: remove rec in favor of explicit attrset building
2024-08-02 16:11:03 -07:00
Philip Taron
91e1f1c9d6
freshBootstrapTools: nixfmt make-bootstrap-tools.nix
2024-08-02 16:11:02 -07:00
Philip Taron
d0d5a7a112
freshBootstrapTools: extract bootstrapFiles as a passthru on its core derivation
2024-08-02 16:11:02 -07:00
Philip Taron
d7c66f0996
freshBootstrapTools.build: extract as a package
2024-08-02 16:10:59 -07:00
Philip Taron
1cd5d6843a
freshBootstrapTools.test: extract as a package
2024-08-02 16:08:15 -07:00
Philip Taron
003725a97d
freshBootstrapTools.bootstrapTools: extract as a package
2024-08-02 16:08:15 -07:00
Philip Taron
217c61a1d7
freshBootstrapTools: remove top-level with statement
2024-08-02 16:08:15 -07:00
Emily
c6a4f2c6cd
Merge pull request #314167 from reckenrode/override-sdk-list-inputs-fix
...
overrideSDK: handle propagated lists of inputs
2024-08-02 22:55:05 +01:00
Thomas Gerbet
c47a1e701d
stdenv: make sure the env-vars file created is not world readable
...
Under some circumstances this file might contain private information
that should not be accessible to everybody.
2024-08-01 19:26:05 +02:00
K900
4f29b5a16b
Merge remote-tracking branch 'origin/staging-next' into staging
2024-07-31 08:57:17 +03:00
Pol Dellaiera
5efe6c1019
Merge pull request #330830 from tie/nix-develop-unbound-variable
...
stdenv: fix unbound NIX_LOG_FD in `nix develop`
2024-07-30 23:00:01 +02:00
Randy Eckenrode
4b35b26dad
stdenv/darwin/make-bootstrap-tools.nix: add libcodedirectory.1.dylib
...
`libcodedirectory.1.dylib` is needed by ld64 and several tools from cctools such as `codesign_allocate`.
2024-07-30 15:26:40 -04:00
éclairevoyant
1899a02870
pkgs/top-level/config.nix: add options.allowNonSource
2024-07-29 14:00:40 -04:00
Ivan Trubach
bd872b4a77
stdenv: fix unbound NIX_LOG_FD in nix develop
...
When running `nix develop` for a package, Nix records the stdenv
environment with NIX_LOG_FD set. That is, when the actual development
shell runs, it uses the functions that attempt to log to NIX_LOG_FD, but
this variable is not actually set.
As a workaround, check whether NIX_LOG_FD is set at runtime.
Example (before this change):
```console
$ nix develop --file . bash
$ echo "${NIX_LOG_FD-unset}"
unset
$ runPhase unpackPhase
bash: "$NIX_LOG_FD": Bad file descriptor
Running phase: unpackPhase
unpacking source archive /nix/store/v28dv6l0qk3j382kp40bksa1v6h7dx9p-bash-5.2.tar.gz
bash: "$NIX_LOG_FD": Bad file descriptor
source root is bash-5.2
bash: "$NIX_LOG_FD": Bad file descriptor
setting SOURCE_DATE_EPOCH to timestamp 1663942708 of file bash-5.2/y.tab.h
```
After this change:
```console
$ nix develop --file . bash
$ runPhase unpackPhase
Running phase: unpackPhase
unpacking source archive /nix/store/v28dv6l0qk3j382kp40bksa1v6h7dx9p-bash-5.2.tar.gz
source root is bash-5.2
setting SOURCE_DATE_EPOCH to timestamp 1663942708 of file bash-5.2/y.tab.h
```
2024-07-29 13:08:17 +03:00
github-actions[bot]
d0b2f51f0f
Merge staging-next into staging
2024-07-29 06:01:55 +00:00
