From ae81c439769ecbb391502a458c9fbf78a43f00fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 2 Jan 2022 02:51:55 +0100 Subject: [PATCH] tor-arm: remove Uses python2 and the upstream has abandoned the project. --- pkgs/tools/security/tor/tor-arm.nix | 55 ----------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 pkgs/tools/security/tor/tor-arm.nix diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix deleted file mode 100644 index fcdb628e0f4a..000000000000 --- a/pkgs/tools/security/tor/tor-arm.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper -, python2Packages, ncurses, lsof, nettools -}: - -stdenv.mkDerivation rec { - pname = "tor-arm"; - version = "1.4.5.0"; - - src = fetchurl { - url = "https://www.atagar.com/arm/resources/static/arm-${version}.tar.bz2"; - sha256 = "1yi87gdglkvi1a23hv5c3k7mc18g0rw7b05lfcw81qyxhlapf3pw"; - }; - - nativeBuildInputs = [ makeWrapper python2Packages.python ]; - - outputs = [ "out" "man" ]; - - postPatch = '' - substituteInPlace ./setup.py --replace "/usr/bin" "$out/bin" - substituteInPlace ./src/util/connections.py \ - --replace "lsof -wnPi" "${lsof}/bin/lsof" - substituteInPlace ./src/util/torTools.py \ - --replace "netstat -npl" "${nettools}/bin/netstat -npl" \ - --replace "lsof -wnPi" "${lsof}/bin/lsof" - - substituteInPlace ./arm --replace '"$0" = /usr/bin/arm' 'true' - substituteInPlace ./arm --replace "python" "${python2Packages.python}/bin/python" - - for i in ./install ./arm ./src/gui/controller.py ./src/cli/wizard.py ./src/resources/torrcOverride/override.h ./src/resources/torrcOverride/override.py ./src/resources/arm.1 ./setup.py; do - substituteInPlace $i --replace "/usr/share" "$out/share" - done - - # fixes man page installation - substituteInPlace ./setup.py --replace "src/resoureces" "src/resources" - ''; - - installPhase = '' - mkdir -p $out/share/arm $out/bin $out/libexec - python setup.py install --prefix=$out --docPath $out/share/doc/arm - cp -R src/TorCtl $out/libexec - - wrapProgram $out/bin/arm \ - --prefix PYTHONPATH : "$(toPythonPath $out):$out/libexec:$PYTHONPATH" \ - --set TERMINFO "${ncurses.out}/share/terminfo" \ - --set TERM "xterm" - ''; - - meta = { - description = "A terminal status monitor for Tor relays"; - homepage = "https://www.atagar.com/arm/"; - license = lib.licenses.gpl3; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cc08d49341fc..3cfcd48e373a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -955,6 +955,7 @@ mapAliases ({ tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16 tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16 tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11 + tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned."; # added 2022-01-01 torbrowser = tor-browser-bundle-bin; # added 2017-04-05 torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28 torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # added 2020-03-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b6dadf075de..fde367042ded 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10288,8 +10288,6 @@ with pkgs; tor = callPackage ../tools/security/tor { }; - tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; - tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; touchegg = callPackage ../tools/inputmethods/touchegg { };