public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
This commit is contained in:
Yury G. Kudryashov
2012-03-01 07:04:39 +00:00
parent b14a737a4d 57b612cb05
commit 0210e20b5a
74 changed files with 833 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/security/tor/default.nix
View File

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

21
pkgs/tools/security/vidalia/default.nix Normal file
View File

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