Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustPlatform: fix bug with ambiguous diff tool #87155

Merged
merged 1 commit into from May 7, 2020
Merged

Conversation

@bhipple
Copy link
Contributor

bhipple commented May 7, 2020

If a user provides nativeBuildInputs = [ llvmPackages.bintools ] or any other
package containing a ${prefix}/bin/diff, the builder could use it instead
of the standard unix diff, causing a build failure.

This updates the call to specify an abspath to diff and avoid reliance on PATH.

Resolves #87081

If a user provides `nativeBuildInputs = [ llvmPackages.bintools ]` or any other
package containing a `${prefix}/bin/diff`, the builder could use it instead
of the standard unix `diff`, causing a build failure.

This updates the call to specify an abspath to `diff` and avoid reliance on `PATH`.

Resolves #87081
@bhipple bhipple requested a review from andir as a code owner May 7, 2020
@bhipple
Copy link
Contributor Author

bhipple commented May 7, 2020

@zimbatm
zimbatm approved these changes May 7, 2020
@Mic92 Mic92 merged commit 68b25d3 into NixOS:staging May 7, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7f84557"; rev="7f845578afda02eea00f75ffd10bd00fe78b9fa3"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7f84557"; rev="7f845578afda02eea00f75ffd10bd00fe78b9fa3"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7f84557"; rev="7f845578afda02eea00f75ffd10bd00fe78b9fa3"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7f84557"; rev="7f845578afda02eea00f75ffd10bd00fe78b9fa3"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7f84557"; rev="7f845578afda02eea00f75ffd10bd00fe78b9fa3"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7f84557"; rev="7f845578afda02eea00f75ffd10bd00fe78b9fa3"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7f84557"; rev="7f845578afda02eea00f75ffd10bd00fe78b9fa3"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
ripgrep on aarch64-linux Success
Details
ripgrep on x86_64-linux Success
Details
@bhipple bhipple deleted the bhipple:fix/rust branch Jun 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.