diff options
author | Aleksana <me@aleksana.moe> | 2024-06-20 22:31:22 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-20 22:31:22 +0800 |
commit | 52f00894118c1bd23718b77d1798902ede9671d2 (patch) | |
tree | 5f5623f598b6dbce12c43956541ab0815e2b12da | |
parent | 03c118f44989b88221a93af6c22fc0eba2415d3d (diff) | |
parent | 5ed483f0d79461c2c2d63b46ee62f77a37075bae (diff) | |
download | nixlib-52f00894118c1bd23718b77d1798902ede9671d2.tar nixlib-52f00894118c1bd23718b77d1798902ede9671d2.tar.gz nixlib-52f00894118c1bd23718b77d1798902ede9671d2.tar.bz2 nixlib-52f00894118c1bd23718b77d1798902ede9671d2.tar.lz nixlib-52f00894118c1bd23718b77d1798902ede9671d2.tar.xz nixlib-52f00894118c1bd23718b77d1798902ede9671d2.tar.zst nixlib-52f00894118c1bd23718b77d1798902ede9671d2.zip |
Merge pull request #318104 from trofi/arcanist-removal
arcanist: remove
-rw-r--r-- | pkgs/development/tools/misc/arcanist/default.nix | 88 | ||||
-rw-r--r-- | pkgs/development/tools/misc/arcanist/dont-require-python3-in-path.patch | 26 | ||||
-rw-r--r-- | pkgs/development/tools/misc/arcanist/shellcomplete-strlen-null.patch | 13 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 1 insertions, 129 deletions
diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix deleted file mode 100644 index 06c0f700ffe8..000000000000 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ bison -, cacert -, fetchFromGitHub -, flex -, php -, lib, stdenv -, installShellFiles -, which -, python3 -}: - -# 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:${which}/bin'\''${PATH:+':'}\$PATH - exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@" - WRAPPER - chmod +x $out/bin/${toolset} -''; - -in -stdenv.mkDerivation { - pname = "arcanist"; - version = "20230530"; - - src = fetchFromGitHub { - owner = "phacility"; - repo = "arcanist"; - rev = "e50d1bc4eabac9c37e3220e9f3fb8e37ae20b957"; - hash = "sha256-u+HRsaCuAAyLrEihrZtLrdZ6NTVjPshieJATK3t5Fo4="; - }; - - patches = [ - ./dont-require-python3-in-path.patch - ./shellcomplete-strlen-null.patch - ]; - - buildInputs = [ php python3 ]; - - nativeBuildInputs = [ bison flex installShellFiles ]; - - postPatch = lib.optionalString stdenv.isAarch64 '' - substituteInPlace support/xhpast/Makefile \ - --replace "-minline-all-stringops" "" - ''; - - buildPhase = '' - runHook preBuild - make cleanall -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES - make xhpast -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin $out/libexec - make install -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES - make cleanall -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES - cp -R . $out/libexec/arcanist - ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt $out/libexec/arcanist/resources/ssl/default.pem - - ${makeArcWrapper "arc"} - ${makeArcWrapper "phage"} - - $out/bin/arc shell-complete --generate -- - installShellCompletion --cmd arc --bash $out/libexec/arcanist/support/shell/rules/bash-rules.sh - installShellCompletion --cmd phage --bash $out/libexec/arcanist/support/shell/rules/bash-rules.sh - runHook postInstall - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/arc help diff -- > /dev/null - $out/bin/phage help alias -- > /dev/null - ''; - - meta = { - description = "Command line interface to Phabricator"; - homepage = "https://www.phacility.com/"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/development/tools/misc/arcanist/dont-require-python3-in-path.patch b/pkgs/development/tools/misc/arcanist/dont-require-python3-in-path.patch deleted file mode 100644 index 5c127491bb84..000000000000 --- a/pkgs/development/tools/misc/arcanist/dont-require-python3-in-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -Don't require python3 in PATH - -Once packaged, the arcanoid.py script has an absolute path shebang to -python3, so there is no need to also require python3 in PATH. - -This prevents leaking in a python3 in PATH in the environment which arc -runs linters etc. - -Author: bjorn.forsman@gmail.com -diff -uNr arcanist.orig/src/workflow/ArcanistAnoidWorkflow.php arcanist.new/src/workflow/ArcanistAnoidWorkflow.php ---- arcanist.orig/src/workflow/ArcanistAnoidWorkflow.php 2022-03-31 13:23:30.865095192 +0200 -+++ arcanist.new/src/workflow/ArcanistAnoidWorkflow.php 2022-04-01 12:19:15.644159639 +0200 -@@ -24,13 +24,6 @@ - } - - public function runWorkflow() { -- if (!Filesystem::binaryExists('python3')) { -- throw new PhutilArgumentUsageException( -- pht( -- 'The "arc anoid" workflow requires "python3" to be available '. -- 'in your $PATH.')); -- } -- - $support_dir = phutil_get_library_root('arcanist'); - $support_dir = dirname($support_dir); - $support_dir = $support_dir.'/support/'; diff --git a/pkgs/development/tools/misc/arcanist/shellcomplete-strlen-null.patch b/pkgs/development/tools/misc/arcanist/shellcomplete-strlen-null.patch deleted file mode 100644 index 6911ce074e0c..000000000000 --- a/pkgs/development/tools/misc/arcanist/shellcomplete-strlen-null.patch +++ /dev/null @@ -1,13 +0,0 @@ -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) { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6609a49b3191..c393d1e1740b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -82,6 +82,7 @@ mapAliases ({ apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 antimicroX = antimicrox; # Added 2021-10-31 appthreat-depscan = dep-scan; # Added 2024-04-10 + arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07 arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 archiveopteryx = throw "archiveopteryx depended on an unsupported version of OpenSSL and was unmaintained"; # Added 2024-01-03 ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02fa9524ebba..e24b80b3a1df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3199,8 +3199,6 @@ with pkgs; arangodb = callPackage ../servers/nosql/arangodb { }; - arcanist = callPackage ../development/tools/misc/arcanist { php = php81; }; - arduino = arduino-core.override { withGui = true; }; arduino-ci = callPackage ../development/embedded/arduino/arduino-ci { }; |