Merge pull request #15066 from joachifm/remove-torbutton

torbutton: remove expression
This commit is contained in:
Joachim Fasting 2016-04-30 18:20:50 +02:00
commit 30ddf58197
2 changed files with 0 additions and 36 deletions

View File

@ -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;
};
}

View File

@ -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;
};