From e6fbe412ec7d92f6aaddbb2c1356fe844fd3d767 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 30 Apr 2016 17:44:49 +0200 Subject: [PATCH] torbutton: remove expression Not updated for years. Also, using torbutton without the tor browser bundle is not recommended. --- pkgs/tools/security/torbutton/default.nix | 34 ----------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/tools/security/torbutton/default.nix diff --git a/pkgs/tools/security/torbutton/default.nix b/pkgs/tools/security/torbutton/default.nix deleted file mode 100644 index 05bab06d382..00000000000 --- a/pkgs/tools/security/torbutton/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchgit, zip }: -stdenv.mkDerivation rec { - - name = "torbutton-${version}.xpi"; - version = "1.6.1"; - - src = fetchgit { - url = https://git.torproject.org/torbutton.git; - rev = "refs/tags/${version}"; - sha256 = "0ypzrl8nhckrgh45rcwsjds1jnzz3w5nr09b926a4h3a5njammlv"; - }; - - buildInputs = [ zip ]; - - buildPhase = '' - mkdir pkg - ./makexpi.sh - ''; - - installPhase = "cat pkg/*.xpi > $out"; - - meta = with stdenv.lib; { - homepage = https://www.torproject.org/torbutton/; - description = "Part of the Tor Browser Bundle"; - longDescription = '' - The component in Tor Browser Bundle that takes care of application-level - security and privacy concerns in Firefox. To keep you safe, Torbutton - disables many types of active content. - ''; - license = licenses.mit; - maintainers = [ maintainers.phreedom ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a050c2f86e5..4d26cf8d62f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3460,8 +3460,6 @@ in tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; - torbutton = callPackage ../tools/security/torbutton { }; - torbrowser = callPackage ../tools/security/tor/torbrowser.nix { inherit (xorg) libXrender libX11 libXext libXt; };