mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-20 04:31:52 +00:00
arcanist: 20220425 -> 20220517
The patch will make its way upstream eventually, but the phabricator maintainer is currently rejecting all contributions, so for the moment we'll have to just fix it locally.
This commit is contained in:
parent
55c9d73fb2
commit
7230a2d399
|
@ -25,16 +25,19 @@ let makeArcWrapper = toolset: ''
|
|||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "arcanist";
|
||||
version = "20220425";
|
||||
version = "20220517";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phacility";
|
||||
repo = "arcanist";
|
||||
rev = "da206314cf59f71334b187283e18823bddc16ddd";
|
||||
sha256 = "sha256-6VVUjFMwPQvk22Ni1YUSgks4ZM0j1JP+71VnYKD8onM=";
|
||||
rev = "85c953ebe4a6fef332158fd757d97c5a58682d3a";
|
||||
sha256 = "0x847fw74mzrbhzpgc4iqgvs6dsf4svwfa707dsbxi78fn2lxbl7";
|
||||
};
|
||||
|
||||
patches = [ ./dont-require-python3-in-path.patch ];
|
||||
patches = [
|
||||
./dont-require-python3-in-path.patch
|
||||
./shellcomplete-strlen-null.patch
|
||||
];
|
||||
|
||||
buildInputs = [ php python3 ];
|
||||
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/toolset/workflow/ArcanistShellCompleteWorkflow.php b/src/toolset/workflow/ArcanistShellCompleteWorkflow.php
|
||||
index 9c2fcf9a..307231c8 100644
|
||||
--- a/src/toolset/workflow/ArcanistShellCompleteWorkflow.php
|
||||
+++ b/src/toolset/workflow/ArcanistShellCompleteWorkflow.php
|
||||
@@ -92,7 +92,7 @@ EOTEXT
|
||||
$argv = $this->getArgument('argv');
|
||||
|
||||
$is_generate = $this->getArgument('generate');
|
||||
- $is_shell = (bool)strlen($this->getArgument('shell'));
|
||||
+ $is_shell = phutil_nonempty_string($this->getArgument('shell'));
|
||||
$is_current = $this->getArgument('current');
|
||||
|
||||
if ($argv) {
|
Loading…
Reference in a new issue