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

arcanist: Fix on darwin #87406

Merged
merged 1 commit into from May 14, 2020
Merged

arcanist: Fix on darwin #87406

merged 1 commit into from May 14, 2020

Conversation

@talyz
Copy link
Contributor

talyz commented May 9, 2020

Motivation for this change

With recent work done on the PHP packaging, the PHP executable is by default a wrapper script. Darwin doesn't like scripts in the shebang of another script, so we have to wrap arcanist, feeding the script as an argument to PHP instead. See #86881 and #23018.

I haven't thoroughly tested this, since I don't use arcanist. Can someone who does make sure it actually works? :) The executable runs, but I don't know if all commands work as expected...

cc @purcell

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.
With recent work done on the PHP packaging, the PHP executable is by
default a wrapper script. Darwin doesn't like scripts in the shebang
of another script, so we have to wrap arcanist, feeding the script as
an argument to PHP instead. See #86881 and #23018.
@purcell
Copy link
Contributor

purcell commented May 13, 2020

I built the modified derivation locally and it seems to work fine for me on Darwin.

@talyz talyz merged commit 11399d1 into NixOS:master May 14, 2020
17 checks passed
17 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
arcanist, arcanist.passthru.tests on aarch64-linux Success
Details
arcanist, arcanist.passthru.tests on x86_64-darwin Success
Details
arcanist, arcanist.passthru.tests on x86_64-linux Success
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="2f61275"; rev="2f612756f0e9346a42f06d76f2e8395bbaae082b"; } ./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="2f61275"; rev="2f612756f0e9346a42f06d76f2e8395bbaae082b"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2f61275"; rev="2f612756f0e9346a42f06d76f2e8395bbaae082b"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2f61275"; rev="2f612756f0e9346a42f06d76f2e8395bbaae082b"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2f61275"; rev="2f612756f0e9346a42f06d76f2e8395bbaae082b"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2f61275"; rev="2f612756f0e9346a42f06d76f2e8395bbaae082b"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2f61275"; rev="2f612756f0e9346a42f06d76f2e8395bbaae082b"; } ./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
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.

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