diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-01 07:04:39 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-01 07:04:39 +0000 |
| commit | 0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc (patch) | |
| tree | c1c7f6ea999ae4f455500ba2599c58e41aa581ad /pkgs/tools/security | |
| parent | b14a737a4d86608bd61acf08cfc479bf262e9d99 (diff) | |
| parent | 57b612cb050778c4ded12fe8e45de26b91eeef70 (diff) | |
| download | nixlib-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar nixlib-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.gz nixlib-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.bz2 nixlib-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.lz nixlib-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.xz nixlib-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.tar.zst nixlib-0210e20b5ae5ee9f9652d2eedf955974cc9e5ddc.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/tor/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/security/vidalia/default.nix | 21 |
2 files changed, 26 insertions, 5 deletions
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 62a75c16b4e4..3d2360196a66 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, libevent, openssl, zlib }: stdenv.mkDerivation rec { - name = "tor-0.2.1.30"; + name = "tor-0.2.2.35"; src = fetchurl { url = "http://www.torproject.org/dist/${name}.tar.gz"; - sha256 = "02g15k8w5r57r9r6lz0sxzzvqx200y397y142cjswsd4zyla2lpk"; + sha256 = "f141a41fffd31494a0f96ebbb6b999eab33ce62d5c31f81222a0acd034adbf3a"; }; - patchPhase = +# patchPhase = # DNS lookups fail in chroots. - '' sed -i "src/or/test.c" -es/localhost/127.0.0.1/g - ''; +# '' sed -i "src/or/test.c" -es/localhost/127.0.0.1/g +# ''; buildInputs = [ libevent openssl zlib ]; diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix new file mode 100644 index 000000000000..243604c2c79e --- /dev/null +++ b/pkgs/tools/security/vidalia/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, cmake, qt4 }: +stdenv.mkDerivation rec { + + name = "vidalia-${version}"; + version = "0.2.17"; + + src = fetchurl { + url = "https://www.torproject.org/dist/vidalia/${name}.tar.gz"; + sha256 = "0x0vb37h2d5njxmqkss03ybv7b7jw25682xb793mix1m8l0hs44r"; + }; + + buildInputs = [ cmake qt4 ]; + + meta = with stdenv.lib; { + homepage = https://www.torproject.org/projects/vidalia.html.en; + description = "a cross-platform graphical controller for the Tor software, built using the Qt framework"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.all; + }; +} \ No newline at end of file |