diff --git a/flake.lock b/flake.lock --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1672308958, - "narHash": "sha256-zLvAJ+XTI7gIlUqlrKj8j4+POZXDB6kUOnV0yBvSIMc=", + "lastModified": 1757967192, + "narHash": "sha256-/aA9A/OBmnuOMgwfzdsXRusqzUpd8rQnQY8jtrHK+To=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d879125d61a0be8ecb2afddaca8f2b0530db0260", + "rev": "0d7c15863b251a7a50265e57c1dca1a7add2e291", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ utils.url = "github:numtide/flake-utils"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs-grpc-web.url = "github:NixOS/nixpkgs/9957cd48326fe8dbd52fdc50dd2502307f188b0d"; - # Do not update, used for EOL versions of mariaDB and arcanist+php8.0 nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; }; @@ -36,7 +35,6 @@ # Re-introduce older packages that were removed in latest nixpkgs (_: _: { emscripten = oldNixpkgs.emscripten; # Changed signficantly - php80 = oldNixpkgs.php80; # Used for arcanist }) ]; }; diff --git a/nix/arcanist.nix b/nix/arcanist.nix deleted file mode 100644 --- a/nix/arcanist.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv -, lib -, cacert -, fetchFromGitHub -, installShellFiles -, makeWrapper -, php80 -, python3 -, which -}: - -stdenv.mkDerivation { - pname = "arcanist"; - version = "20220517"; - - src = fetchFromGitHub { - owner = "phacility"; - repo = "arcanist"; - rev = "85c953ebe4a6fef332158fd757d97c5a58682d3a"; - sha256 = "0x847fw74mzrbhzpgc4iqgvs6dsf4svwfa707dsbxi78fn2lxbl7"; - }; - - # These need to be in PATH during the build - nativeBuildInputs = [ php80 python3 installShellFiles makeWrapper ]; - - # Since we are exporting a script, we do not need to do an actual "build" - doBuild = false; - - installPhase = '' - # Copy arcanist contents - mkdir -p $out/libexec $out/bin - cp -R . $out/libexec/arcanist - - # provide a recent up-to-date certificate bundle for ssl - ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt \ - $out/libexec/arcanist/resources/ssl/default.pem - - # The canonical way to handle shebangs with nix is to use `patchShebangs` - # which will resolve to the absolute path of the interpreter. - # However, darwin will fail to interpret a shebang of 80 characters or - # longer for the first argument. Nix store paths hover around this limit. - # See https://github.com/NixOS/nixpkgs/issues/93609 for related issue. - cat << WRAPPER > $out/bin/arc - #!$shell -e - export PATH=${lib.makeBinPath [ python3 php80 which]}''${PATH:+':'}\$PATH - exec ${php80}/bin/php $out/libexec/arcanist/bin/arc "\$@" - WRAPPER - - chmod +x $out/bin/arc - - # Add shell completion for bash - $out/bin/arc shell-complete --generate -- - installShellCompletion --cmd arc --bash \ - $out/libexec/arcanist/support/shell/rules/bash-rules.sh - ''; - - # Ensure `arc` is able to run without failing - doInstallCheck = true; - installCheckPhase = '' - $out/bin/arc help diff -- > /dev/null - ''; - - meta = { - description = "Command line interface to Phabricator"; - homepage = "http://phabricator.org"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - }; -} diff --git a/nix/overlay.nix b/nix/overlay.nix --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -13,8 +13,6 @@ # add packages meant for just this repository amqp-cpp = prev.callPackage ./amqp-cpp.nix { }; - arcanist = final.callPackage ./arcanist.nix { }; - better-prompt = prev.callPackage ./better-prompt.nix { }; # c-ares is used to bootstrap curl, so cmake is not available in the default