Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 05192975fb83
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2472122bf39f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 9, 2020

  1. arcanist: copy directly from $PWD to pick up any applied patches (#95879 

    )
    @cpcloud
    cpcloud authored Nov 9, 2020
    Copy the full SHA
    2472122 View commit details
Showing with 19 additions and 13 deletions.
  1. +19 −13 pkgs/development/tools/misc/arcanist/default.nix
32 changes: 19 additions & 13 deletions pkgs/development/tools/misc/arcanist/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
{ stdenv, fetchFromGitHub, php, flex }:
{ bison
, fetchFromGitHub
, flex
, php
, stdenv
}:

# Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being
# invoked and complains about it being an unknown toolset. We could use `makeWrapper`, but
# then we’d need to still craft a script that does the `php libexec/arcanist/bin/...` dance
# anyway... So just do everything at once.
let makeArcWrapper = toolset: ''
cat << WRAPPER > $out/bin/${toolset}
#!$shell -e
export PATH='${php}/bin/'\''${PATH:+':'}\$PATH
exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@"
WRAPPER
chmod +x $out/bin/${toolset}
cat << WRAPPER > $out/bin/${toolset}
#!$shell -e
export PATH='${php}/bin/'\''${PATH:+':'}\$PATH
exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@"
WRAPPER
chmod +x $out/bin/${toolset}
'';

in

stdenv.mkDerivation {
pname = "arcanist";
version = "20200711";
@@ -25,21 +29,23 @@ stdenv.mkDerivation {
rev = "2565cc7b4d1dbce6bc7a5b3c4e72ae94be4712fe";
sha256 = "0jiv4aj4m5750dqw9r8hizjkwiyxk4cg4grkr63sllsa2dpiibxw";
};
buildInputs = [ php flex ];
buildInputs = [ bison flex php ];

postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
substituteInPlace support/xhpast/Makefile \
--replace "-minline-all-stringops" ""
'';

buildPhase = ''
make cleanall -C support/xhpast
make xhpast -C support/xhpast
'';

installPhase = ''
mkdir -p $out/bin $out/libexec
make install -C support/xhpast
cp -R $src $out/libexec/arcanist
make cleanall -C support/xhpast
cp -R . $out/libexec/arcanist
${makeArcWrapper "arc"}
${makeArcWrapper "phage"}
@@ -53,9 +59,9 @@ stdenv.mkDerivation {

meta = {
description = "Command line interface to Phabricator";
homepage = "http://phabricator.org";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.unix;
homepage = "http://phabricator.org";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
};
}