Commit Graph

87 Commits

Author SHA1 Message Date
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