stdenv/setup.sh: deal with Nix < 2.4 structured attrs#234883
Merged
roberth merged 1 commit intoNixOS:stagingfrom May 31, 2023
Merged
stdenv/setup.sh: deal with Nix < 2.4 structured attrs#234883roberth merged 1 commit intoNixOS:stagingfrom
roberth merged 1 commit intoNixOS:stagingfrom
Conversation
Nix does not (as far it is documented) guarantee that NIX_ATTRS_*_FILE is set, the only [documented] guarantee seems to be: > […] made available to the builder via the file .attrs.json in the > builder’s temporary directory. This guarantee is of course affected by NixOS/nix#6736, so it seems to be prudent to fall back to the Nix 2.3 style ATTRS_*_FILE env vars before defaulting to the expected location in case neither is available. See also: - NixOS#214937 (comment) - NixOS@afef6588e250 [documented]: https://nixos.org/manual/nix/stable/language/advanced-attributes.html#adv-attr-structuredAttrs
tazjin
approved these changes
May 29, 2023
ofborg
bot
added
10.rebuild-darwin-stdenv
tvlbot
pushed a commit
to tvlfyi/tvix
that referenced
this pull request
May 30, 2023
* 3p/buzz: delete package This is unused, old, and uses an insecure version of OpenSSL which broke eval. * 3p/overlays: remove nvd patch Newer versions of nvd are compatible with Nix 2.3 by default. * users/grfn/system/home: remove explicit rust-analyser package This conflicts with `rustup`, causing eval failures, as the wrapper seems to now be included in `rustup` by default. * users/grfn/system: temporarily disable ISO builds They were broken upstream in nixpkgs by a change to stdenv/setup.sh, being fixed in NixOS/nixpkgs#234883 Change-Id: I0eea99ec98f4e73e615c012ffae1d0e37122e73b Reviewed-on: https://cl.tvl.fyi/c/depot/+/8585 Tested-by: BuildkiteCI Reviewed-by: grfn <[email protected]> Reviewed-by: sterni <[email protected]> Autosubmit: tazjin <[email protected]>
tvlbot
pushed a commit
to tvlfyi/kit
that referenced
this pull request
May 30, 2023
* 3p/buzz: delete package This is unused, old, and uses an insecure version of OpenSSL which broke eval. * 3p/overlays: remove nvd patch Newer versions of nvd are compatible with Nix 2.3 by default. * users/grfn/system/home: remove explicit rust-analyser package This conflicts with `rustup`, causing eval failures, as the wrapper seems to now be included in `rustup` by default. * users/grfn/system: temporarily disable ISO builds They were broken upstream in nixpkgs by a change to stdenv/setup.sh, being fixed in NixOS/nixpkgs#234883 Change-Id: I0eea99ec98f4e73e615c012ffae1d0e37122e73b Reviewed-on: https://cl.tvl.fyi/c/depot/+/8585 Tested-by: BuildkiteCI Reviewed-by: grfn <[email protected]> Reviewed-by: sterni <[email protected]> Autosubmit: tazjin <[email protected]>
roberth
approved these changes
May 31, 2023
1 task
Contributor
|
Successfully created backport PR for |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Nix does not (as far it is documented) guarantee that NIX_ATTRS_*_FILE is set, the only documented guarantee seems to be:
This guarantee is of course affected by NixOS/nix#6736, so it seems to be prudent to fall back to the Nix 2.3 style ATTRS_*_FILE env vars before defaulting to the expected location in case neither is available.
See also:
NIX_ATTRS_{JSON,SH}_FILEto be set correctly by Nix #214937 (comment)Tested
tests.stdenv.test-structured-env-attrsetwith Nix 2.3 to verify.Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)