Unbreak stdenv #27650
Merged
Unbreak stdenv #27650
Conversation
This file contains 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
|
@Ericson2314, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @Profpatsch and @vcunat to be potential reviewers. |
Ericson2314
added
2.status: work-in-progress
1.severity: mass-darwin-rebuild
1.severity: mass-rebuild
6.topic: darwin
|
Unfortunately |
cstrahan
reviewed
Jul 26, 2017
pkgs/stdenv/generic/setup.sh
Outdated
| [[ "$#" -gt 0 ]] || return 0 | ||
| printf '%s\n' "$@" | ||
| } | ||
|
|
||
| printWords() { |
There was a problem hiding this comment.
Looks like you have a duplicated definition.
There was a problem hiding this comment.
Err I meant to keep printLines, but I guess it's now unused so there's no point.
There was a problem hiding this comment.
Oh, haha, just realized my find & replace renamed the old one.
…files We cannot switch to line-delimited yet, because certain Nix commands do not read in the entire file, but just the first line.
This is a temporary measure until this impurity is removed from Nix.
This is invalid before bash-4.2, affecting bash used impurely in nix-shell on MacOS.
Ericson2314
force-pushed
the
unbreak-stdenv
branch
from
1df0b2f
to
820e402
Compare
copumpkin
reviewed
Jul 26, 2017
| @@ -211,7 +211,7 @@ stdenv.mkDerivation ({ | |||
| configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags" | |||
|
|
|||
| # nativePkgs defined in stdenv/setup.hs | |||
| for p in "''${!nativePkgs[@]}"; do | |||
| for p in "''${nativePkgs[@]}"; do | |||
There was a problem hiding this comment.
The keys of the map, instead of the values. (With arrays, really int maps, it gives you the indices.)
copumpkin
reviewed
Jul 26, 2017
|
Ok it builds and I tested |
LnL7
approved these changes
Jul 26, 2017
|
Sure! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
Solves the
nix-envand Darwinnix-shellissues. No evals so far! After this I'll merge with master, basically with-Xours.Things done
Please check what applies. Note that these are not hard requirements but mereley serve as information for reviewers.
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shellon Darwin -- old version workednix-shell -p nox --run "nox-review wip"./result/bin/)