ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-24 22:27:30 +03:00
Code Issues Projects Releases Wiki Activity
135,034 Commits 96 Branches 102 Tags 4.3 GiB
1381606b8e
Commit Graph

145 Commits

Author SHA1 Message Date
Joachim Fasting
0a04f7a870
torbrowser: fix paths to pluggable transports 
With this patch I'm at least able to connect using the obfs4 transport
 2016-05-01 21:27:25 +02:00
Joachim Fasting
3994a236bb
tor-arm: build recipe improvements 
- Fix install of man page
- Remove redundant for loop
- Access python interpreter via pythonPackages
- Remove redundant build inputs (captured via replacement anyway)
- Fix install location of sample rc file.  For whatever reason, the
  install script ends up thinking it needs to use tor-arm, so override
  it
- Clarify meta.description
 2016-04-30 22:25:46 +02:00
Joachim Fasting
61f110e890
tor: meta improvements 2016-04-30 18:53:42 +02:00
Joachim Fasting
c3f54960c6
torbrowser: wrapper improvements 
This brings the wrapper closer to the upstream wrapper.

Briefly,
- exec to prevent the shell from hanging around
- do not connect to session manager
- set WM_CLASS to "Tor Browser"
- use fonts.conf from the torbrowser bundle
 2016-04-29 18:42:09 +02:00
Joachim Fasting
85aece2f8e
torbrowser: use makeLibraryPath instead of buildEnv 
Also remove redundant buildInputs
 2016-04-29 18:18:48 +02:00
Joachim Fasting
cdd6369679
torbrowser: add myself to maintainers 2016-04-28 23:33:27 +02:00
Joachim Fasting
4741627bcf
torbrowser: fix argument handling in wrapper 
With $@ unquoted, the wrapper would always just pass "" to firefox
 2016-04-28 23:33:26 +02:00
Joachim Fasting
38ea8c6c30
torbrowser: 5.5.4 -> 5.5.5 2016-04-28 23:33:26 +02:00
Joachim Fasting
0122cbfd59
torbrowser: also install lib and out into the torEnv 2016-04-22 04:21:33 +02:00
Joachim Fasting
008d47131f
Revert "torbrowser: fix torEnv after multiple-outputs" 
This reverts commit 672efb940f.

This is a terrible fix, use buildEnv's extraOutputsToInstall instead.
 2016-04-22 04:21:33 +02:00
Joachim Fasting
672efb940f
torbrowser: fix torEnv after multiple-outputs 2016-04-22 04:08:33 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
lukasepple
1dbf51416a torbrowser: 5.5.3 -> 5.5.4 2016-03-19 21:56:57 +01:00
Joachim Fasting
665e79324e torbrowser: 5.5.2 -> 5.5.3 2016-03-15 02:34:53 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Franz Pletz
ffef91e914 torbrowser: 5.5 -> 5.5.2 2016-02-15 03:54:44 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Mayeu (Cast)
41204b1dd1 torbrowser: 5.0.7 -> 5.5 
Hash found with nix-prefetch-url
 2016-01-29 11:14:44 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Jakob Gillich
87c3063d68 torbrowser: 5.0.6 -> 5.0.7, add desktop file 2016-01-18 14:47:33 +01:00
Jakob Gillich
24dc7f3028 torbrowser: add missing shebang to wrapper script 2016-01-05 18:21:07 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Domen Kožar
c953334c75 Merge pull request #11972 from codsl/tor-0.2.7.6 
tor: 0.2.7.5 -> 0.2.7.6
 2015-12-28 23:27:29 +01:00
codsl
8fb46420ef torbrowser: 5.0.4 -> 5.0.6 2015-12-27 09:31:23 +00:00
codsl
42557425bc tor: 0.2.7.5 -> 0.2.7.6 2015-12-27 07:20:14 +00:00
John Wiegley
2cd323a51a tor: Allow building on Darwin 2015-12-16 14:10:31 -08:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
codsl
7884923ba3 tor: 0.2.6.10 -> 0.2.7.5, fixes #11489 2015-12-06 13:18:45 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
ruebezahl
0069867c51 update 5.0.3 -> 5.0.4 2015-11-08 18:07:02 +01:00
Vladimír Čunát
91407a8bdf ncurses: split into multiple outputs 
Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
 2015-10-13 20:18:44 +02:00
Joachim Fasting
e1ca9303d2 torbrowser: 4.5.3 -> 5.0.3 
torbrowser 5.0.3 requires gcc5, otherwise it fails with

   libstdc++.so.6: version `GLIBCXX_3.4.21' not found (required by Browser/firefox)
 2015-10-03 15:02:08 +02:00
Joachim Fasting
c34cc5d54e torbrowser: use stdenv.is64bit 2015-10-03 14:27:57 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg 
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
 2015-09-15 12:54:34 +02:00
Lancelot SIX
ca54849eb9 torbrowser: 4.5.2 -> 4.5.3 (close #8953) 2015-07-30 15:55:22 +02:00
Austin Seipp
3793ff5290 nixpkgs: torsocks 2.0.0 -> 2.1.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-20 21:50:29 -05:00
Lluís Batlle i Rossell
ce597e1e1b updating tor to 0.2.6.10 
I checked the tarball signature.

I fixed the optimised build (broken since 2013) and I added seccomp.
 2015-07-17 18:24:35 +02:00
hiberno
deadb4e0aa tor-browser: update 4.5.1 to 4.5.2, closes #8379 2015-06-18 11:25:32 +02:00
Chris Double
36a1d2d4f8 Update tor to 0.2.6.9 2015-06-12 12:49:41 +02:00
Chris Double
276bd7f16e Update tor to 0.2.6.8 2015-05-22 11:20:10 +12:00
Chris Double
609002cc94 Update tor-browser to 4.5.1 2015-05-19 14:52:52 +12:00
Chris Double
49d9476608 Update to tor 0.2.6.7 2015-05-19 14:19:15 +12:00
Eric Seidel
662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang} 
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
 2015-05-11 14:44:50 -07:00
Chris Double
d941d4c26e Update tor-browser to 4.5 2015-04-29 11:58:52 +12:00
_1126
319d42941e tor-browser: bump to 4.0.8 2015-04-11 12:46:47 +02:00
Arseniy Seroka
3e079614ab Merge pull request #7258 from spwhitt/tor 
tor: fix for Darwin
 2015-04-08 13:17:14 +03:00
Spencer Whitt
eab5ff59f6 tor: fix for Darwin 2015-04-08 01:42:13 -04:00
Chris Double
6af23b3565 Update tor to 0.2.5.12 2015-04-08 11:52:46 +12:00
_1126
64758a6429 tor-browser: bumps to 4.0.6 2015-04-07 15:37:57 +02:00
Chris Double
9369daf134 Update tor-browser to 4.0.5 2015-03-25 13:39:23 +13:00
Chris Double
9549f1c88f Update tor to 0.2.5.11 2015-03-25 13:39:23 +13:00
_1126
f1f3c2c775 torbrowser: bump version to 4.0.4 2015-03-14 14:36:25 +01:00
Vladimír Čunát
dbae4f109f Merge branch 'master' into staging 
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-01-31 19:34:57 +01:00
Markus Kohlhase
8295846f6f nixpkgs: torbrowser 4.0.2 -> 4.0.3 2015-01-25 09:03:19 +00:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
 2014-12-26 11:06:21 -06:00
Austin Seipp
5c52382448 tor-arm: kill tabs 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-10 04:21:14 -06:00
Austin Seipp
7a51e5f416 nixpkgs: fix tor-arm dependencies 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-10 04:14:11 -06:00
Austin Seipp
0d63eae992 tor-arm: Fix python path 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-10 04:06:02 -06:00
Austin Seipp
b31283dd8b nixpkgs: add tor-arm 1.4.5.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-10 03:59:59 -06:00
Austin Seipp
c3bdbd3b52 nixpkgs: tor-browser 4.0.1 -> 4.0.2 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-06 05:01:28 -06:00
Austin Seipp
92eb86e110 nixpkgs: add myself as a 'tor' maintainer 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-06 05:01:27 -06:00
Austin Seipp
c206c728a8 nixpkgs: tor depends on torsocks 
This may seem strange, but tor distributes its 'torify' wrapper which in
turn attempts to use torsocks to bridge a connection, meaning 'tor'
users out the box may want it to work.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-06 05:00:27 -06:00
Austin Seipp
d92d0eca92 nixpkgs: torsocks 1.3 -> 2.0.0 
Additionally, this fixes 'torsocks' using the 'which' executable as a
dependency.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-12-06 05:00:26 -06:00
vbgl
3e8fd1b30b Merge pull request #5014 from doublec/tor 
Update Tor to 0.2.5.10.
 2014-11-21 07:33:53 +00:00
Chris Double
32d09e2699 Update Tor Browser to 4.0.1 
Updates Tor Browser to 4.0.1. This requires the gcc 4.9 runtime.

Add myself to the maintainers.
 2014-11-18 23:46:42 +13:00
Chris Double
75425ff879 Update Tor to 0.2.5.10. 
Updates Tor to latest stable version.

Add myself to the maintainer list.
 2014-11-18 01:47:42 +13:00
Evgeny Egorochkin
ac8c944332 add myself as a maintainer 2014-11-05 11:35:32 +02:00
Evgeny Egorochkin
a6dc9ce957 tor: update from 0.2.4.23 to 0.2.4.24 2014-10-25 20:31:54 +03:00
Bjørn Forsman
c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Evgeny Egorochkin
ecefc22d76 tor: update from 0.2.4.22 to 0.2.4.23 2014-07-31 14:36:06 +03:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +02:00
Chris Double
2deb3ca0aa Update tor to 0.2.4.22 and tor browser to 3.6.2 2014-06-13 14:21:53 +12:00
Chris Double
1d1a1c2585 Update tor-browser to 3.6 2014-05-14 02:03:51 +12:00
Chris Double
f76e56fb38 Update tor to 0.2.4.21 2014-05-14 01:53:25 +12:00
Evgeny Egorochkin
76f7ea6e39 add repositories.git to several packages 2014-03-20 13:32:29 +02:00
Matej Cotman
f4a3ea123b fix torbrowser build by adding /lib64 for 64 bit systems 2014-03-01 22:37:39 +01:00
Jaka Hudoklin
26357febb6 Add tor-browser 2014-01-12 23:04:48 +01:00
Evgeny Egorochkin
d07d2eb137 torsocks: update to 1.3 2013-10-08 16:59:48 +03:00
Shea Levy
8934644d20 tor: minor cleanups 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 19:15:26 -05:00
Shea Levy
9a5ca5aced tor: Don't use NIX_CFLAGS_LINK where CFLAGS will do 2013-03-08 19:14:43 -05:00
Jack Cummings
e863477995 need to link against -lgcc_s for the testsuite to work 2013-03-08 07:43:30 -08:00
Evgeny Egorochkin
76d8b3a530 torsocks: version bump to 1.2 2013-01-15 08:13:56 +02:00
Evgeny Egorochkin
f2ca98c098 TOR: version bump 2012-12-05 06:16:45 +02:00
Evgeny Egorochkin
b01a720d65 TOR: version bump 
svn path=/nixpkgs/trunk/; revision=32692
 2012-02-29 13:30:01 +00:00
Evgeny Egorochkin
8db68032a6 Tor: version bump 
svn path=/nixpkgs/trunk/; revision=26899
 2011-04-20 09:25:50 +00:00
Evgeny Egorochkin
c76f114d20 tor:version bump 
svn path=/nixpkgs/trunk/; revision=24944
 2010-12-01 04:07:44 +00:00
Russell O'Connor
90aa3c3c3c New derivation for torsocks. 
This will replace tsocks.


svn path=/nixpkgs/trunk/; revision=24011
 2010-10-01 02:38:03 +00:00
Ludovic Courtès
c293598da8 tor: Add self as co-maintainer; add to Hydra; improve formatting. 
svn path=/nixpkgs/trunk/; revision=21957
 2010-05-24 21:28:54 +00:00
Ludovic Courtès
bf9d470cc7 tor: Fix test suite. 
svn path=/nixpkgs/trunk/; revision=21956
 2010-05-24 21:28:43 +00:00
Lluís Batlle i Rossell
a286b7c9b2 Adding tor 0.2.1.26 
(Patch sent by roconnor)

svn path=/nixpkgs/trunk/; revision=21797
 2010-05-16 16:23:32 +00:00