3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

54486 commits

Author SHA1 Message Date
Bjørn Forsman e4ecddcf3b gdmap: set meta attributes (license, platforms, maintainers)
(cherry picked from commit 4b65f53652)
2014-12-19 08:01:45 +01:00
Evgeny Egorochkin 6dc110ff00 resurrect torsocks-faster 2014-12-19 08:09:48 +02:00
Evgeny Egorochkin 44fd836210 rename torify to tsocks, to avoid name clashes and make it clear which wrapper library is used 2014-12-19 08:09:35 +02:00
Evgeny Egorochkin c37a9adc09 torsocks: enable by default if tor client functionality is enabled 2014-12-19 08:09:26 +02:00
Evgeny Egorochkin 5dcfeeceef tor: restore the Privoxy setup, but configure the system Privoxy instead of running a separate instance. 2014-12-19 08:09:16 +02:00
Evgeny Egorochkin d946826b25 tor: restore strong circuit isolation 2014-12-19 08:08:57 +02:00
Evgeny Egorochkin 5cd8ecd8ba Revert "nixos: Remove torify module"
tsocks is still useful because it's less strict

This reverts commit 1b26faeb69.
2014-12-19 08:08:43 +02:00
aszlig 336d6a6dca
picard: Fix derivation name.
Name has been changed in c9282c65f4.

Users would probably expect "nix-env -i picard" to work, and as picard
isn't a library it doesn't make sense to set a prefix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 718666204a)
2014-12-18 23:21:20 +01:00
aszlig b414d9df79
nixos: Add VBox hardening to 14.12 release notes.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit efb2b27a8f)
2014-12-18 23:00:58 +01:00
aszlig 54c826c980
nixos/virtualbox: Revert disable hardening.
This reverts commit 5d67b17901.

The issues have been resolved by ac603e208c.

Tested this with hostonlyifs and USB support with extension pack.

Conflicts:
	nixos/modules/programs/virtualbox-host.nix

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Tested-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Tested-by: tv <tv@shackspace.de>
Tested-by: Domen Kožar <domen@dev.si>
(cherry picked from commit f7384b8c75)
2014-12-18 22:43:59 +01:00
aszlig 11925d64aa
nixos/tests/virtualbox: Disable debug logging.
Especially if the user isn't in the vboxusers group anymore, this gets
VERY noisy, because the VBoxSVC process emits warnings for every single
USB device noting that it's only possible to access it when the user is
in the vboxusers group.

So, we now have a debug attribute, where we can enable it when
necessary.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit d45649b415)
2014-12-18 22:43:35 +01:00
aszlig 7697962a28
nixos/tests/virtualbox: Don't use vboxusers group.
At least when we're running in hardening mode, because it's needed there
only for USB support.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit ef691d5c30)
2014-12-18 22:43:35 +01:00
aszlig e91cd4e5c2
virtualbox: Fix runtime paths in hardening mode.
Because we have to rely on setuid wrappers on NixOS, we can't easily
hardcode the executable paths and set it 4755. So for all calls, we need
to change the runtime path executable directory to /var/setuid-wrappers/
and for verification we need to retain the executable directory.

Also note, that usually VBoxNetAdpCtl, VBoxNetDHCP, VBoxNetNAT, VBoxSDL
and VBoxVolInfo don't reside in directories that are commonly in PATH,
but in /usr/lib/virtualbox in most mainstream distros. But because the
names of these executables are distinctive enough to not cause
collisions with other setuid programs, I'll leave it like that and not
patch up setuid-wrappers.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit ac603e208c)
2014-12-18 22:43:34 +01:00
aszlig 20d02244ce
virtualbox: Allow to easily change the build type.
Not really changes anything in functionality, but makes it easier to
change the build type to "debug", for example.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit b69ac6c159)
2014-12-18 22:43:34 +01:00
aszlig 6c4d5f7e4d
virtualbox: Fix hardcoded /sbin/ifconfig path.
Just accidentally found this while debugging and it's needed for
fetching a few interface details, not sure however whether because of
this anything has been broken so far.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 14ef3446e1)
2014-12-18 22:43:33 +01:00
aszlig 90c6ae5e43
virtualbox: Explicitly excempt src during install.
Instead of coping it to $out and later deleting it, we now exclude the
src directory during copy. Also, we no longer cd into the release
directory during installPhase, which should make sure that we are
constantly in $sourceRoot.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 5a8c5d2768)
2014-12-18 22:43:16 +01:00
Vladimír Čunát 3865ab9e69 nixos/doc release notes: mention intel GPU driver 2014-12-18 19:03:05 +01:00
Sebastián Bernardo Galkin 9ec8d3e0ac xorg-server: enable DRI3 (close #5381)
TEST needed. I tested on my NixOS Thinkpad with Optimus nvidia and intel
cards.  Testing in other architectures is needed.

This patch also improves the regular expressions that scan the build
configuration files to enable the building of a binary utility in
xf86-video-intel: intel-virtual-output. This utility is useful for some
Optimus laptops

DRI3 was added to xorg-server propagatedBuildInputs so now it's inherited
by several projects that can use it.

(cherry picked from commit 06e6d7def2)
2014-12-18 19:03:05 +01:00
Eelco Dolstra b57ea539c6 Fix container test
http://hydra.nixos.org/build/17989795
(cherry picked from commit bf0f2adbeb)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-18 15:57:38 +01:00
Rob Vermaas 597007f8b7 Fix sysstat build. 2014-12-18 14:47:00 +01:00
aszlig 876b0828fc
nixos/tests/blivet: Fix by avoiding "nix-store".
The "nix-store" command within the VM test is running without
NIX_REMOTE=daemon and since Nix 1.8 tries to open the store database in
read-write mode even for nix-store -qR.

Now, we're doing this properly and rely on setup hooks, which is the
same method that's used when you're building a library which depends on
blivet.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 2af435b5cd)
2014-12-18 14:12:41 +01:00
William A. Kennington III a287614ecb kernel: 3.14.26 -> 3.14.27
(cherry picked from commit 7e8c5b578a)
2014-12-18 14:07:02 +01:00
Eelco Dolstra 142e9a9d06 sudo: Update to 1.8.11p2
(cherry picked from commit 6866712a39)
2014-12-18 12:58:42 +01:00
Eelco Dolstra e928eeb1fd Improve /etc/sudoers message
(cherry picked from commit 89697b0fc1)
2014-12-18 12:58:34 +01:00
Domen Kožar 8566f66ea4 release notes: reindent, remove renames (redudant) 2014-12-18 12:21:45 +01:00
Domen Kožar 9bc8bcbbdc fix users.mutableUsers = false; install in iso 2014-12-18 12:18:24 +01:00
Domen Kožar 0d4acad489 crashplan: fix CrashPlanDesktop binary 2014-12-18 10:12:37 +01:00
Domen Kožar 827a9bbd44 ulex: set platforms 2014-12-18 10:01:32 +01:00
宋文武 66087ead07 jenkins: update to 1.594
(cherry picked from commit f40a613577)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-18 09:59:23 +01:00
Domen Kožar b0a0fb60df dropbox: 2.0.0 -> 2.2.0, disable tests 2014-12-18 09:22:29 +01:00
Domen Kožar 33e9a0503a update release notes 2014-12-18 02:00:49 +01:00
Eelco Dolstra 9e06a26471 switch-to-configuration: Ignore slice units
(cherry picked from commit c812e45292)
2014-12-18 01:47:54 +01:00
William A. Kennington III 8f71e04e9f btrfs-progs: 3.17.2 -> 3.17.3
(cherry picked from commit 0cfd61bdea)
2014-12-18 00:40:38 +01:00
William A. Kennington III 990b5a1b3e xfsprogs: 3.2.1 -> 3.2.2
(cherry picked from commit 02f75f91f1)
2014-12-18 00:40:29 +01:00
Domen Kožar 692f5958e3 remove btrfsProgs-3_16, not needed anymore
(cherry picked from commit 9de5eb6ade)
2014-12-18 00:40:20 +01:00
William A. Kennington III ffb104750d kernel: Remove 3.16
(cherry picked from commit 4b73212241)
2014-12-18 00:38:52 +01:00
William A. Kennington III 30e74be80f kernel: 3.14.26 -> 3.14.27
(cherry picked from commit 4eaecca7b1)
2014-12-18 00:38:37 +01:00
Eelco Dolstra ec539dc8ff Revert "enable bash autocomplete by default"
This reverts commit ee8e15fe76. See
discussion at ee8e15fe76.

(cherry picked from commit bde9ae18cf)
2014-12-18 00:37:45 +01:00
Eelco Dolstra 6038215e9c Remove udev from /run/opengl-drivers
/run/opengl-drivers should contain only libGL-related libraries, not
stuff like udev. Injecting anything into LD_LIBRARY_PATH is dangerous
because it can break applications that expect a different version of
the library.

Caused by eef9a8ac2a. Fixes #5371.

(cherry picked from commit d34c600414)
2014-12-18 00:26:25 +01:00
Domen Kožar 44ed738567 skrooge: add boost dependency
(cherry picked from commit 179c7344cc)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-17 20:14:08 +01:00
vi dc23b0ee8f Added mirrors for MySQL.
(cherry picked from commit 0c49b2942e)
2014-12-17 11:13:30 -05:00
Domen Kožar 5bafb9cf0f nixos/tests/gitlab.nix: set TimeoutStartSec to 10min 2014-12-17 16:40:26 +01:00
Rob Vermaas b2d5e79e6d icecast: update from 2.4.0 to 2.4.1, potentially fixes CVE-2014-9018
(cherry picked from commit f72c7e93ce)
2014-12-17 15:51:19 +01:00
Rob Vermaas 8e527b5ef8 nodejs: update from 0.10.32 to 0.10.33, potentially fixes CVE-2014-7192
(cherry picked from commit 81f6af4a54)
2014-12-17 15:51:14 +01:00
Rob Vermaas f41c34529f docker: update from 1.3.1 to 1.3.3, potentially fixes CVE-2014-6407, CVE-2014-6408
(cherry picked from commit 90c3dc79c5)
2014-12-17 15:51:10 +01:00
Mathijs Kwik 40b9186d58 nixos: allow adding extra modules through environment
This is useful for adding extra functionality or defaults to _every_
nixos evaluation.

My use case is overriding behaviour for all nixos tests, for example
setting packageOverrides to newer versions and changing some default
dependencies/settings.

By making this accessible through an environment variable, this can now
be fully accomplished externally. No more need to fork
nixos/nixpkgs (which becomes a maintenance burden), just use the channel
instead and plug in via this envvar.

(cherry picked from commit 73f18fd42f)
2014-12-17 09:52:59 +01:00
Vladimír Čunát 0dbc415e9d ffmpeg_2_3: use 2.2 instead of 2.3
2.3 branch is unmaintained and was critically vulnerable (I thank to monitor).

(cherry picked from commit 304484a753)
2014-12-16 21:34:06 +01:00
Eelco Dolstra 087e6895c9 cups: Build with SERVERROOT set to /etc/cups
(cherry picked from commit be0e73b938)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:48 +01:00
Eelco Dolstra ca042d2c18 cups: Get rid of obsolete banners
These use bannertops, which no longer exists. And they conflicted with
the working banners in cups-filters.

(cherry picked from commit ffdabf02b9)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:48 +01:00
Eelco Dolstra eb375fdec3 cupsd.nix: Clean up environment.etc
(cherry picked from commit dc6c8b9714)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:48 +01:00