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

php: fix on darwin #101840

Merged
merged 1 commit into from Nov 4, 2020
Merged

php: fix on darwin #101840

merged 1 commit into from Nov 4, 2020

Conversation

@sikmir
Copy link
Member

@sikmir sikmir commented Oct 27, 2020

Motivation for this change

Fix build on darwin by disabling valgrind support, since valgrind is broken on darwin:

broken = stdenv.isDarwin; # https://hydra.nixos.org/build/128521440/nixlog/2

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@aanderse
Copy link
Member

@aanderse aanderse commented Oct 27, 2020

If memory serves me correctly @talyz may have access to a darwin machine.

@sikmir sikmir mentioned this pull request Oct 27, 2020
10 tasks
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

I can confirm that this fixes building on Darwin.

@Ma27
Copy link
Member

@Ma27 Ma27 commented Oct 27, 2020

Nice, so I don't have to use an old Mac from the office, thanks! :)

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Oct 27, 2020

@Ma27 If you ever need a build confirmation feel free to ping me.

@etu etu merged commit 1872374 into NixOS:master Nov 4, 2020
19 checks passed
19 checks passed
@github-actions[bot]
tests
Details
@github-actions[bot]
action
Details
@ofborg[bot]
Evaluation Performance Report Evaluator Performance Report
Details
@github-actions[bot]
Wait for ofborg
Details
@ofborg[bot]
grahamcofborg-eval ^.^!
Details
@ofborg[bot]
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
@ofborg[bot]
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
@ofborg[bot]
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e300f0f"; rev="e300f0fd6959227843a49efb48005aa5ba460fa5"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
@ofborg[bot]
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e300f0f"; rev="e300f0fd6959227843a49efb48005aa5ba460fa5"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e300f0f"; rev="e300f0fd6959227843a49efb48005aa5ba460fa5"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e300f0f"; rev="e300f0fd6959227843a49efb48005aa5ba460fa5"; } ./nixos/
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e300f0f"; rev="e300f0fd6959227843a49efb48005aa5ba460fa5"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e300f0f"; rev="e300f0fd6959227843a49efb48005aa5ba460fa5"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e300f0f"; rev="e300f0fd6959227843a49efb48005aa5ba460fa5"; } ./pkgs/t
Details
@ofborg[bot]
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
@ofborg[bot]
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@ofborg[bot]
php, php.passthru.tests on aarch64-linux Success
Details
@ofborg[bot]
php, php.passthru.tests on x86_64-linux Success
Details
@sikmir sikmir deleted the php branch Nov 4, 2020
@stephank stephank mentioned this pull request Mar 9, 2021
10 tasks
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

5 participants